intro/dashboard: Update dashboard and navigation

The navigation changed in Mahara 18.10 according
to feedback received from users, in particular
around the main menu (Bug #1782954).

source/intro/dashboard.rst

@@ -97,12 +97,6 @@ You can change certain aspects of your dashboard, namely the :ref:`user-specific
 
    Your homepage is your dashboard from which you can access a number of areas in Mahara conveniently.
 
-#. **Navigation**: Use the *Main menu navigation* icon |main menu| to navigate to other areas of your portfolio.
-
-   .. note::
-      Administrators and staff who have access to the administration area, see the *Administration menu navigation* icon |admin menu| in addition to the main menu navigation so they can navigate within the administration area.
-
-#. **User navigation**: Click the *User menu navigation* icon |menu open| to reach your account settings, inbox, and logout link, or click your profile picture to be taken to your profile page.
 #. **Search**: :index:`Search <single: Fulltext search>` for users who have an account to view their profile page and check which pages they have made accessible to you. If your site has fulltext search available, you can search for anything on the site using this search box.
 
    .. note::
@@ -112,13 +106,24 @@ You can change certain aspects of your dashboard, namely the :ref:`user-specific
 
       If the site administrator turned on :ref:`exact user search <plugin_search>`, you need to provide the correct display name or real name in order to find another user.
 
+#. **Inbox**: Click the *Inbox* icon |inbox icon| to view all your notifications and send messages.
+
+   .. note::
+      |new in Mahara 18.10| :index:`The <single: New in Mahara 18.10; Inbox not in sub menu anymore>` *Inbox* has its prominent place again outside of the user menu to be seen more easily.
+
+#. **User menu**: Click the *User menu navigation* icon |menu open| to reach your account settings, profile, profile pictures, legal statements, connected apps, notification settings, and the logout link, or click your profile picture to be taken to your profile page.
+#. **Main menu**: Use the *Main menu navigation* icon |main menu| to navigate to other areas of your portfolio.
+
+   .. note::
+      Administrators and staff who have access to the administration area, see the *Administration menu navigation* icon |admin menu| in addition to the main menu navigation so they can navigate within the administration area.
+
 #. **Quick links**: These :ref:`quick links <dashboard_quick_links>` take you directly to certain areas of Mahara.
-#. **User-specific information**: You can customise :ref:`this area <user_specific_information>` on your dashboard to put blocks there that you want to see every time you log in.
 #. **Edit dashboard**: The *Edit dashboard* button allows you to jump directly into the edit screen for your dashboard without having to go to *Portfolio → Pages* first.
 
    .. note::
       You cannot add a :ref:`skin <skins>` to your dashboard page.
 
+#. **User-specific information**: You can customise :ref:`this area <user_specific_information>` on your dashboard to put blocks there that you want to see every time you log in.
 #. **Personal information**: This sidebar block contains static and dynamic information:
 
    * Your name is linked to your profile page.
@@ -139,12 +144,9 @@ You can change certain aspects of your dashboard, namely the :ref:`user-specific
 Navigation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The navigation changed in Mahara 17.04 to a more app-style like one that users already know from mobile devices. The navigation makes it easier to distinguish between the main navigation menu and the administration navigation.
-
-.. note::
-   If you want to use the old navigation a little while longer, you can base your custom theme on the "Old raw" theme as parent theme. It was updated with a number of changes prior to moving to the app-style navigation so you can take advantage of more theme variables. You will need to make some changes to your custom theme to accommodate these improvements.
+The app-style like navigation makes it easier to distinguish between the main navigation menu, the user menu, and the administration navigation.
 
-   The built-in themes are `available for download <https://git.mahara.org/old-themes/mahara-themes/tree/themes_1610_plus>`_ using the old-style navigation. It is a snapshot taken before the new navigation was added. No future changes are made to these themes. You may need to make some changes in future yourself if you want to continue the old-style navigation.
+|new in Mahara 18.10| :index:`The <single: New in Mahara 18.10; Navigation menu item changes>` distribution of the navigation menu items has changed. Now all items used to create, collect, and organize content and portfolios can be found in the "Create" menu item and all items concerning collaboration and sharing with others in the "Engage" menu item.
 
 .. index::
    single: Navigation; Main menu navigation
@@ -162,8 +164,13 @@ The main menu is visible to all users and allows everyone to navigate to their c
    The main menu is the same for everyone
 
 #. Click the *Main menu navigation* icon |main menu| to see a drop-down menu with the available options.
-#. Click one of the options to reach them or
-#. Click the *Arrow down* icon |menu open| to reach the second level navigation. You can then click the *Arrow up* icon |menu close| to close the second level navigation.
+#. Click one of the options to reach them. If there is another level of menu items, clicking the menu item or the the *Arrow down* icon |menu open| will display these.
+#. Click the title again or the *Arrow up* icon |menu close| to close the second level navigation.
+
+   .. note::
+      You can also click anywhere in the entire bar that surrounds the menu item to trigger an action.
+
+#. Click a sub menu item to be taken to the appropriate page.
 
 .. index::
    single: Navigation; Admin menu navigation
@@ -172,20 +179,24 @@ The main menu is visible to all users and allows everyone to navigate to their c
 
 Administration menu navigation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+If you have access to administration functionality, you see a second menu, the administration menu.
 
 .. note::
-   This menu is only available to staff and administrators.
-
-If you have access to administration functionality, you see a second menu, the administration menu.
+   Depending on your permissions, you may not see all menu items. The menu displayed here is the one of the site administrator who can see everything in the administration menu. Staff and institution administrators see a subset of these items.
 
 .. figure:: /images/navigation_admin.*
    :alt: Administration menu navigation
 
    The administration menu is only available to staff and administrators.
 
-#. Click the *Administration menu navigation* icon |admin menu| to see a drop-down menu with the available options. Depending on your role, you may not see all the options shown in the screenshot.
-#. Click one of the options to reach them or
-#. Click the *Arrow down* icon |menu open| to reach the second level navigation. You can then click the *Arrow up* icon |menu close| to close the second level navigation.
+#. Click the *Administration menu navigation* icon |admin menu| to see a drop-down menu with the available options.
+#. Click one of the options to reach them. If there is another level of menu items, clicking the menu item or the the *Arrow down* icon |menu open| will display these.
+#. Click the title again or the *Arrow up* icon |menu close| to close the second level navigation.
+
+   .. note::
+      You can also click anywhere in the entire bar that surrounds the menu item to trigger an action.
+
+#. Click a sub menu item to be taken to the appropriate page.
 
 .. index::
    single: Navigation; User menu navigation
@@ -209,15 +220,16 @@ The user menu is visible to all users. It allows you to acces your account setti
    .. note::
       :ref:`If an administrator masquerades as another user <login_as>`, this name helps to check quickly, in which account actions are undertaken.
 
-#. **Settings**: Top level navigation item that gives you access to more options:
+#. **Profile**: Jump to the settings page of your profile where you can change vital basic information.
+#. **Profile pictures**: Click this menu item to be taken to the page where you can manage your profile pictures.
+#. **Settings**: Top level navigation item that gives you access to more options. Click the text or the *Arrow down* icon |menu open| to see the secondary navigation:
 
    * **Settings**: This link gives you access to your :ref:`account settings and notifications <settings>`
+   * **Legal**: The legal texts, i.e. the privacy statement and the terms and conditions, are displayed that you have either actively or implicitely agreed to.
    * **Notifications**: Change your notification preferences.
    * **Apps**: See which apps you have connected to your account.
 
-#. **Inbox**: Go to your Mahara inbox to check for new messages. When you have unread messages, the counter displays the number of unread messages.
 #. **Logout**: Link to log out of your current session.
-#. Click the *Arrow down* icon |menu open| to reach the second level navigation. You can then click the *Arrow up* icon |menu close| to close the second level navigation.
 
 .. index::
    single: Dashboard; Quick links