Merged MDL-13640 to move "Manage tags" link

diff --git a/tag/index.php b/tag/index.php
index f538442f0929e412f204f1a740c2eb458397124c..0119472c0eae5a0fd8fb8a05f188dd8642068e89 100644 (file)
--- a/tag/index.php
+++ b/tag/index.php
@@ -36,8 +36,15 @@ if (($edit != -1) and $PAGE->user_allowed_editing()) {
     $USER->editing = $edit;
 }
 
+$systemcontext   = get_context_instance(CONTEXT_SYSTEM);
+
 $PAGE->print_header();
 
+// Manage all tags links
+if (has_capability('moodle/tag:manage', $systemcontext)) {
+    echo '<div class="managelink"><a href="'. $CFG->wwwroot .'/tag/manage.php">'. get_string('managetags', 'tag') .'</a></div>' ;
+}
+
 echo '<table border="0" cellpadding="3" cellspacing="0" width="100%" id="layout-table">';
 echo '<tr valign="top">';
 
@@ -57,7 +64,6 @@ echo '<td valign="top" id="middle-column">';
 
 $tagname  = tag_display_name($tag);
 
-$systemcontext   = get_context_instance(CONTEXT_SYSTEM);
 if ($tag->flag > 0 && has_capability('moodle/tag:manage', $systemcontext)) {
     $tagname =  '<span class="flagged-tag">' . rawurlencode($tagname) . '</span>';
 }

diff --git a/tag/search.php b/tag/search.php
index ddb5bd0fe6be43b5e303801aa1b6ddd7ee5c4654..78ac430731e298fcb1489db08ccf3c8274f9a772 100644 (file)
--- a/tag/search.php
+++ b/tag/search.php
@@ -25,7 +25,10 @@ if ( has_capability('moodle/tag:manage',$systemcontext) ) {
     $manage_link =  "<a href=\"{$CFG->wwwroot}/tag/manage.php\">" . get_string('managetags', 'tag') . "</a>" ;
 }
 
-print_header_simple(get_string('tags', 'tag'), '', $navigation, '', '', '', $manage_link);
+print_header_simple(get_string('tags', 'tag'), '', $navigation);
+
+echo '<div class="managelink"><a href="'. $CFG->wwwroot .'/tag/manage.php">'. get_string('managetags', 'tag') .'</a></div>' ;
+
 print_heading(get_string('searchtags', 'tag'), '', 2);
 
 tag_print_search_box();

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 808044dad8b534408cf891d5cd6d41423be1aa43..8b7405822039f81218720e217a92429600d467e9 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -2847,6 +2847,11 @@ div#tag-user-table {
  display:block;
 }
 
+body.tag .managelink {
+  text-align:right;
+  padding:10px;
+}
+
 /* small css hack for firefox*/
 div#tag-user-table:after{
  content:".";