Merge "Bug 1790576: Place "Tags" into the "Content" menu below "Notes""

htdocs/lib/web.php

@@ -2875,6 +2875,12 @@ function mahara_standard_nav() {
             'weight' => 20,
             'accesskey' => 'c',
         ),
+        'content/tags' => array(
+            'path' => 'content/tags',
+            'url' => 'tags.php',
+            'title' => get_string('tags'),
+            'weight' => 70,
+        ),
         'myportfolio' => array(
             'path' => 'myportfolio',
             'url' => 'view/index.php',

test/behat/features/settings/institution_tags.feature

@@ -73,7 +73,7 @@ Scenario: Creating institution tags
     And I press "Save changes"
 
     Given I choose "Pages and collections" in "Portfolio" from main menu
-    And I follow "Tags"
+    And I follow "Tags" in the "#sb-tags" "css_element"
     And I follow "Edit tags"
     Then I should see "Test" in the "My tags list" property
     Then I should not see "Institution One: One tag" in the "My tags list" property