Commit d09a3803 authored by Hugh Davenport's avatar Hugh Davenport Committed by Gerrit Code Review
Browse files

Merge "Bug#1100024 Relocated Shared pages & edited string"

parents 13cfd538 61af4b1c
......@@ -156,6 +156,7 @@ $string['profileicon'] = 'Profile picture';
// general views stuff
$string['Added'] = 'Added';
$string['share'] = 'Share';
$string['sharedbyme'] = 'Shared by me';
$string['sharewith'] = 'Share with';
$string['accesslist'] = 'Access list';
$string['sharewithmygroups'] = 'Share with my groups';
......@@ -361,7 +362,7 @@ $string['grouphomepage'] = 'Group homepage';
$string['grouphomepagedescription'] = 'The Group homepage is the content that appears on the About tab for this group';
// Shared views
$string['sharedviews'] = 'Shared pages';
$string['sharedviews'] = 'Shared with me';
$string['titleanddescription'] = 'Title, description, tags';
$string['tagsonly'] = 'Tags only';
$string['sharedviewsdescription'] = 'This page lists the most recently modified or commented on pages that have been shared with you. They may have been shared with you directly, shared with friends of the owner, or shared with one of your groups.';
......
......@@ -2288,9 +2288,15 @@ function mahara_standard_nav() {
'myportfolio/share' => array(
'path' => 'myportfolio/share',
'url' => 'view/share.php',
'title' => get_string('share', 'view'),
'title' => get_string('sharedbyme', 'view'),
'weight' => 30,
),
'myportfolio/sharedviews' => array(
'path' => 'myportfolio/sharedviews',
'url' => 'view/sharedviews.php',
'title' => get_string('sharedviews', 'view'),
'weight' => 60,
),
'myportfolio/export' => array(
'path' => 'myportfolio/export',
'url' => 'export/',
......@@ -2341,12 +2347,6 @@ function mahara_standard_nav() {
'title' => get_string('institutionmembership'),
'weight' => 50,
),
'groups/sharedviews' => array(
'path' => 'groups/sharedviews',
'url' => 'view/sharedviews.php',
'title' => get_string('sharedviews', 'view'),
'weight' => 60,
),
);
return $menu;
......
......@@ -26,7 +26,7 @@
*/
define('INTERNAL', 1);
define('MENUITEM', 'groups/sharedviews');
define('MENUITEM', 'myportfolio/sharedviews');
require(dirname(dirname(__FILE__)) . '/init.php');
require_once(get_config('libroot') . 'view.php');
......
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