Commit d42dfcd6 authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1795272: Make navigation menu changes for more clarity



1. Change "Settings" to "Preferences" in the user menu's "Settings"
category.
2. Move "Shared by me" and "Shared with me" to a new "Share" category in
the main menu to conform with the three main elements of Mahara.

Change-Id: I0af04a22df5d6469c74674225a7c68c642d99281
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 0f603d9e
......@@ -16,7 +16,7 @@ define('SECTION_PLUGINNAME', 'account');
define('SECTION_PAGE', 'preferences');
require(dirname(dirname(__FILE__)) . '/init.php');
define('TITLE', get_string('account'));
define('TITLE', get_string('preferences'));
// load up user preferences
$prefs = (object) load_account_preferences($USER->id);
......
......@@ -18,7 +18,7 @@ require(dirname(dirname(__FILE__)) . '/init.php');
safe_require('interaction', 'forum');
require_once('group.php');
define('TITLE', get_string('Topics', 'interaction.forum'));
define('TITLE', get_string('discussiontopics', 'interaction.forum'));
if (!$USER->is_logged_in()) {
throw new AccessDeniedException(get_string('accessdenied', 'error'));
......
......@@ -51,6 +51,7 @@ $string['deletetopic'] = 'Delete topic';
$string['deletetopicspecific'] = 'Delete topic "%s"';
$string['deletetopicsuccess'] = 'Topic deleted successfully';
$string['deletetopicsure'] = 'Are you sure you want to do this? It cannot be undone.';
$string['discussiontopics'] = 'Discussion topics';
$string['editpost'] = 'Edit post';
$string['editpostsuccess'] = 'Post edited successfully';
......
......@@ -381,8 +381,8 @@ EOF;
'engage/topics' => array(
'path' => 'engage/topics',
'url' => 'group/topics.php',
'title' => get_string('Topics', 'interaction.forum'),
'weight' => 70,
'title' => get_string('discussiontopics', 'interaction.forum'),
'weight' => 50,
),
);
}
......
......@@ -6036,7 +6036,7 @@ class View {
define('MENUITEM', 'create/views');
}
else {
define('MENUITEM', $share ? 'engage/share' : 'create/views');
define('MENUITEM', $share ? 'share/sharedbyme' : 'create/views');
}
}
......
......@@ -2898,11 +2898,18 @@ function mahara_standard_nav() {
'weight' => 20,
'iconclass' => 'plus',
),
'share' => array(
'path' => 'share',
'url' => null,
'title' => get_string('share'),
'weight' => 30,
'iconclass' => 'unlock-alt',
),
'engage' => array(
'path' => 'engage',
'url' => null,
'title' => get_string('Engage'),
'weight' => 30,
'weight' => 40,
'iconclass' => 'users',
),
'create/views' => array(
......@@ -2918,17 +2925,17 @@ function mahara_standard_nav() {
'title' => get_string('tags'),
'weight' => 80,
),
'engage/share' => array(
'path' => 'engage/share',
'share/sharedbyme' => array(
'path' => 'share/sharedbyme',
'url' => 'view/share.php',
'title' => get_string('sharedbyme', 'view'),
'weight' => 60,
'weight' => 10,
),
'engage/sharedviews' => array(
'path' => 'engage/sharedviews',
'share/sharedviews' => array(
'path' => 'share/sharedviews',
'url' => 'view/sharedviews.php',
'title' => get_string('sharedwithme', 'view'),
'weight' => 70,
'weight' => 20,
),
'manage/export' => array(
'path' => 'manage/export',
......@@ -2948,7 +2955,7 @@ function mahara_standard_nav() {
'path' => 'manage',
'url' => null,
'title' => get_string('Manage'),
'weight' => 30,
'weight' => 40,
'iconclass' => 'wrench',
),
'engage/mygroups' => array(
......@@ -2980,7 +2987,7 @@ function mahara_standard_nav() {
'path' => 'engage/institutions',
'url' => 'account/institutions.php',
'title' => get_string('institutionmembership'),
'weight' => 50,
'weight' => 60,
),
);
......@@ -3138,7 +3145,7 @@ function right_nav() {
'settings/account' => array(
'path' => 'settings/account',
'url' => 'account/index.php',
'title' => get_config('dropdownmenu') ? get_string('general') : get_string('account'),
'title' => get_string('preferences'),
'weight' => 10,
'iconclass' => 'user'
),
......
......@@ -33,6 +33,7 @@ define ("LOCATOR_CONSTANTS", json_encode(array(
'Admin Groups sub-menu' => array(".managegroups ul", "css_element"),
'Institutions sub-menu' => array(".manageinstitutions ul", "css_element"),
'Options dialog' => array(".modal-header", "css_element"),
'Share sub-menu' => array(".share", "css_element"),
'Engage sub-menu' => array(".engage", "css_element"),
'Web services sub-menu' => array(".webservices", "css_element"),
'H1 heading' => array("h1", "css_element"),
......
......@@ -12,8 +12,8 @@
define('INTERNAL', 1);
require(dirname(dirname(__FILE__)) . '/init.php');
require_once(get_config('libroot') . 'view.php');
define('TITLE', get_string('share', 'view'));
define('MENUITEM', 'engage/share');
define('TITLE', get_string('sharedbyme', 'view'));
define('MENUITEM', 'share/sharedbyme');
define('SECTION_PLUGINTYPE', 'core');
define('SECTION_PLUGINNAME', 'view');
define('SECTION_PAGE', 'share');
......
......@@ -10,7 +10,7 @@
*/
define('INTERNAL', 1);
define('MENUITEM', 'engage/sharedviews');
define('MENUITEM', 'share/sharedviews');
require(dirname(dirname(__FILE__)) . '/init.php');
require_once(get_config('libroot') . 'view.php');
......
......@@ -11,7 +11,7 @@ Background:
Scenario: Admin can't change password to anything not fitting password policy
Given I log in as "admin" with password "Kupuh1pa!"
And I choose "Settings" in "Settings" from user menu
And I choose "Preferences" in "Settings" from user menu
And I fill in "Current password" with "Kupuh1pa!"
And I fill in "New password" with "abc123"
And I fill in "Confirm password" with "abc123"
......@@ -31,7 +31,7 @@ Scenario: Admin can't change password to anything not fitting password policy
Scenario: Student can't change password to anything not fitting password policy
Given I log in as "Supercool" with password "Kupuh1pa!"
And I choose "Settings" in "Settings" from user menu
And I choose "Preferences" in "Settings" from user menu
And I fill in "Current password" with "Kupuh1pa!"
And I fill in "New password" with "fastdog"
And I fill in "Confirm password" with "fastdog"
......
......@@ -56,7 +56,7 @@ Scenario: Trying a username or password that doesn't exist (Bug 1460911)
Scenario: Student can't change password to anything on suckypasswords list (Bug #844457)
Given I log in as "UserA" with password "Kupuh1pa!"
And I choose "Settings" in "Settings" from user menu
And I choose "Preferences" in "Settings" from user menu
And I fill in "Current password" with "Kupuh1pa!"
And I fill in "New password" with "abc123"
And I fill in "Confirm password" with "abc123"
......
......@@ -46,7 +46,7 @@ Scenario: Creating an Institution assigning users and changing their passwords
# Verifying password was changed successfully
And I should see "Your new password has been saved"
# Changing password
And I choose "Settings" in "Settings" from user menu
And I choose "Preferences" in "Settings" from user menu
And I fill in the following:
| Current password | Mahara1sGreat@ |
| New password | MaharaIsC00l! |
......@@ -66,7 +66,7 @@ Scenario: Creating an Institution assigning users and changing their passwords
# Verifying password was changed
And I should see "Your new password has been saved"
# Changing password
And I choose "Settings" in "Settings" from user menu
And I choose "Preferences" in "Settings" from user menu
And I fill in the following:
| Current password | Mahara1sGreat@ |
| New password | MaharaIsC00l! |
......
......@@ -98,14 +98,14 @@ These list must take into account the sort option chosen in the block config (Bu
And I should see "GroupA"
# Share pages and collections to the "GroupA"
# Edit access for Page UserA_01
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I follow "Pages"
And I click on "Edit access" in "Page UserA_01" row
And I set the select2 value "Page UserA_01, Page UserA_02, Page UserA_03, Page UserA_04, Page UserA_05" for "editaccess_views"
And I select "GroupA" from "accesslist[0][searchtype]"
And I press "Save"
# Edit access for Collection UserA_01
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I follow "Collections"
And I click on "Edit access" in "Collection UserA_01" row
And I should not see "Collection UserA_02" in the "Collections text-box" property
......@@ -120,7 +120,7 @@ These list must take into account the sort option chosen in the block config (Bu
And I should see "GroupA"
# Share pages and collections to the "GroupA"
# Edit access for pages
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I click on "Edit access" in "Page UserB_01" row
And I set the select2 value "Page UserB_01, Page UserB_02, Page UserB_03, Page UserB_04, Page UserB_05, Page UserB_06, Page UserB_07" for "editaccess_views"
And I select "GroupA" from "accesslist[0][searchtype]"
......@@ -279,14 +279,14 @@ These list must take into account the sort option chosen in the block config (Bu
And I should see "GroupD"
# Share pages and collections to the standard "GroupD"
# Edit access for Page UserC_01, Page UserC_03, Page UserC_04
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I follow "Pages"
And I click on "Edit access" in "Page UserC_01" row
And I set the select2 value "Page UserC_01, Page UserC_03, Page UserC_04" for "editaccess_views"
And I select "GroupD" from "accesslist[0][searchtype]"
And I press "Save"
# Edit access for Collection UserC_01, Collection UserC_03, Collection UserC_04
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I follow "Collections"
And I click on "Edit access" in "Collection UserC_01" row
And I set the select2 value "Collection UserC_01, Collection UserC_03, Collection UserC_04" for "editaccess_collections"
......@@ -345,14 +345,14 @@ These list must take into account the sort option chosen in the block config (Bu
And I should see "GroupC"
# Share pages and collections to the "GroupC"
# Edit access for Page UserC_09, Page UserC_11, Page UserC_12
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I follow "Pages"
And I click on "Edit access" in "Page UserC_09" row
And I set the select2 value "Page UserC_09, Page UserC_11, Page UserC_12" for "editaccess_views"
And I select "GroupC" from "accesslist[0][searchtype]"
And I press "Save"
# Edit access for Collection UserC_05, Collection UserC_07, Collection UserC_08
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I follow "Collections"
And I click on "Edit access" in "Collection UserC_05" row
And I set the select2 value "Collection UserC_05, Collection UserC_07, Collection UserC_08" for "editaccess_collections"
......
......@@ -55,11 +55,11 @@ Scenario: Showing contextual help for pages under menu "Portfolio" (Bug 809297).
And I follow "Help"
Then I should see "Here you can add pages to your collection and set the order in which they will be displayed in the collection navigation."
# Shared by me
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I click on "Help"
Then I should see "When you have created portfolio pages and collections, you may wish to share them with others, e.g. to receive feedback on your work in form of comments."
# Shared with me
And I choose "Shared with me" in "Engage" from main menu
And I choose "Shared with me" in "Share" from main menu
And I click on "Help"
Then I should see "On this page you can list the most recently modified or commented on pages that have been shared with"
# Skins
......
......@@ -18,7 +18,7 @@ Scenario: Checking navigation of the big homepage buttons
And I click on "Hide information box"
Then I should see "You have hidden the information box."
And I should not see "Find people and join groups"
And I choose "Settings" in "Settings" from user menu
And I choose "Preferences" in "Settings" from user menu
And I enable the switch "Dashboard information"
And I press "Save"
And I am on homepage
......
......@@ -35,16 +35,18 @@ Scenario: Checking menu items are available as a student (Bug 1467368)
And I should see "Résumé" in the "Create sub-menu" property
And I should see "Plans" in the "Create sub-menu" property
And I should see "Notes" in the "Create sub-menu" property
# Checking the sub navigation in Share
When I follow "Share"
And I should see "Shared by me" in the "Share sub-menu" property
And I should see "Shared with me" in the "Share sub-menu" property
# Checking the sub navigation in Engage
When I follow "Engage"
Then I should see "My groups" in the "Engage sub-menu" property
And I should see "Find groups" in the "Engage sub-menu" property
And I should see "My friends" in the "Engage sub-menu" property
And I should see "Find people" in the "Engage sub-menu" property
And I should see "Discussion topics" in the "Engage sub-menu" property
And I should see "Institution membership" in the "Engage sub-menu" property
And I should see "Topics" in the "Engage sub-menu" property
And I should see "Shared by me" in the "Engage sub-menu" property
And I should see "Shared with me" in the "Engage sub-menu" property
# Checking the sub navigation in Manage
When I follow "Manage"
......@@ -184,7 +186,7 @@ Scenario: Checking menu items are available as Institution Administrator (Bug 14
And I should see "Profile pictures"
And I should see "Settings"
When I press "Show menu for Settings"
Then I should see "Settings"
Then I should see "Preferences"
And I should see "Legal"
And I should see "Notifications"
And I should see "Logout"
......@@ -37,14 +37,14 @@
Scenario: Checking the jump list of the paginator (Bug 1409370)
Given I log in as "UserA" with password "Kupuh1pa!"
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I click on "Edit access" in "Page UserA_01" row
And I set the select2 value "Page UserA_01, Page UserA_02, Page UserA_03, Page UserA_04, Page UserA_05, Page UserA_06, Page UserA_07, Page UserA_08, Page UserA_09, Page UserA_10, Page UserA_11, Page UserA_12, Page UserA_13, Page UserA_14, Page UserA_15, Page UserA_16, Page UserA_17, Page UserA_18, Page UserA_19, Page UserA_20, Page UserA_21" for "editaccess_views"
And I select "Public" from "accesslist[0][searchtype]"
And I press "editaccess_submit"
And I log out
And I log in as "UserB" with password "Kupuh1pa!"
And I choose "Shared with me" in "Engage" from main menu
And I choose "Shared with me" in "Share" from main menu
And I check "Registered users"
And I check "Public"
And I select "title" from "sort"
......
......@@ -6,5 +6,5 @@
Scenario: Changing "logged-in users" to "registered users" (Bug 1373095)
Given I log in as "admin" with password "Kupuh1pa!"
When I choose "Shared by me" in "Engage" from main menu
When I choose "Shared by me" in "Share" from main menu
Then I should see "Registered users"
......@@ -39,14 +39,14 @@ The list of shared pages must take into account of access date (Bug 1374163)
# Log in as a normal user
Given I log in as "UserA" with password "Kupuh1pa!"
# Edit access for Page 01
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I follow "Pages"
And I click on "Edit access" in "Page UserA_01" row
And I select "GroupA" from "accesslist[0][searchtype]"
And I fill in "accesslist[0][startdate]" with "2015/06/15 03:00"
And I press "Save"
# Edit access for Page UserA_02
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I follow "Pages"
And I click on "Edit access" in "Page UserA_02" row
And I select "GroupA" from "accesslist[0][searchtype]"
......@@ -55,7 +55,7 @@ The list of shared pages must take into account of access date (Bug 1374163)
And I should see "The end date for 'group' access cannot be in the past."
And I press "Cancel"
# Edit access for Page UserA_03
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I follow "Pages"
And I click on "Edit access" in "Page UserA_03" row
And I follow "Advanced options"
......@@ -63,14 +63,14 @@ The list of shared pages must take into account of access date (Bug 1374163)
| Access start date/time | 2015/06/15 00:00 |
And I press "Save"
# Edit access for Page UserA_05
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I follow "Pages"
And I click on "Edit access" in "Page UserA_05" row
And I select "GroupA" from "accesslist[0][searchtype]"
And I press "Save"
#Checking the last modified date on a collection shared to a group.
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I follow "Edit access"
And I select "GroupA" from "accesslist[0][searchtype]"
And I press "Save"
......@@ -81,7 +81,7 @@ The list of shared pages must take into account of access date (Bug 1374163)
And I should see the date "today" in the "#sharedcollectionlist" element with the format "d F Y"
# Edit access for Collection 01
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I click on "Edit access" in "Collection UserA_01" row
And I set the select2 value "Collection UserA_01" for "editaccess_collections"
And I select "GroupA" from "accesslist[0][searchtype]"
......@@ -107,13 +107,13 @@ The list of shared pages must take into account of access date (Bug 1374163)
And I should not see "Page UserA_03"
And I should not see "Collection UserA_03"
#Testing that view access for views in collections are editable properly
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
Then I should see "Collection UserA_01"
And I follow "Edit access"
Then I should see "Collection UserA_01"
And I should not see "Page UserA_01"
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I follow "Pages"
Then I click on "Edit access" in "Page UserA_07" row
Then I should see "Page UserA_07"
......
......@@ -74,14 +74,14 @@ Scenario: Making sure that the max items per page drop down limits to correct am
And I select "atoz" from "orderby"
And I scroll to the base of id "searchviews_submit"
And I press "searchviews_submit"
And I choose "Shared by me" in "Engage" from main menu
And I choose "Shared by me" in "Share" from main menu
And I click on "Edit access" in "Page UserA_01" row
And I set the select2 value "Page UserA_01, Page UserA_02, Page UserA_03, Page UserA_04, Page UserA_05, Page UserA_06, Page UserA_07, Page UserA_08, Page UserA_09, Page UserA_10, Page UserA_11, Page UserA_12, Page UserA_13, Page UserA_14, Page UserA_15, Page UserA_16, Page UserA_17, Page UserA_18, Page UserA_19, Page UserA_20, Page UserA_21, Page UserA_22, Page UserA_23, Page UserA_24, Page UserA_25, Page UserA_26, Page UserA_27, Page UserA_28, Page UserA_29, Page UserA_30, Page UserA_31, Page UserA_32, Page UserA_33, Page UserA_34, Page UserA_35, Page UserA_36, Page UserA_37, Page UserA_38, Page UserA_39, Page UserA_40, Page UserA_41, Page UserA_42, Page UserA_43, Page UserA_44, Page UserA_45, Page UserA_46, Page UserA_47, Page UserA_48, Page UserA_49, Page UserA_50, Page UserA_51" for "editaccess_views"
And I select "Public" from "accesslist[0][searchtype]"
And I press "Save"
And I log out
And I log in as "UserB" with password "Kupuh1pa!"
And I choose "Shared with me" in "Engage" from main menu
And I choose "Shared with me" in "Share" from main menu
And I check "Registered users"
And I check "Public"
And I select "title" from "sort"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment