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

Merge "Add contextual help to pages under portfolio, content, and groups (bug #809297)"

parents 3f195edf 2fcfe571
......@@ -11,7 +11,9 @@
define('INTERNAL', 1);
define('MENUITEM', 'groups/institutions');
define('SECTION_PLUGINTYPE', 'core');
define('SECTION_PLUGINNAME', 'account');
define('SECTION_PAGE', 'institutions');
require(dirname(dirname(__FILE__)) . '/init.php');
define('TITLE', get_string('institutionmembership'));
require_once('pieforms/pieform.php');
......
<!-- @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>Notes</h3>
<p>Notes are bits and pieces of text that you can re-use from one portfolio page in another without having to copy the entire page.<p>
......@@ -12,6 +12,9 @@ define('INTERNAL', 1);
require(dirname(dirname(dirname(__FILE__))) . '/init.php');
safe_require('artefact', 'internal');
require_once('view.php');
define('SECTION_PLUGINTYPE', 'artefact');
define('SECTION_PLUGINNAME', 'internal');
define('SECTION_PAGE', 'notes');
define('TITLE', get_string('Notes', 'artefact.internal'));
$offset = param_integer('offset', 0);
......
<!-- @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>Plans</h3>
<p>Plans are simple ToDo lists. They are particularly well-suited to plan medium and long-term endeavours. A plan can consist of a number of individual activities with which completion dates are associated.</p>
<p>You could use the functionality to:</p>
<uL>
<li>set yourself individual goals for a large task.</li>
<li>manage your personal learning activities and keep an eye on how many you have already accomplished during the time frame that you have set yourself.</li>
<li>keep track of workshops you have attended for your professional development over time.</li>
</ul>
......@@ -15,6 +15,10 @@ require(dirname(dirname(__FILE__)) . '/init.php');
require_once('view.php');
require_once('collection.php');
define('TITLE', get_string('exportyourportfolio', 'export'));
define('SECTION_PLUGINTYPE', 'core');
define('SECTION_PLUGINNAME', 'export');
define('SECTION_PAGE', 'index');
$SESSION->set('exportdata', '');
$SESSION->set('exportfile', '');
......
......@@ -21,6 +21,9 @@ $offset = param_integer('offset', 0);
$groupcategory = param_signed_integer('groupcategory', 0);
$groupsperpage = 10;
$query = param_variable('query', '');
define('SECTION_PLUGINTYPE', 'core');
define('SECTION_PLUGINNAME', 'group');
define('SECTION_PAGE', 'find');
// check that the filter is valid, if not default to 'all'
if (in_array($filter, array('member', 'notmember', 'canjoin'))) {
......
......@@ -11,7 +11,9 @@
define('INTERNAL', 1);
define('MENUITEM', 'groups/topics');
define('SECTION_PLUGINTYPE', 'core');
define('SECTION_PLUGINNAME', 'group');
define('SECTION_PAGE', 'topics');
require(dirname(dirname(__FILE__)) . '/init.php');
require_once('pieforms/pieform.php');
safe_require('interaction', 'forum');
......
......@@ -32,6 +32,10 @@
define('INTERNAL', 1);
define('MENUITEM', 'myportfolio/import');
require(dirname(dirname(__FILE__)) . '/init.php');
define('SECTION_PLUGINTYPE', 'core');
define('SECTION_PLUGINNAME', 'import');
define('SECTION_PAGE', 'index');
//TODO: Optimize!
raise_memory_limit("512M");
......
<!-- @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>Institution membership</h3>
<p>You can see which institution(s) you are a member.</p>
<p>You may be able to leave your current institution and join other institutions if they allow self-registration. If you cannot leave your institution, you must ask your institution administrator to remove you.</p>
<!-- @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>A collection is a set of pages that are linked to one another and have the same access permissions. You can create as many collections as you like, but a page cannot appear in more than one collection.</p>
<p>You can create a collection from scratch or copy an existing one - either one of your own or one from another user that is copyable to you.</p>
<!-- @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>Export your portfolio</h3>
<p>You can export your portfolio to keep your files and Mahara-created content offline. You can create an export at any time and as often as you wish. You have two options for the export:</p>
<p><strong>Standalone HTML website:</strong> A zip file containing a website with your portfolio data is created. You cannot import this into Mahara or another portfolio system again, but it is readable in a standard web browser and you do not need a Mahara in order to view it. To view, extract the zip file and click on the index.html file that is in the folder.</p>
<p><strong>Leap2A:</strong> A zip file containing a folder in the Leap2A standard format is created. You can then import this into another Leap2A-compliant system, selective import it via the Import page, or have it imported by an administrator into your current Mahara or another one. A new user is created during the import process.
</p>
<!-- @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>Find groups</h3>
<p>You see groups and get basic information about them. If a group administrator decided to hide a group, you will not be able to see it unless you have been invited to it.</p>
<!-- @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>Topics</h3>
<p>Topics is a list of the discussion topics from all the groups in which you are a member. The topics are sorted in reverse chronological order starting with the latest comment.</p>
<!-- @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>Import a portfolio</h3>
<p>You can import your (or any valid Leap2a) portfolio from another Mahara site yourself.</p>
<p>During the import process, you will be asked what you want to do with content that is in your import file. You can decide whether you want to add it to your account or whether you want to ignore it.</p>
<p>You can only import a Leap2A file, but not an HTML file. If you want to import content from another Mahara site, go there and export your portfolio there as Leap2A file. You do not have to export your entire portfolio, but you can choose which pages or collections and thus the artefacts contained on them you wish to export.</p>
</p>
<!-- @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>A page contains a selection of artefacts which you arrange and present to others. These may include:</p>
<ul>
<li>selected files</li>
<li>résumé details</li>
<li>text (your added commentary, instructions or orientation)</li>
<li>journal posts</li>
<li>video and audio files</li>
<li>RSS feed to an external blog</li>
<li>etc.</li>
</uL>
<p>You can re-use the artefacts that you collected under Content in as many pages as you wish.</p>
<!-- @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>Shared by me</h3>
<p>When you have created portfolio pages (and collections), you may wish to share them with others, e.g. to receive feedback.</p>
<p>You can set the access permissions via the <strong>edit access</strong> link or set up a <strong>secret URL</strong> for a page.</p>
<!-- @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>Share with me</h3>
<p>On this page you can list the most recently modified or commented on pages that have been shared with:</p>
<ul>
<li>you directly</li>
<li>you as a friend</li>
<li>you as a member of a group</li>
<li>you as a member of an institution</li>
<li>all registered users</li>
<li>the public (excluding secret URLs)</li>
</ul>
\ No newline at end of file
......@@ -46,6 +46,7 @@ $string['description'] = 'Description';
$string['remove'] = 'Remove';
$string['Close'] = 'Close';
$string['Help'] = 'Help';
$string['Helpicon'] = 'Helpicon';
$string['closehelp'] = 'Close help';
$string['applychanges'] = 'Apply changes';
$string['general'] = 'General';
......
......@@ -1996,7 +1996,7 @@ function getoptions_country() {
function get_help_icon($plugintype, $pluginname, $form, $element, $page='', $section='') {
global $THEME;
return ' <span class="help"><a href="" onclick="'.
return ' <span class="help"><a href="" alt="' . get_string('Helpicon') . '" onclick="'.
hsc(
'contextualHelp(' . json_encode($form) . ',' .
json_encode($element) . ',' . json_encode($plugintype) . ',' .
......
......@@ -16,6 +16,7 @@ define('SECTION_PLUGINTYPE', 'core');
define('SECTION_PLUGINNAME', 'skin');
define('SECTION_PAGE', 'index');
require(dirname(dirname(__FILE__)) . '/init.php');
require_once('skin.php');
require_once('pieforms/pieform.php');
......
Supports Markdown
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