Changeset 1312:9b954dbdf09a for plugins/tags

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

Files:

• plugins/tags/tag_posts.php (modified) (1 diff)
• plugins/tags/tag_posts.php (modified) (1 diff)

plugins/tags/tag_posts.php

@@ -110 +110 @@
 
 <h2><?php echo html::escapeHTML($core->blog->name); ?> &rsaquo;
-<span class="page-title"><?php echo __('Edit tag').' &ldquo;'.html::escapeHTML($tag).'&rdquo;'; ?></span></h2>
+<span class="page-title"><?php echo __('Tag').' &ldquo;'.html::escapeHTML($tag).'&rdquo;'; ?></span></h2>
 
 <?php

plugins/tags/tag_posts.php

@@ -130 +130 @@
           '<input type="submit" value="'.__('Rename').'" />'.
           $core->formNonce().
-          '</form>';
+          '</p></form>';
           # Remove tag
           if (!$posts->isEmpty() && $core->auth->check('contentadmin',$core->blog->id)) {
                echo
                '<form id="tag_delete" action="'.$this_url.'" method="post">'.
-               '<p class="no-margin">'.__('Delete this tag:').'</p>'.
-               '<input type="submit" class="delete" name="delete" value="'.__('Delete').'" />'.
+               '<p class="no-margin">'.__('Delete this tag:').
+               '</p><p><input type="submit" class="delete" name="delete" value="'.__('Delete').'" />'.
                $core->formNonce().
-               '</form>';
+               '</p></form>';
           }
-          echo '</p></div>';
+          echo '</div>';
      }