Dotclear

Changeset 1312:9b954dbdf09a for plugins


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

Location:
plugins
Files:
7 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>'. 

  • plugins/antispam/index.php

    r1280 r1312  
    123123if ($filter_gui !== false) 
    124124{ 
    125      echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <a href="'.$p_url.'">'.$page_name.'</a>'. 
     125     echo '<h2>'.__('Plugins').' &rsaquo; <a href="'.$p_url.'">'.$page_name.'</a>'. 
    126126          ' &rsaquo; <span class="page-title">'.sprintf(__('%s configuration'),$filter->name).'</span></h2>'; 
    127127 
    … …  
    130130else 
    131131{ 
    132      echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.$page_name.'</span></h2>'; 
     132     echo '<h2>'.__('Plugins').' &rsaquo; <span class="page-title">'.$page_name.'</span></h2>'; 
    133133 
    134134     # Information 

  • plugins/daInstaller/index.php

    r1280 r1312  
    256256'<body>'. 
    257257infoMessages(). 
    258 '<h2>'.__('DotAddict.org Installer').'</h2>'. 
     258'<h2>'.__('System').' &rsaquo; <span class="page-title">'.__('DotAddict.org Installer').'</span></h2>'. 
    259259'<p>'.__('Install and update your extensions live from DotAddict.org').'</p>'; 
    260260 

  • plugins/simpleMenu/index.php

    r1280 r1312  
    459459if (!$step) { 
    460460     echo '<form id="menuitemsappend" action="'.$p_url.'&add=1" method="post">'; 
    461      echo '<p>'.$core->formNonce().'<input class="add" type="submit" name="appendaction" value="'.__('Add an item').'" /></p>'; 
     461     echo '<p class="top-add">'.$core->formNonce().'<input class="button add" type="submit" name="appendaction" value="'.__('Add an item').'" /></p>'; 
    462462     echo '</form>'; 
    463463} 

  • plugins/tags/tag_posts.php

    r1288 r1312  
    110110 
    111111<h2><?php echo html::escapeHTML($core->blog->name); ?> &rsaquo; 
    112 <span class="page-title"><?php echo __('Edit tag').' &ldquo;'.html::escapeHTML($tag).'&rdquo;'; ?></span></h2> 
     112<span class="page-title"><?php echo __('Tag').' &ldquo;'.html::escapeHTML($tag).'&rdquo;'; ?></span></h2> 
    113113 
    114114<?php 

  • plugins/tags/tag_posts.php

    r1300 r1312  
    130130          '<input type="submit" value="'.__('Rename').'" />'. 
    131131          $core->formNonce(). 
    132           '</form>'; 
     132          '</p></form>'; 
    133133          # Remove tag 
    134134          if (!$posts->isEmpty() && $core->auth->check('contentadmin',$core->blog->id)) { 
    135135               echo 
    136136               '<form id="tag_delete" action="'.$this_url.'" method="post">'. 
    137                '<p class="no-margin">'.__('Delete this tag:').'</p>'. 
    138                '<input type="submit" class="delete" name="delete" value="'.__('Delete').'" />'. 
     137               '<p class="no-margin">'.__('Delete this tag:'). 
     138               '</p><p><input type="submit" class="delete" name="delete" value="'.__('Delete').'" />'. 
    139139               $core->formNonce(). 
    140                '</form>'; 
     140               '</p></form>'; 
    141141          } 
    142           echo '</p></div>'; 
     142          echo '</div>'; 
    143143     } 
    144144      

  • plugins/userPref/index.php

    r1280 r1312  
    9696     table.prefs { border: 1px solid #999; margin-bottom: 2em; } 
    9797     table.prefs th { background: #f5f5f5; color: #444; padding-top: 0.3em; padding-bottom: 0.3em; } 
    98      p.anchor-nav {float: right; } 
    9998  </style> 
    10099     <script type="text/javascript"> 
Note: See TracChangeset for help on using the changeset viewer.

Sites map