Commit 0de12267 authored by Robert Lyon's avatar Robert Lyon

Bug 1734182: Change menu from 'Privacy statement' to 'Legal'

That way we can have other things like terms and conditions also part
of this system

Change-Id: I00d44a856142095dc3d48f9953a5c775b06b6891
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 0a13b034
......@@ -16,7 +16,9 @@ define('SECTION_PLUGINTYPE', 'core');
define('SECTION_PLUGINNAME', 'admin');
define('SECTION_PAGE', 'privacy');
require(dirname(dirname(dirname(__FILE__))) . '/init.php');
define('TITLE', get_string('privacy', 'admin'));
define('TITLE', get_string('legal', 'admin'));
define('SUBSECTIONHEADING', get_string('privacy', 'admin'));
$versionid = param_integer('id', null);
if (!is_logged_in()) {
......
......@@ -12,12 +12,14 @@
define('INTERNAL', 1);
define('INSTITUTIONALADMIN', 1);
require(dirname(dirname(dirname(__FILE__))) . '/init.php');
define('TITLE', get_string('privacy', 'admin'));
define('SECTION_PLUGINTYPE', 'core');
define('SECTION_PLUGINNAME', 'admin');
define('SECTION_PAGE', 'institutionprivacy');
define('MENUITEM', 'manageinstitutions/privacy');
require_once('institution.php');
define('TITLE', get_string('legal', 'admin'));
define('SUBSECTIONHEADING', get_string('privacy', 'admin'));
$versionid = param_integer('id', null);
if (!is_logged_in()) {
......
......@@ -496,6 +496,7 @@ $string['pagename'] = 'Page name';
$string['pagesaved'] = 'Page saved';
$string['pagetext'] = 'Page text';
$string['privacy'] = 'Privacy statement';
$string['legal'] = 'Legal';
$string['savechanges'] = 'Save changes';
$string['savefailed'] = 'Save failed';
$string['sitepageloaded'] = 'Site page loaded';
......
......@@ -16,7 +16,7 @@ $config = new stdClass();
// See https://wiki.mahara.org/wiki/Developer_Area/Version_Numbering_Policy
// For upgrades on stable branches, increment the version by one. On master, use the date.
$config->version = 2018010800;
$config->version = 2018010900;
$config->series = '18.04';
$config->release = '18.04dev';
$config->minupgradefrom = 2015030409;
......
......@@ -2268,7 +2268,7 @@ function admin_nav() {
'configsite/privacy' => array(
'path' => 'configsite/privacy',
'url' => 'admin/site/privacy.php',
'title' => get_string('privacy', 'admin'),
'title' => get_string('legal', 'admin'),
'weight' => 25,
),
'configsite/sitemenu' => array(
......@@ -2422,7 +2422,7 @@ function admin_nav() {
'manageinstitutions/privacy' => array(
'path' => 'manageinstitutions/privacy',
'url' => 'admin/users/institutionprivacy.php',
'title' => get_string('privacy', 'admin'),
'title' => get_string('legal', 'admin'),
'weight' => 17
),
'manageinstitutions/institutionusers' => array(
......@@ -2646,7 +2646,7 @@ function institutional_admin_nav() {
'manageinstitutions/privacy' => array(
'path' => 'manageinstitutions/privacy',
'url' => 'admin/users/institutionprivacy.php',
'title' => get_string('privacy', 'admin'),
'title' => get_string('legal', 'admin'),
'weight' => 17
),
'manageinstitutions/institutionusers' => array(
......
......@@ -86,6 +86,7 @@ Scenario: Checking menu items are available as Admin User (Bug 1467368)
Then I should see "Site options" in the "Configure site sub-menu" property
And I should see "Static pages" in the "Configure site sub-menu" property
And I should see "Menus" in the "Configure site sub-menu" property
And I should see "Legal" in the "Configure site sub-menu" property
And I should see "Networking" in the "Configure site sub-menu" property
And I should see "Licenses" in the "Configure site sub-menu" property
And I should see "Pages and collections" in the "Configure site sub-menu" property
......@@ -113,6 +114,7 @@ Scenario: Checking menu items are available as Admin User (Bug 1467368)
When I press "Show menu for Institutions"
Then I should see "Settings" in the "Institutions sub-menu" property
And I should see "Static pages" in the "Institutions sub-menu" property
And I should see "Legal" in the "Configure site sub-menu" property
And I should see "Members" in the "Institutions sub-menu" property
And I should see "Staff" in the "Institutions sub-menu" property
And I should see "Administrators" in the "Institutions sub-menu" property
......@@ -168,6 +170,7 @@ Scenario: Checking menu items are available as Institution Administrator (Bug 14
Then I should not see "Profile completion" in the "Institutions sub-menu" property
And I should see "Settings" in the "Institutions sub-menu" property
And I should see "Static pages" in the "Institutions sub-menu" property
And I should see "Legal" in the "Configure site sub-menu" property
And I should see "Members" in the "Institutions sub-menu" property
And I should see "Staff" in the "Institutions sub-menu" property
And I should see "Administrators" in the "Institutions sub-menu" property
......
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