Commit aaabbc64 authored by Kristina Hoeppner's avatar Kristina Hoeppner Committed by Robert Lyon
Browse files

Bug 1667539: "Institutions" in 2nd level nav to "Settings" 

to avoid having "Institutions" shown up twice,
once in 1st level nav and then in 2nd level nav
again. For all other items in the 2nd level nav
we say what we are displaying just not for the
"Settings" page as the institutions as listed
differently than on the other pages.

Change-Id: I9b9248226fce76e485c8a898c04fe4eb2bf5e7e8
parent 82d4a700

htdocs/lang/en.utf8/admin.php

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ $string['staffusers'] = 'Staff users'; 
$string['staffusersdescription'] = 'Assign users staff permissions';

$string['adminusers'] = 'Admin users';

$string['adminusersdescription'] = 'Assign site administrator access rights';

$string['settings']   = 'Settings';

$string['institution']   = 'Institution';

$string['institutions']   = 'institutions';

$string['Institutions']   = 'Institutions';

htdocs/lib/web.php

+1 −1
Original line number Diff line number Diff line
@@ -2451,7 +2451,7 @@ function admin_nav() { 
        'manageinstitutions/institutions' => array(

            'path'   => 'manageinstitutions/institutions',

            'url'    => 'admin/users/institutions.php',

            'title'  => get_string('Institutions', 'admin'),

            'title'  => get_string('settings', 'admin'),

            'weight' => 10,

        ),

        'manageinstitutions/sitepages' => array(

test/behat/features/institution/institution_configuration.feature

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ So I can have different settings for each institution 


Scenario: Turning switches on and off on Edit Institution page (Bug 1431569)

 Given I log in as "admin" with password "Kupuhipa1"

 And I choose "Institutions" in "Institutions" from administration menu

 And I choose "Settings" in "Institutions" from administration menu

 And I press "Add institution"

 And I set the following fields to these values:

 | Institution name * | Team Awesome |

test/behat/features/modules/framework/install_framework.feature

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ Scenario: Installing framework module and activating for an institution 
 Then I should see "Title of your framework"



 # Activate smartevidence in an institution

 And I choose "Institutions" in "Institutions" from administration menu

 And I choose "Settings" in "Institutions" from administration menu

 And I click on "Edit" in "No Institution" row

 And I enable the switch "Allow SmartEvidence"

 And I press "Submit"

test/behat/features/view/menu_navigation.feature

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ Scenario: Checking menu items are available as Admin User (Bug 1467368) 
 And I should see "Update group members by CSV" in the ".managegroups" "css_element"

# Checking the sub navigation in Institutions

 When I press "Show Menu" in the ".manageinstitutions" "css_element"

 Then I should see "Institutions" in the ".manageinstitutions" "css_element"

 Then I should see "Settings" in the ".manageinstitutions" "css_element"

 And I should see "Static pages" in the ".manageinstitutions" "css_element"

 And I should see "Members" in the ".manageinstitutions" "css_element"

 And I should see "Staff" in the ".manageinstitutions" "css_element"