Bug 1782954: Adding new menu layout

behatnotneeded

Change-Id: I523b7989df426670690b0a086c553149dba26d84
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

htdocs/account/institutions.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', 1);
-define('MENUITEM', 'groups/institutions');
+define('MENUITEM', 'engage/institutions');
 define('SECTION_PLUGINTYPE', 'core');
 define('SECTION_PLUGINNAME', 'account');
 define('SECTION_PAGE', 'institutions');

htdocs/admin/users/statistics.php

@@ -275,6 +275,7 @@ JS;
 }
 
 $smarty = smarty(array('paginator','js/chartjs/Chart.min.js'));
+setpageicon($smarty, 'icon-pie-chart');
 $smarty->assign('INLINEJAVASCRIPT', $js);
 $smarty->assign('institutiondata', $institutiondata);
 $smarty->assign('type', $type);

htdocs/artefact/blog/lib.php

@@ -69,7 +69,7 @@ class PluginArtefactBlog extends PluginArtefact {
             define('MENUITEM', 'groups/blogs');
         }
         else {
-            define('MENUITEM', 'content/blogs');
+            define('MENUITEM', 'create/blogs');
         }
     }
 
@@ -80,12 +80,12 @@ class PluginArtefactBlog extends PluginArtefact {
     public static function menu_items() {
         global $USER;
         $tab = array(
-            'path'   => 'content/blogs',
-            'weight' => 40,
+            'path'   => 'create/blogs',
+            'weight' => 30,
             'url'    => 'artefact/blog/index.php',
             'title'  => get_string('Blogs', 'artefact.blog'),
         );
-        return array('content/blogs' => $tab);
+        return array('create/blogs' => $tab);
     }
 
     public static function get_cron() {

htdocs/artefact/file/extract.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', 1);
-define('MENUITEM', 'content/files');
+define('MENUITEM', 'create/files');
 require(dirname(dirname(dirname(__FILE__))) . '/init.php');
 
 safe_require('artefact', 'file');

htdocs/artefact/file/index.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', 1);
-define('MENUITEM', 'content/files');
+define('MENUITEM', 'create/files');
 define('SECTION_PLUGINTYPE', 'artefact');
 define('SECTION_PLUGINNAME', 'file');
 define('SECTION_PAGE', 'index');

htdocs/artefact/file/lib.php

@@ -37,17 +37,23 @@ class PluginArtefactFile extends PluginArtefact {
 
     public static function menu_items() {
         return array(
-            'content/files' => array(
-                'path' => 'content/files',
+            'create/files' => array(
+                'path' => 'create/files',
                 'url' => 'artefact/file/index.php',
                 'title' => get_string('Files', 'artefact.file'),
-                'weight' => 30,
+                'weight' => 20,
             ),
-            'content/profileicons' => array(
-                'path' => 'content/profileicons',
+        );
+    }
+
+    public static function right_nav_menu_items() {
+        return array(
+            'profileicons' => array(
+                'path' => 'profileicons',
                 'url' => 'artefact/file/profileicons.php',
                 'title' => get_string('profileicons', 'artefact.file'),
-                'weight' => 20,
+                'weight' => 15,
+                'iconclass' => 'id-badge',
             ),
         );
     }

htdocs/artefact/file/profileicons.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', 1);
-define('MENUITEM', 'content/profileicons');
+define('MENUITEM', 'profileicons');
 define('SECTION_PLUGINTYPE', 'artefact');
 define('SECTION_PLUGINNAME', 'file');
 define('SECTION_PAGE', 'profileicons');

htdocs/artefact/internal/editnote.php

@@ -38,7 +38,7 @@ else if ($institution = $artefact->get('institution')) {
     $goto .= '?institution=' . $institution;
 }
 else {
-    define('MENUITEM', 'content/notes');
+    define('MENUITEM', 'create/notes');
 }
 
 $folder = param_integer('folder', 0);

htdocs/artefact/internal/index.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', 1);
-define('MENUITEM', 'content/profile');
+define('MENUITEM', 'profile');
 define('SECTION_PLUGINTYPE', 'artefact');
 define('SECTION_PLUGINNAME', 'internal');
 define('SECTION_PAGE', 'index');

htdocs/artefact/internal/lib.php

@@ -112,19 +112,25 @@ class PluginArtefactInternal extends PluginArtefact {
         return get_field('artefact_installed', 'active', 'name', 'internal');
     }
 
-    public static function menu_items() {
+    public static function right_nav_menu_items() {
         return array(
-            'content/profile' => array(
-                'path' => 'content/profile',
+            'profile' => array(
+                'path' => 'profile',
                 'url' => 'artefact/internal/index.php',
                 'title' => get_string('profile', 'artefact.internal'),
                 'weight' => 10,
+                'iconclass' => 'id-card-o',
             ),
-            'content/notes' => array(
-                'path' => 'content/notes',
+        );
+    }
+
+    public static function menu_items() {
+        return array(
+            'create/notes' => array(
+                'path' => 'create/notes',
                 'url' => 'artefact/internal/notes.php',
                 'title' => get_string('Notes', 'artefact.internal'),
-                'weight' => 60,
+                'weight' => 40,
             ),
         );
     }

htdocs/artefact/internal/notes.json.php

@@ -56,7 +56,7 @@ else if ($institution = param_alpha('institution', null)) {
     $params['institution'] = $institution;
 }
 else {
-    define('MENUITEM', 'content/notes');
+    define('MENUITEM', 'create/notes');
     $pageheading = get_string('mynotes', 'artefact.internal');
     $where = 'owner = ?';
     $values = array($USER->get('id'));

htdocs/artefact/internal/notes.php

@@ -56,7 +56,7 @@ else if ($institution = param_alpha('institution', null)) {
     $params['institution'] = $institution;
 }
 else {
-    define('MENUITEM', 'content/notes');
+    define('MENUITEM', 'create/notes');
     $pageheading = get_string('mynotes', 'artefact.internal');
     $where = 'owner = ?';
     $values = array($USER->get('id'));

htdocs/artefact/plans/delete/index.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', true);
-define('MENUITEM', 'content/plans');
+define('MENUITEM', 'create/plans');
 
 require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/init.php');
 safe_require('artefact','plans');

htdocs/artefact/plans/delete/task.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', true);
-define('MENUITEM', 'content/plans');
+define('MENUITEM', 'create/plans');
 
 require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/init.php');
 safe_require('artefact','plans');

htdocs/artefact/plans/edit/index.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', true);
-define('MENUITEM', 'content/plans');
+define('MENUITEM', 'create/plans');
 
 require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/init.php');
 require_once('pieforms/pieform/elements/calendar.php');

htdocs/artefact/plans/edit/task.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', true);
-define('MENUITEM', 'content/plans');
+define('MENUITEM', 'create/plans');
 
 require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/init.php');
 require_once('pieforms/pieform/elements/calendar.php');

htdocs/artefact/plans/index.php

@@ -11,7 +11,7 @@
 
 
 define('INTERNAL', 1);
-define('MENUITEM', 'content/plans');
+define('MENUITEM', 'create/plans');
 define('SECTION_PLUGINTYPE', 'artefact');
 define('SECTION_PLUGINNAME', 'plans');
 define('SECTION_PAGE', 'index');

htdocs/artefact/plans/lib.php

@@ -34,11 +34,11 @@ class PluginArtefactPlans extends PluginArtefact {
 
     public static function menu_items() {
         return array(
-            'content/plans' => array(
-                'path' => 'content/plans',
+            'create/plans' => array(
+                'path' => 'create/plans',
                 'url'  => 'artefact/plans/index.php',
                 'title' => get_string('Plans', 'artefact.plans'),
-                'weight' => 60,
+                'weight' => 50,
             ),
         );
     }

htdocs/artefact/plans/new.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', 1);
-define('MENUITEM', 'content/plans');
+define('MENUITEM', 'create/plans');
 define('SECTION_PLUGINTYPE', 'artefact');
 define('SECTION_PLUGINNAME', 'plans');
 

htdocs/artefact/plans/plan.php

@@ -11,7 +11,7 @@
 
 
 define('INTERNAL', 1);
-define('MENUITEM', 'content/plans');
+define('MENUITEM', 'create/plans');
 define('SECTION_PLUGINTYPE', 'artefact');
 define('SECTION_PLUGINNAME', 'plans');
 define('SECTION_PAGE', 'plans');

htdocs/artefact/resume/achievements.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', true);
-define('MENUITEM', 'content/resume');
+define('MENUITEM', 'create/resume');
 define('SECTION_PLUGINTYPE', 'artefact');
 define('SECTION_PLUGINNAME', 'resume');
 define('SECTION_PAGE', 'index');

htdocs/artefact/resume/editcomposite.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', true);
-define('MENUITEM', 'content/resume');
+define('MENUITEM', 'create/resume');
 define('SECTION_PLUGINTYPE', 'artefact');
 define('SECTION_PLUGINNAME', 'resume');
 

htdocs/artefact/resume/editgoalsandskills.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', true);
-define('MENUITEM', 'content/resume');
+define('MENUITEM', 'create/resume');
 define('SECTION_PLUGINTYPE', 'artefact');
 define('SECTION_PLUGINNAME', 'resume');
 define('RESUME_SUBPAGE', 'goalsandskills');

htdocs/artefact/resume/employment.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', true);
-define('MENUITEM', 'content/resume');
+define('MENUITEM', 'create/resume');
 define('SECTION_PLUGINTYPE', 'artefact');
 define('SECTION_PLUGINNAME', 'resume');
 define('SECTION_PAGE', 'index');

htdocs/artefact/resume/goalsandskills.php

@@ -9,7 +9,7 @@
  */
 
 define('INTERNAL', 1);
-define('MENUITEM', 'content/resume');
+define('MENUITEM', 'create/resume');
 define('SECTION_PLUGINTYPE', 'artefact');
 define('SECTION_PLUGINNAME', 'resume');
 define('SECTION_PAGE', 'index');

htdocs/artefact/resume/index.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', true);
-define('MENUITEM', 'content/resume');
+define('MENUITEM', 'create/resume');
 define('SECTION_PLUGINTYPE', 'artefact');
 define('SECTION_PLUGINNAME', 'resume');
 define('SECTION_PAGE', 'index');

htdocs/artefact/resume/interests.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', true);
-define('MENUITEM', 'content/resume');
+define('MENUITEM', 'create/resume');
 define('SECTION_PLUGINTYPE', 'artefact');
 define('SECTION_PLUGINNAME', 'resume');
 define('SECTION_PAGE', 'index');

htdocs/artefact/resume/lib.php

@@ -47,11 +47,11 @@ class PluginArtefactResume extends PluginArtefact {
 
     public static function menu_items() {
         return array(
-            'content/resume' => array(
-                'path' => 'content/resume',
+            'create/resume' => array(
+                'path' => 'create/resume',
                 'title' => get_string('resume', 'artefact.resume'),
                 'url' => 'artefact/resume/index.php',
-                'weight' => 50,
+                'weight' => 60,
             ),
         );
     }

htdocs/artefact/resume/license.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', true);
-define('MENUITEM', 'content/resume');
+define('MENUITEM', 'create/resume');
 define('SECTION_PLUGINTYPE', 'artefact');
 define('SECTION_PLUGINNAME', 'resume');
 define('SECTION_PAGE', 'index');

htdocs/auth/webservice/lib.php

@@ -115,6 +115,7 @@ class PluginAuthWebservice extends PluginAuth {
                 'title'  => get_string('webservice', 'auth.webservice'),
                 'weight' => 75,
                 'accesskey' => 'w',
+                'iconclass' => 'puzzle-piece',
             ),
             'webservices/config' => array(
                 'path'   => 'webservices/config',

htdocs/collection/delete.php

@@ -47,7 +47,7 @@ else if (!empty($institutionname)) {
     $urlparams['institution'] = $institutionname;
 }
 else {
-    define('MENUITEM', 'myportfolio/views');
+    define('MENUITEM', 'create/views');
     $baseurl = get_config('wwwroot') . 'view/index.php';
 }
 define('TITLE', $collection->get('name'));

htdocs/collection/edit.php

@@ -71,7 +71,7 @@ else if (!empty($institutionname)) {
     $urlparams['institution'] = $institutionname;
 }
 else {
-    define('MENUITEM', 'myportfolio/views');
+    define('MENUITEM', 'create/views');
     define('TITLE', get_string('editcollection', 'collection'));
     $baseurl = get_config('wwwroot') . 'view/index.php';
 }

htdocs/collection/views.php

@@ -79,7 +79,7 @@ else if (!empty($institutionname)) {
     $urlparams['institution'] = $institutionname;
 }
 else {
-    define('MENUITEM', 'myportfolio/views');
+    define('MENUITEM', 'create/views');
     define('TITLE', get_string('editviews', 'collection'));
     $baseurl = get_config('wwwroot') . 'view/index.php';
 }

htdocs/export/index.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', 1);
-define('MENUITEM', 'myportfolio/export');
+define('MENUITEM', 'manage/export');
 require(dirname(dirname(__FILE__)) . '/init.php');
 require_once('view.php');
 require_once('collection.php');

htdocs/group/find.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', 1);
-define('MENUITEM', 'groups/find');
+define('MENUITEM', 'engage/find');
 require(dirname(dirname(__FILE__)) . '/init.php');
 define('TITLE', get_string('findgroups'));
 require_once('group.php');

htdocs/group/mygroups.php

@@ -10,7 +10,7 @@
  */
 
 define('INTERNAL', 1);
-define('MENUITEM', 'groups/mygroups');
+define('MENUITEM', 'engage/mygroups');
 require(dirname(dirname(__FILE__)) . '/init.php');
 define('TITLE', get_string('mygroups'));
 define('SECTION_PLUGINTYPE', 'core');

htdocs/import/index.php

@@ -30,7 +30,7 @@
  */
 
 define('INTERNAL', 1);
-define('MENUITEM', 'myportfolio/import');
+define('MENUITEM', 'manage/import');
 require(dirname(dirname(__FILE__)) . '/init.php');
 define('SECTION_PLUGINTYPE', 'core');
 define('SECTION_PLUGINNAME', 'import');

htdocs/interaction/forum/lib.php

@@ -378,8 +378,8 @@ EOF;
 
     public static function menu_items() {
         return array(
-            'groups/topics' => array(
-                'path' => 'groups/topics',
+            'engage/topics' => array(
+                'path' => 'engage/topics',
                 'url' => 'group/topics.php',
                 'title' => get_string('Topics', 'interaction.forum'),
                 'weight' => 70,

htdocs/js/mahara.js

@@ -1101,3 +1101,14 @@ jQuery(function($) {
         });
     }
 });
+
+/**
+ * Wire up menu so that links with submenu but no url just toggle the child collapse
+ */
+jQuery(function($) {
+    $('nav .menu-dropdown-toggle').on('click', function(e) {
+        e.stopPropagation();
+        e.preventDefault();
+        $(this).next().trigger('click');
+    });
+});

htdocs/lang/en.utf8/mahara.php

@@ -768,6 +768,9 @@ $string['overview']     = 'Overview';
 $string['home']         = 'Home';
 $string['Content']      = 'Content';
 $string['myportfolio']  = 'Portfolio';
+$string['Create']       = 'Create';
+$string['Engage']       = 'Engage';
+$string['Manage']       = 'Manage';
 $string['settings']     = 'Settings';
 $string['myfriends']          = 'My friends';
 $string['findpeople']        = 'Find people';

htdocs/lib/view.php

@@ -5991,10 +5991,10 @@ class View {
             define('MENUITEM', $share ? 'manageinstitutions/share' : 'manageinstitutions/institutionviews');
         }
         else if ($collection) {
-            define('MENUITEM', 'myportfolio/collection');
+            define('MENUITEM', 'create/views');
         }
         else {
-            define('MENUITEM', $share ? 'myportfolio/share' : 'myportfolio/views');
+            define('MENUITEM', $share ? 'engage/share' : 'create/views');
         }
     }
 
@@ -6014,7 +6014,7 @@ class View {
             define('MENUITEM', 'manageinstitutions/institutionviews');
         }
         else {
-            define('MENUITEM', 'myportfolio/views');
+            define('MENUITEM', 'create/views');
         }
     }
 

htdocs/lib/web.php

@@ -745,6 +745,7 @@ EOF;
         }
         $mainnavsubnav = $SELECTEDSUBNAV;
         $smarty->assign('RIGHTNAV', right_nav());
+        $smarty->assign('MESSAGEBOX', message_nav());
         if (!$mainnavsubnav && $dropdownmenu) {
             // In drop-down navigation, the submenu is only usable if its parent is one of the top-level menu
             // items.  But if the submenu comes from something in right_nav (settings), it's unreachable.
@@ -807,7 +808,10 @@ EOF;
         }
 
         if ($USER->is_logged_in() && defined('MENUITEM') &&
-            (substr(MENUITEM, 0, 11) == 'myportfolio' || substr(MENUITEM, 0, 7) == 'content')) {
+            (
+                substr(MENUITEM, 0, 7) == 'profile' ||
+                in_array(substr(MENUITEM, 0, 6), array('create', 'engage', 'manage'))
+            )) {
             if (get_config('showselfsearchsideblock')) {
                 $sideblocks[] = array(
                     'name'   => 'selfsearch',
@@ -2259,6 +2263,7 @@ function admin_nav() {
             'title'  => get_string('adminhome', 'admin'),
             'weight' => 10,
             'accesskey' => 'a',
+            'iconclass' => 'home',
         ),
         'adminhome/home' => array(
             'path'   => 'adminhome/home',
@@ -2278,6 +2283,7 @@ function admin_nav() {
             'title'  => get_string('configsite', 'admin'),
             'weight' => 20,
             'accesskey' => 's',
+            'iconclass' => 'cogs',
         ),
         'configsite/siteoptions' => array(
             'path'   => 'configsite/siteoptions',
@@ -2345,6 +2351,7 @@ function admin_nav() {
             'title'  => get_string('users'),
             'weight' => 30,
             'accesskey' => 'u',
+            'iconclass' => 'user',
         ),
         'configusers/usersearch' => array(
             'path'   => 'configusers/usersearch',
@@ -2395,6 +2402,7 @@ function admin_nav() {
             'accessibletitle' => get_string('administergroups', 'admin'),
             'weight' => 40,
             'accesskey' => 'r',
+            'iconclass' => 'users',
         ),
         'managegroups/groups' => array(
             'path'   => 'managegroups/groups',
@@ -2432,6 +2440,7 @@ function admin_nav() {
             'title'  => get_string('Institutions', 'admin'),
             'weight' => 50,
             'accesskey' => 'i',
+            'iconclass' => 'university',
         ),
         'manageinstitutions/institutions' => array(
             'path'   => 'manageinstitutions/institutions',
@@ -2516,6 +2525,7 @@ function admin_nav() {
             'url'    => 'admin/users/statistics.php',
             'title'  => get_string('reports', 'statistics'),
             'weight' => 60,
+            'iconclass' => 'pie-chart',
         ),
         'configextensions' => array(
             'path'   => 'configextensions',
@@ -2523,6 +2533,7 @@ function admin_nav() {
             'title'  => get_string('Extensions', 'admin'),
             'weight' => 70,
             'accesskey' => 'e',
+            'iconclass' => 'puzzle-piece',
         ),
         'configextensions/pluginadmin' => array(
             'path'   => 'configextensions/pluginadmin',
@@ -2609,6 +2620,7 @@ function institutional_admin_nav() {
             'title'  => get_string('users'),
             'weight' => 10,
             'accesskey' => 'u',
+            'iconclass' => 'user',
         ),
         'configusers/usersearch' => array(
             'path'   => 'configusers/usersearch',
@@ -2647,6 +2659,7 @@ function institutional_admin_nav() {
             'accessibletitle' => get_string('administergroups', 'admin'),
             'weight' => 20,
             'accesskey' => 'g',
+            'iconclass' => 'users',
         ),
         'managegroups/archives' => array(