Dotclear


Ignore:
Timestamp:
08/08/13 21:29:17 (12 years ago)
Author:
franck <carnet.franck.paul@…>
Branch:
default
Parents:
1311:b57043a88153 (diff), 1290:de23a6996243 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge step 2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • plugins/aboutConfig/index.php

    r1280 r1312  
    100100  table.settings { border: 1px solid #999; margin-bottom: 2em; } 
    101101  table.settings th { background: #f5f5f5; color: #444; padding-top: 0.3em; padding-bottom: 0.3em; } 
    102   p.anchor-nav {float: right; } 
    103102  </style> 
    104103     <script type="text/javascript"> 
     
    128127} 
    129128?> 
    130 <h2><?php echo html::escapeHTML($core->blog->name); ?> &rsaquo; <span class="page-title">about:config</span></h2> 
    131  
    132 <div id="local" class="multi-part" title="<?php echo __('blog settings'); ?>"> 
    133  
    134 <?php  
     129<h2><?php echo __('System'); ?> &rsaquo; <span class="page-title">about:config</span></h2> 
     130 
     131<div id="local" class="multi-part" title="<?php echo sprintf(__('Settings for %s'),html::escapeHTML($core->blog->name)); ?>"> 
     132 
     133 
     134<?php 
    135135$table_header = '<table class="settings" id="%s"><caption>%s</caption>'. 
    136136'<thead>'. 
Note: See TracChangeset for help on using the changeset viewer.

Sites map