Skip to content

GitLab

Commit fd701fe9 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1692385: Update lang strings & add help files"

parents f25f3e50 814cbd40
Hide whitespace changes
Inline Side-by-side
htdocs/js/mahara.js
View file @ fd701fe9
......@@ -583,7 +583,14 @@ function contextualHelpPosition(container) {
else {
position.left -= containerwidth;
}
position.top -= 10;
if (container.closest('table').parent().hasClass('table-responsive')) {
position.top -= 3;
}
else {
position.top -= 10;
}
contextualHelpContainer.css('visibility', 'visible');
......
htdocs/lang/en.utf8/help/forms/collaboration.comments.html
View file @ fd701fe9
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Comments</h3>
<p>
Sum of all comments made on pages during the selected time period.
Sum of all comments made on pages and artefacts during the selected time period.
</p>
htdocs/lang/en.utf8/help/forms/useractivity.actions.html 0 → 100644
View file @ fd701fe9
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Actions</h3>
<p>
Total number of actions a person performed during the selected time frame. These include:</p>
<ul>
<li>Create and modify an artefact</li>
<li>Write a forum post</li>
<li>Create and modify personal pages and collection</li>
<li>Create and modify group pages and collections</li>
<li>Comment on artefacts and pages</li>
<li>View pages</li>
</ul>
htdocs/lang/en.utf8/help/forms/useractivity.artefacts.html 0 → 100644
View file @ fd701fe9
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Artefacts</h3>
<p>
This is the number of artefacts the user has created or updated during the time period.</p>
<p>These may be fewer or more than what they have in their account in total depending on whether they deleted or created artefacts outside of the chosen time period.
</p>
htdocs/lang/en.utf8/help/forms/useractivity.collections.html 0 → 100644
View file @ fd701fe9
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Collections</h3>
<p>
Total number of collections that a person has created during the time frame.
</p>
htdocs/lang/en.utf8/help/forms/useractivity.groups.html 0 → 100644
View file @ fd701fe9
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Groups</h3>
<p>
The number of groups a person created during the time frame.
</p>
htdocs/lang/en.utf8/help/forms/useractivity.lastactivity.html 0 → 100644
View file @ fd701fe9
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Last activity</h3>
<p>
The following activities are recorded:</p>
<ul>
<li>Add a block to a page</li>
<li>Add a friend</li>
<li>Activate user, i.e. log in for the first time</li>
<li>Clear the cache (as site administrator)</li>
<li>Comment on a page shared with a group</li>
<li>Create a collection</li>
<li>Create a group</li>
<li>Create a page</li>
<li>Create a user</li>
<li>Deactivate a user</li>
<li>Delete an artefact</li>
<li>Delete artefacts</li>
<li>Delete a block from a page</li>
<li>Delete a collection</li>
<li>Delete a friend request</li>
<li>Delete a page</li>
<li>Delete a user</li>
<li>Expire a user</li>
<li>Join a group</li>
<li>Logged in</li>
<li>Masquerade as a user</li>
<li>Release a submitted portfolio</li>
<li>Remove a friend</li>
<li>Save an artefact</li>
<li>Save a page</li>
<li>Send a friend request</li>
<li>Submit a portfolio to a group</li>
<li>Suspend a user</li>
<li>Undelete a user</li>
<li>Unexpire a user</li>
<li>Unsuspend a user</li>
<li>Update a collection</li>
<li>Update a user</li>
<li>Update portfolio access permissions</li>
</ul>
htdocs/lang/en.utf8/help/forms/useractivity.lastlogin.html 0 → 100644
View file @ fd701fe9
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Last login</h3>
<p>
The last time a person logged into their account during the time frame.
</p>
htdocs/lang/en.utf8/help/forms/useractivity.logins.html 0 → 100644
View file @ fd701fe9
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Logins</h3>
<p>
Total number of times a person logged into their account during the selected time frame.
</p>
htdocs/lang/en.utf8/help/forms/useractivity.pages.html 0 → 100644
View file @ fd701fe9
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Pages</h3>
<p>
Total number of pages that a person created during the time frame.</p>
<p>This may be fewer or more pages than they have in their account depending on whether they have deleted some or created some outside of the time frame.</p>
htdocs/lang/en.utf8/statistics.php
View file @ fd701fe9
......@@ -213,6 +213,7 @@ $string['reportaccesslist'] = 'Portfolio access';
$string['reportdescaccesslist'] = '<ul>
<li>Portfolio owner</li>
<li>Title of the portfolio</li>
<li>Number of pages in the portfolio</li>
<li>Access list, i.e. who has permission to view the portfolio</li>
</ul>';
......@@ -221,7 +222,6 @@ $string['reportdescusers'] = '<ul>
<li>Number of people who logged in</li>
<li>Number of accounts created</li>
<li>Total number of people in the selected institution</li>
<li>Information about the average user in the selected institution</li>
</ul>';
$string['reportuserdetails'] = 'User details';
......@@ -240,10 +240,10 @@ $string['reportdescuserdetails'] = '<ul>
$string['reportuseractivity'] = 'User activity';
$string['reportdescuseractivity'] = '<ul>
<li>User information</li>
<li>Number of artefacts</li>
<li>Number of pages</li>
<li>Number of collections</li>
<li>Number of groups</li>
<li>Number of artefacts created or updated</li>
<li>Number of pages created</li>
<li>Number of collections created</li>
<li>Number of groups created</li>
<li>Number of logins</li>
<li>Number of actions (create and modify an artefact, forum post, personal pages and collection, group pages and collections, comments, page views)</li>
<li>Last login</li>
......@@ -274,12 +274,14 @@ $string['reportdescmasquerading'] = '<ul>
$string['reportpageactivity'] = 'Page activity';
$string['reportdescpageactivity'] = '<ul>
<li>Page title</li>
<li>Title of the collection to which the page belongs (if any)</li>
<li>Page owner</li>
<li>Creation date</li>
<li>Last modification date</li>
<li>Date, when the page was last viewed</li>
<li>Number of blocks included in the page</li>
<li>Title of the collection to which the page belongs (if any)</li>
<li>Number of visits to the page</li>
<li>Number of comments on the page</li>
</ul>';
$string['allothers'] = 'All others';
......@@ -325,8 +327,9 @@ $string['reportdescgroups'] = '<ul>
<li>Name</li>
<li>Number of members</li>
<li>Number of pages</li>
<li>Number of comments on group pages</li>
<li>Number of comments on pages shared with the group</li>
<li>Number of shared pages</li>
<li>Number of comments on group pages and artefacts</li>
<li>Number of comments on pages and artefacts shared with the group</li>
<li>Number of forums</li>
<li>Number of forum posts</li>
</ul>
......@@ -348,12 +351,16 @@ $string['reportdescinformation'] = '<ul>
<li>Number of users</li>
<li>Number of pages</li>
<li>Disk space used</li>
<li>Users overview</li>
<li>Pages overview</li>
<li>Growth trend</li>
<li>For "All institutions" only:
<ul>
<li>Number of groups</li>
<li>Database size</li>
<li>Mahara version</li>
<li>Information on the running of cron</li>
<li>Groups overview</li>
</ul></li>
</ul>';
......@@ -366,7 +373,7 @@ $string['reportdesccomparisons'] = '<ul>
<li>Number of artefacts</li>
<li>Number of forum posts by institution members</li>
</ul>
<p><strong>Note:</strong> This report is only available when you select "All institutions" in the "Institution" drop-down menu.';
<p><strong>Note:</strong> This report is only available when you select "All institutions" in the "Institution" drop-down menu. It is only updated at the end of a week.';
$string['reportdesclogins'] = '<ul>
<li>Institution</li>
......
htdocs/lib/statistics.php
View file @ fd701fe9
......@@ -517,7 +517,7 @@ function userdetails_statistics_headers($extra, $urllink) {
'link' => format_goto($urllink . '&sort=email', $extra, array('sort'), 'email')
),
array(
'id' => 'studentid', 'required' => true,
'id' => 'studentid',
'name' => get_string('studentid'),
'class' => format_class($extra, 'studentid'),
'link' => format_goto($urllink . '&sort=studentid', $extra, array('sort'), 'studentid')
......@@ -535,13 +535,13 @@ function userdetails_statistics_headers($extra, $urllink) {
'link' => format_goto($urllink . '&sort=username', $extra, array('sort'), 'username')
),
array(
'id' => 'remotename', 'required' => true,
'id' => 'remotename',
'name' => get_string('remoteuser', 'admin'),
'class' => format_class($extra, 'remotename'),
'link' => format_goto($urllink . '&sort=remotename', $extra, array('sort'), 'remotename')
),
array(
'id' => 'lastlogin', 'required' => true,
'id' => 'lastlogin',
'name' => get_string('lastlogin', 'admin'),
'class' => format_class($extra, 'lastlogin'),
'link' => format_goto($urllink . '&sort=lastlogin', $extra, array('sort'), 'lastlogin')
......@@ -706,48 +706,56 @@ function useractivity_statistics_headers($extra, $urllink) {
'id' => 'artefacts', 'required' => true,
'name' => get_string('artefacts'),
'class' => format_class($extra, 'artefacts'),
'link' => format_goto($urllink . '&sort=artefacts', $extra, array('sort'), 'artefacts')
'link' => format_goto($urllink . '&sort=artefacts', $extra, array('sort'), 'artefacts'),
'helplink' => get_help_icon('core', 'reports', 'useractivity', 'artefacts')
),
array(
'id' => 'pages', 'required' => true,
'name' => get_string('Views', 'view'),
'class' => format_class($extra, 'pages'),
'link' => format_goto($urllink . '&sort=pages', $extra, array('sort'), 'pages')
'link' => format_goto($urllink . '&sort=pages', $extra, array('sort'), 'pages'),
'helplink' => get_help_icon('core', 'reports', 'useractivity', 'pages')
),
array(
'id' => 'collections', 'required' => true,
'name' => get_string('Collections', 'collection'),
'class' => format_class($extra, 'collections'),
'link' => format_goto($urllink . '&sort=collections', $extra, array('sort'), 'collections')
'link' => format_goto($urllink . '&sort=collections', $extra, array('sort'), 'collections'),
'helplink' => get_help_icon('core', 'reports', 'useractivity', 'collections')
),
array(
'id' => 'groups', 'required' => true,
'name' => get_string('groups'),
'class' => format_class($extra, 'groups'),
'link' => format_goto($urllink . '&sort=groups', $extra, array('sort'), 'groups')
'link' => format_goto($urllink . '&sort=groups', $extra, array('sort'), 'groups'),
'helplink' => get_help_icon('core', 'reports', 'useractivity', 'groups')
),
array(
'id' => 'logins', 'required' => true,
'name' => get_string('logins'),
'class' => format_class($extra, 'logins'),
'link' => format_goto($urllink . '&sort=logins', $extra, array('sort'), 'logins')
'link' => format_goto($urllink . '&sort=logins', $extra, array('sort'), 'logins'),
'helplink' => get_help_icon('core', 'reports', 'useractivity', 'logins')
),
array(
'id' => 'actions',
'name' => get_string('actions', 'statistics'),
'class' => format_class($extra, 'actions'),
'link' => format_goto($urllink . '&sort=actions', $extra, array('sort'), 'actions')
'link' => format_goto($urllink . '&sort=actions', $extra, array('sort'), 'actions'),
'helplink' => get_help_icon('core', 'reports', 'useractivity', 'actions')
),
array(
'id' => 'lastlogin', 'required' => true,
'name' => get_string('lastlogin', 'admin'),
'class' => format_class($extra, 'lastlogin'),
'link' => format_goto($urllink . '&sort=lastlogin', $extra, array('sort'), 'lastlogin')
'link' => format_goto($urllink . '&sort=lastlogin', $extra, array('sort'), 'lastlogin'),
'helplink' => get_help_icon('core', 'reports', 'useractivity', 'lastlogin')
),
array(
'id' => 'lastactivity',
'name' => get_string('lastactivity', 'statistics'),
'class' => format_class($extra, 'lastactivity'),
'helplink' => get_help_icon('core', 'reports', 'useractivity', 'lastactivity'),
// 'link' => format_goto($urllink . '&sort=lastactivity', $extra, array('sort'), 'lastactivity')
),
);
......
htdocs/theme/raw/sass/components/_contextual-help.scss
View file @ fd701fe9
......@@ -59,8 +59,7 @@ span.help {
background-color: $popover-title-bg;
border-bottom: 1px solid darken($popover-title-bg, 5%);
border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0;
font-weight: $headings-font-weight;
}
}
// Needed to be more specific
......
htdocs/theme/raw_old/sass/components/_contextual-help.scss
View file @ fd701fe9
......@@ -59,8 +59,7 @@ span.help {
background-color: $popover-title-bg;
border-bottom: 1px solid darken($popover-title-bg, 5%);
border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0;
font-weight: $headings-font-weight;
}
}
// Needed to be more specific
......
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