Commit 788e163c authored by Masayuki Kuwada's avatar Masayuki Kuwada Committed by Kristina Hoeppner

Fix navigation menu references and a few small language bugs

parent 92fc5d5d
......@@ -91,7 +91,7 @@ noreplyaddress: System email address
``$cfg->noreplyaddress = 'noreply@yourdomainhere';``
Set the system mail address. Notifications are sent from this address (except for a few emails when a person doesn't yet have an account). You can also set it in *Administration → Configure site → Site options → Email settings*.
Set the system mail address. Notifications are sent from this address (except for a few emails when a person doesn't yet have an account). You can also set it in *Administration menu → Configure site → Site options → Email settings*.
Typically, the noreply address is one that is not monitored as people are not supposed to reply to it.
......@@ -252,7 +252,7 @@ You can set a :ref:`spam probation level <set_spam_probation>` for your users to
* ``$cfg->probationenabled = true;``: This setting decides whether users can be put on probation.
* ``$cfg->probationstartingpoints = 2;``: This setting determines how many probation points a newly self-registered user has per default. In this example, users would get two probation points that they need to get rid off before all functionality is available to them.
You can change the probation points individually on the :ref:`user's account settings page <user_account_settings>` in the *Administration*.
You can change the probation points individually on the :ref:`user's account settings page <user_account_settings>` displayed by clicking on a person's username in *Administration menu → User → User search*.
When you enable probation, people who leave comments on a page or artefact and are not logged in, cannot post URLs either.
......
......@@ -114,7 +114,7 @@ User settings
#. **Users can hide real names**: If allowed, users who have set a :ref:`display name <about_me>` may choose to be searchable only by their display name and will not be found in searches by their real name. In the administration section of the site, users are always searchable by their real names. An administrator (site and institution) always sees the display name, first and last name and username.
#. **Never display usernames**: :index:`If set <single: User settings; Never display usernames>` to "Yes", ordinary users cannot search for others using their username in "Search users" on the :ref:`Dashboard <dashboard>` or via :ref:`Find people <find_people>`. They will also not be able to see the username of any other user. These restrictions do not apply to staff and administrators. Additionally, Clean URLs (if activated) for profile pages will be generated using display names (if provided) or real names, rather than usernames.
#. **Show users in public search**: If allowed, :index:`usernames can appear in public search results <Administration; Show users in public search>`. In addition, this feature needs to have the `value <single: config.php; publicsearchallowed>` ``$cfg->publicsearchallowed = true;`` set in your config.php file and requires a search plugin that allows public search, e.g. Elasticsearch.
#. **Show users in public search**: If allowed, :index:`usernames can appear in public search results <Administration; Show users in public search>`. In addition, this feature needs to have the :index:`value <single: config.php; publicsearchallowed>` ``$cfg->publicsearchallowed = true;`` set in your config.php file and requires a search plugin that allows public search, e.g. Elasticsearch.
.. note::
When you change this setting, you need to re-index the search index for the change to take effect.
......@@ -139,7 +139,7 @@ User settings
#. **Export to queue**: :index:`If allowed <single: Use export queue for personal portfolio export (experimental)>`, the export queue will handle the exporting of user portfolios via Leap2A for better server load management.
.. note::
**This feature is still experimental.** Turning this feature on will export individual portfolios in *Portfolio → Export* via the export queue. That means that the export is made when there are enough system resources available. The user exporting a portfolio will receive an email when the export is ready for download.
**This feature is still experimental.** Turning this feature on will export individual portfolios in *Main menu → Manage → Export* via the export queue. That means that the export is made when there are enough system resources available. The user exporting a portfolio will receive an email when the export is ready for download.
#. **Multiple journals**: If allowed, :index:`all users <single: User settings; Allow multiple journals for everyone per default>` will have multiple journals per default. They can still change that setting in their personal account settings.
......@@ -348,7 +348,7 @@ Email settings
Notification settings
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
You can set the default options for new users to receive notifications. Users can override these settings on their own *Settings → Notifications* page.
You can set the default options for new users to receive notifications. Users can override these settings on their own *User menu → Settings → Notifications* page.
The options you have are:
......@@ -530,7 +530,7 @@ Legal
Every site can have a statement about terms and conditions and privacy. If you turned on "Strict privacy" in the :ref:`institution settings <institution_settings>`, everyone needs to accept them before being able to use their account.
.. warning::
The Mahara project cannot legal advice. If you need legal advice, please consult your own lawyer to ensure that you comply with applicable laws.
The Mahara project cannot give legal advice. If you need legal advice, please consult your own lawyer to ensure that you comply with applicable laws.
.. figure:: /images/administration/legal_overview_site.*
:alt: Legal statements overview page
......@@ -678,7 +678,7 @@ You have control over which links are displayed in the footer on each page.
#. If you have an existing page, you can provide the link here.
#. **Contact us**: Set the switch to "Yes" if you want to display a link to a contact form in the footer.
#. If you have a contact page, you can provide the link to overwrite the Mahara one.
#. **External manual**: :index:`If <single: Link to user manual` you want to display a help link to the user manual in the footer of a page, switch this option to "Yes". It will take you to the relevant page in the Mahara user manual of the version of Mahara that you are using.
#. **External manual**: :index:`If <single: Link to user manual>` you want to display a help link to the user manual in the footer of a page, switch this option to "Yes". It will take you to the relevant page in the Mahara user manual of the version of Mahara that you are using.
#. If you have your own copy of the Mahara user manual, you can provide the link here.
#. Click the *Save changes* button to save your choices.
......
......@@ -72,7 +72,7 @@ Add an institution
.. note::
Only site administrators can add institutions. However, once an institution exists, institution administrators can change many of the settings.
When you want to add an institution by clicking the *Add institution* button on *Administration menu → Institutions → Institutions*, you need to provide some basic information for the new institution. You can change all settings later on.
When you want to add an institution by clicking the *Add institution* button on *Administration menu → Institutions → Settings*, you need to provide some basic information for the new institution. You can change all settings later on.
.. figure:: /images/administration/institution_add.*
:alt: Add a new institution
......@@ -250,7 +250,7 @@ The numbers on the example page refer to the configurable theme options above.
Edit the site institution
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Your Mahara site itself is listed as institution under *Administration menu → Institutions → Institutions*. Per default, it has the name "No institution" and you can change certain settings that are applied to the site.
Your Mahara site itself is listed as institution under *Administration menu → Institutions → Settings*. Per default, it has the name "No institution" and you can change certain settings that are applied to the site.
.. note::
Most settings for the site are made in *Administration menu → Configure site → Site options*.
......@@ -304,7 +304,7 @@ Your Mahara site itself is listed as institution under *Administration menu →
Edit an institution
~~~~~~~~~~~~~~~~~~~~~
*Administration menu → Institutions → Institutions →* Click the *Manage* icon |manage| next to an institution
*Administration menu → Institutions → Settings →* Click the *Manage* icon |manage| next to an institution
Once you have created your institution, you can :ref:`edit its settings <add_institution>`, suspend or delete the institution. You will have to choose at least one authentication method for this institution so that user accounts can be created.
......@@ -741,7 +741,7 @@ Legal
Every institution can have its own statement about terms and conditions and privacy **in addition** to the site's statements. If the site administrator turned on "Strict privacy" in the :ref:`institution settings <institution_settings>`, everyone needs to accept them before being able to use their account.
.. warning::
The Mahara project cannot legal advice. If you need legal advice, please consult your own lawyer to ensure that you comply with applicable laws.
The Mahara project cannot give legal advice. If you need legal advice, please consult your own lawyer to ensure that you comply with applicable laws.
.. figure:: /images/administration/legal_overview_institution_1.*
:alt: Legal statements overview page on the institution level without any statements
......
......@@ -125,7 +125,7 @@ You can preview the data that would be sent on a weekly basis. **All information
|new in Mahara 18.10| Revoke registration
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
You an decide not to send weekly anonymous updates about your site to Mahara at any point. If you revoke your registration, no more data will be sent.
You can decide not to send weekly anonymous updates about your site to Mahara at any point. If you revoke your registration, no more data will be sent.
.. figure:: /images/administration/registered_site.*
:alt: Revoke the registration of your Mahara site with the Mahara project
......
......@@ -478,7 +478,7 @@ The report shows:
#. **Site privacy consent reviewed**: Date when the user agreed to the site privacy statement.
#. **Site terms and conditions**: Version number and link to the terms and conditions that the user has a greed to.
#. **Institution privacy statement**: Version number and link to the institution privacy statement that the user has a greed to.
#. **Institution terms and conditions**: Version number and link to the institution privacy statement that the user has a greed to.
#. **Institution terms and conditions**: Version number and link to the institution terms and conditions that the user has a greed to.
#. **Institution**: Name of the institution in which the user is a member.
#. Total number of results.
#. Click the *Download* icon |download icon| to download the report as CSV file.
......@@ -523,7 +523,7 @@ The report shows:
* Administrator who masqueraded
* Start time of the masquerading session
You can display masquerading sessions for all people on the site or your chosen institution. Alternatively, you can select people on *Administration menu → User search* and report only over them:
You can display masquerading sessions for all people on the site or your chosen institution. Alternatively, you can select people on *Administration menu → Users → User search* and report only over them:
#. On the :ref:`User search <user_search>` page, select the people for whom you wish to see the masquerading sesions report and click the *Get reports for selected users* button. You are taken into the *Reports* section.
#. Click the *Configure report* button.
......@@ -654,7 +654,7 @@ The report displays:
* Number of pages in the portfolio
* Access list, i.e. who has permission to view the portfolio
You can display the portfolio access for all people on the site or your chosen institution. Alternatively, you can select people on *Administration menu → User search* and report only over them:
You can display the portfolio access for all people on the site or your chosen institution. Alternatively, you can select people on *Administration menu → Users → User search* and report only over them:
#. On the :ref:`User search <user_search>` page, select the people for whom you wish to see the portfolio access report and click the *Get reports for selected users* button. You are taken into the *Reports* section.
#. Click the *Configure report* button.
......@@ -716,7 +716,7 @@ This report displays information about a user and their level of activity on the
.. note::
This report requires :ref:`event logging <logging_settings>` to be turned on for the entire site. Since events cannot be put into the database in retrospect, correct data is only collected from the time the full event logging has been turned on.
You can display the user activity for all people on the site or your chosen institution. Alternatively, you can select people on *Administration menu → User search* and report only over them:
You can display the user activity for all people on the site or your chosen institution. Alternatively, you can select people on *Administration menu → Users → User search* and report only over them:
#. On the :ref:`User search <user_search>` page, select the people for whom you wish to see the user activity report and click the *Get reports for selected users* button. You are taken into the *Reports* section.
#. Click the *Configure report* button.
......@@ -780,7 +780,7 @@ The user details report provides basic account information about a person and is
* Last login
* Number of probation points
You can display the user details for all people on the site or your chosen institution. Alternatively, you can select people on *Administration menu → User search* and report only over them:
You can display the user details for all people on the site or your chosen institution. Alternatively, you can select people on *Administration menu → Users → User search* and report only over them:
#. On the :ref:`User search <user_search>` page, select the people for whom you wish to see account details and click the *Get reports for selected users* button. You are taken into the *Reports* section.
#. Click the *Configure report* button.
......
......@@ -231,7 +231,7 @@ You can upload a SmartEvidence framework by clicking the *Add framework* button.
Upload a .matrix file that contains a competency framework
#. Click the *Browse* button to choose the matrix file that contains the framework that you want to use.
#. Click the *Save* button to upload the file.
#. Click the *Upload matrix* button to upload the file.
Work with a framework
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......
......@@ -616,7 +616,7 @@ Export queue
The export queue is available for the following exports:
* When group administrators or tutors release portfolios in groups that allow the archiving of submitted pages, these submissions will be placed into the export queue and only released once the export completed successfully.
* If the site administrator enabled the feature to :ref:`queue Leap2A exports <export_to_queue>`, Leap2A exports that users initiate via *Portfolio → Export* are also queued, and once completed, the users receive a notification.
* If the site administrator enabled the feature to :ref:`queue Leap2A exports <export_to_queue>`, Leap2A exports that users initiate via *Main menu → Manage → Export* are also queued, and once completed, the users receive a notification.
.. seealso::
The export queue requires that `cron <https://wiki.mahara.org/index.php/System_Administrator%27s_Guide/Cron_Job>`_ runs.
......
......@@ -9,7 +9,7 @@
Web services
-------------------------------------------
*Administration → Extensions → Web services*
*Administration menu → Web services*
.. note::
*Web services* are only accessible by site administrators.
......@@ -26,7 +26,7 @@ In order to use web services, your site must use a SSL certificate. :index:`When
Configuration
~~~~~~~~~~~~~~~~~~~~~~
*Administration → Extensions → Web services → Configuration*
*Administration menu → Web services → Configuration*
On this page you set up various web services rules and enable or disable them.
......@@ -63,7 +63,7 @@ You can enable web services globally and then configure protocols individually t
Networking certificates
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
In this section, the public key of your Mahara certicate that is created on *Administration → Configure site → Networking* is displayed for convenience.
In this section, the public key of your Mahara certicate that is created on *Administration menu → Configure site → Networking* is displayed for convenience.
.. _manage_service_groups:
......@@ -235,7 +235,7 @@ When you add a user, you need to provide some additional information.
Application connections
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*Administration → Extensions → Web services → Application connections*
*Administration menu → Web services → Application connections*
This is an overview page of all the connections that you have allowed either via personal user tokens or OAuth access tokens.
......@@ -268,7 +268,7 @@ This is an overview page of all the connections that you have allowed either via
Connection manager
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*Administration → Extensions → Web services → Connection manager*
*Administration menu → Web services → Connection manager*
The connection manager facilitates the use of web services by making the setup of connections easier.
......@@ -285,7 +285,7 @@ For more information, see the `wiki <https://wiki.mahara.org/index.php/Developer
Registration of external apps
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*Administration → Extensions → Web services → External apps*
*Administration menu → Web services → External apps*
You can use this page to register external applications that are connected via OAuth. An example is LTI (Learning Tools Interoperability). You can enable external tools for institutions and specific service definitions, for which a consumer key and secret will be generated automatically.
......@@ -337,7 +337,7 @@ When you want an application to connect via OAuth to Mahara, you need to provide
Web services logs
~~~~~~~~~~~~~~~~~~~~~~~
*Administration → Extensions → Web services → Web services logs*
*Administration menu → Web services → Web services logs*
You can view the logs from the web services and narrow you search so you only see the relevant information.
......@@ -382,7 +382,7 @@ If there are any results for your search, you will see them in the **Results** a
Web services test client
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*Administration → Extensions → Web services → Web services test client*
*Administration menu → Web services → Web services test client*
The test client gives you the opportunity to test your settings. Please beware that the functions are executed on the system and not a separate test instance.
......
......@@ -247,7 +247,7 @@ If you enabled multiple journals and have a minimum of two journals, you will se
Select tags to include or exclude
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
When you want to choose which tags to use in your block, you can select multiple tags to include or exclude. That way you can be very flexible in which entries to display in your block and which ones to leave out. You must have tagged your journal entries beforehand. If you haven't done that, please go to your journal entries and tag them. You can find them under *Content → Journal(s)*.
When you want to choose which tags to use in your block, you can select multiple tags to include or exclude. That way you can be very flexible in which entries to display in your block and which ones to leave out. You must have tagged your journal entries beforehand. If you haven't done that, please go to your journal entries and tag them. You can find them under *Main menu → Create → Journals*.
.. figure:: /images/page_editor/blocks/taggedjournalentries_taglist.*
:alt: Display all the tags that you used on journal entries
......
......@@ -6,7 +6,7 @@
Personal info
---------------
The artefact blocks in this tab allow you to include information that you provided in the :ref:`profile <profile>` into your portfolio. If you want to make changes to the text or the images, go to *Content → Profile*.
The artefact blocks in this tab allow you to include information that you provided in the :ref:`profile <profile>` into your portfolio. If you want to make changes to the text or the images, go to *User menu → Profile*.
Furthermore, you can also put certain blocks on your profile page that only exist for that particular page:
......
......@@ -75,7 +75,7 @@ Before you upload a file, make sure that you are allowed to do so. For any artef
* the artefact also adheres to the Terms and Conditions of the Mahara site you are using
.. note::
It can be that you have to agree to an upload agreement before you can upload any files to your *files area*. The site administrator decides about that in *Administration → Extensions → Plugin administration* → :ref:`Plugin type: artefact: file <plugin_file>`.
It can be that you have to agree to an upload agreement before you can upload any files to your *Files area*. The site administrator decides about that in *Administration menu → Extensions → Plugin administration* → :ref:`Plugin type: artefact: file <plugin_file>`.
.. figure:: /images/upload_file.*
:alt: Upload a file
......
......@@ -10,7 +10,7 @@
Journals
----------
*Main menu → Create → Journal*
*Main menu → Create → Journals*
The *Journal* is a tool with which you can record your thoughts and experiences online. By adding your journal or individual posts of it to a page you can allow other users to place feedback and comments on it. Thus, you can create a dialogue with your audience.
......
......@@ -34,11 +34,11 @@ The following instructions are for Debian / Ubuntu based systems and require tha
#. Build the user manual in HTML: ``make html``
.. note::
This will create all translations that are available for the user manual and will take a bit. If you only want to create the English user manual, you can compile it with ``make preview MAHARA=17.04``
This will create all translations that are available for the user manual and will take a bit. If you only want to create the English user manual, you can compile it with ``make preview MAHARA=18.10``
If you want to compile a PDF, you can do so via ``make latexpdf``
#. Open the ``index.html`` file in a browser to view the manual. You can find it in the folder ``build/en/17.04``.
#. Open the ``index.html`` file in a browser to view the manual. You can find it in the folder ``build/en/18.10``.
#. Once you are done editing the user manual, you can deactivate the virtual environment by typing ``deactivate`` in the terminal.
Make changes to the user manual
......@@ -49,7 +49,7 @@ Once you installed the user manual on your computer, you can make changes. The f
#. Enter your user manual folder: ``cd code/manual``
#. Start the virtual environment so you can compile the manual using Sphinx: ``. venv/bin/activate``
#. Now make any changes in your preferred editor.
#. Compile a preview of the manual just in English: ``make preview MAHARA=17.04``
#. Compile a preview of the manual just in English: ``make preview MAHARA=18.10``
.. note::
Change the version number depending on the version of Mahara that you are compiling.
......@@ -121,13 +121,13 @@ Admonitions in use are
Conventions
--------------
* Each section that is related to a navigation menu item should have the path listed, e.g. *Content → Files*. It is best if you copy the arrow to get the correct one.
* Each section that is related to a navigation menu item should have the path listed, e.g. *Main menu → Create → Files*. It is best if you copy the arrow to get the correct one.
* Buttons such as *Save* or *Copy page* and also portfolio sections such as *Content*, *Portfolio* etc. are highlighted as emphasized text (with a single \*).
* Little buttons can be included in the text like |edit|, |manage|. They are added through a substitution. All replacements are kept in the file *shortcuts.rstext* which is included in each file in which a substitution is used by placing "``.. include:: /shortcuts.rstext``" in the first line of the file. Substitutions are referenced in the text as "``*Edit* button |edit|``" for example pointing out what the action is that you do with them. Translators should not edit the substitution "``|edit|``" itself, but only change "``*Edit* button``" taking care to include the \* again without placing any spaces between the \* and the text to ensure that the word appears highlighted.
* An index entry should be created for each section.
* New features receive an index entry as well in the form "single: New in Mahara x, [the functionality that is new]". Index entries can be placed either above an entire section or inline. Inline is preferable for small functional changes so that readers are directly taken to the new functionality. This can be done like so:
| ``:index:`Decide on the sort order <single: New in Mahara 15.04; Sort order of files in the "Folder" block>```
| ``:index:`Decide on the sort order <single: New in Mahara 18.10; Sort order of files in the "Folder" block>```
* Long sections like the administration are broken up into several pages to make the editing more manageable instead of having everything on one very long page.
* reStructuredText does not have a set hierarchy of heading levels. They depend on the individual files. However, to be consistent, the following convention exists:
......@@ -163,7 +163,7 @@ Translators beware
* Do not change the target for internal links that is placed between < >. If you do, the reference cannot be found. There should always be an explanatory text right before the pointy brackets. You can change that.
* Similarly, you can change the text for a URL but not the URL itself unless you want to replace it with a URL to a site in your language.
* If you translate the screenshots and other images, please ensure that you keep the folder structure of the "images" folder as you can see in the respective branch of the manual version you are editing in `Git <https://git.mahara.org/user-manual/manual>`_, for example for `Mahara 15.10 <https://git.mahara.org/user-manual/manual/tree/15.10_STABLE/source/images>`_.
* If you translate the screenshots and other images, please ensure that you keep the folder structure of the "images" folder as you can see in the respective branch of the manual version you are editing in `Git <https://git.mahara.org/user-manual/manual>`_, for example for `Mahara 18.10 <https://git.mahara.org/user-manual/manual/tree/18.10_STABLE/source/images>`_.
* You can find original images used for the manual in the folder "images_original" and then their respective subfolders. You can use them for your own translations if you only want to exchange the background but keep the callouts.
* You do not have to redo any images that you do not "translate", e.g. block icons, general buttons around Mahara and the text editor buttons. Any images that are not in your translation will be taken from the English original.
* The user manual is updated once a day and new translation strings pulled in from Launchpad and images uploaded to Git prior to the compilation of the manual.
......
......@@ -59,7 +59,7 @@ You can enable LTI for an institution as site administrator. Institution adminis
Enable LTI for an institution
#. Go to *Administration → Extensions → Web services → External apps*.
#. Go to *Administration menu → Web services → External apps*.
#. **Application**: Give your application that you want to connect a name. This is an identifier that only you need to understand.
#. Choose the institution in which you want to set up the application.
#. Select "LTI integration" from the drop-down menu.
......@@ -102,7 +102,7 @@ Technically, you can use any authentication method that you have available in Ma
Set a parent authentication method for LTI
#. Click the *Manage* button |manage| next to the LTI app on *Administration → Extensions → Web services → External apps*.
#. Click the *Manage* button |manage| next to the LTI app on *Administration menu → Web services → External apps*.
#. **Institution**: The institution for which you created the LTI app is listed.
#. **Auto-create users**: Flip the switch to "Yes" if you want to allow anybody who has access to the LTI link to create an account automatically.
#. **Parent authority**: Select the authentication method that should be the parent to LTI thus allowing people to log in directly via both and be in the same account.
......
......@@ -74,7 +74,7 @@ When you click on the friend request, you are taken to your *My friends* page. A
View all your pending friend requests
#. View the name of the person requesting friendship and a short description if the user had written one in *Content → Profile → Introduction*. You can click on the name and view the profile page. :index:`You <single: Send friend request; Show date when a friend request was issued>` also see when this user requested your friendship.
#. View the name of the person requesting friendship and a short description if the user had written one in *User menu → Profile → Introduction*. You can click on the name and view the profile page. :index:`You <single: Send friend request; Show date when a friend request was issued>` also see when this user requested your friendship.
#. Read why this user requests friendship if they provided a reason.
#. Click the *Send message* button to communicate with the user before making your decision about this friend request.
#. Click the *Approve request* button to approve the friend request. Once you approve a friend request, you appear immediately on that user's *My friends* page and the user on yours.
......
......@@ -20,7 +20,7 @@ Inside a group
Group homepage
~~~~~~~~~~~~~~~~~~~
*Main menu → Engage → Name of the group → About*
*Main menu → Engage → My Groups → [Name of the group] → About*
The *group homepage* is the central space for a group. There you can get a quick overview of the group and reach all the places that you wish to take a look at in a group. You see a few things per default on the group homepage. The items displayed on the group homepage do not only depend on the default settings but also the options chosen when :ref:`the group was created <create_group_user>`.
......@@ -75,7 +75,7 @@ If you are a group administrator, you can put other blocks on the group homepage
#. :index:`Click <single: Copy a group>` the *Copy* button to duplicate the group. The group's files, journals, pages, collections and group settings are copied. Group membership and forums are not copied.
.. note::
You only see the button if you are allowed to create a group. The :ref:`site administrator decides that <group_settings>` in *Administration → Configure site → Site options → Group settings*.
You only see the button if you are allowed to create a group. The :ref:`site administrator decides that <group_settings>` in *Administration menu → Configure site → Site options → Group settings*.
#. Click the *Delete group* button if you want to permanently delete the group. Group members will receive a notification about the deletion.
......@@ -92,7 +92,7 @@ If you are a group administrator, you can put other blocks on the group homepage
Members
~~~~~~~~
*Main menu → Engage → Name of the group → Members*
*Main menu → Engage → My groups → [Name of the group] → Members*
Members page
^^^^^^^^^^^^^^^^^
......@@ -218,7 +218,7 @@ If the group administrator allowed membership recommendations when :ref:`creatin
Forums
~~~~~~~~~~~
*Main menu → Engage → Name of the group → Forums*
*Main menu → Engage → My groups → [Name of the group] → Forums*
The forums are visible to all group members. If you create a :ref:`public group <public_group>`, anybody online will be able to see the forum discussions. However, they would need to log in to participate. Forums in public groups receive an RSS feed to enable users to subscribe to the discussion forum, e.g. the `mahara.org community forums <https://mahara.org/forums>`_.
......@@ -537,7 +537,7 @@ An administrator or forum moderator can see more details about the topic or post
Pages and collections
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*Main menu → Engage → Name of the group → Pages and collections*
*Main menu → Engage → My groups → [Name of the group] → Pages and collections*
Members of a group have access to certain portfolios. These can be:
......@@ -592,7 +592,7 @@ When you create or edit a group page, you can decide whether only the administra
Journals
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*Main menu → Engage → Name of the group → Journals*
*Main menu → Engage → My groups → [Name of the group] → Journals*
You create group journals like regular :ref:`user journals <journal>`.
......@@ -625,7 +625,7 @@ You create group journals like regular :ref:`user journals <journal>`.
Share
~~~~~~~~~~~~~
*Main menu → Engage → Name of the group → Share*
*Main menu → Engage → My groups → [Name of the group] → Share*
If you are allowed to edit pages and collections in a group, you can see the *Share* tab.
......@@ -654,7 +654,7 @@ If you are allowed to edit pages and collections in a group, you can see the *Sh
Files
~~~~~~~~~~~
*Main menu → Engage → Name of the group → Files*
*Main menu → Engage → My groups → [Name of the group] → Files*
The *Files* area in a group holds all files that are uploaded by group members who have the permission to do so. The uploading process works like the one in :ref:`the personal files <files_area>`.
......@@ -684,7 +684,7 @@ When you have the permission to upload a file, you can also determine additional
Report
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*Main menu → Engage → Name of the group → Report*
*Main menu → Engage → My groups → [Name of the group] → Report*
When you are an administrator of a group, you can :ref:`switch on the participation report in the group settings <set_participation_report>`. The report provides you with information on who commented on what pages that were created in or shared with the group.
......
......@@ -47,7 +47,7 @@ The *My friends* page is the place for you to see who your friends are.
* View the profile picture.
* Click on the name of your friend to reach their profile page.
* See in which institution they are a member, if in any.
* Read the introduction that this user has provided under *Content → Profile → Introduction*.
* Read the introduction that this user has provided under *User menu → Profile → Introduction*.
* The pages of this user to which you have access are listed.
#. Send a message to the user if you wish to do so. This is only possible if the user allowed that. You can change your personal settings for messages from other users in your :ref:`account settings <general_account_options>`.
......
......@@ -20,7 +20,7 @@ Groups can be used for collaboration among users as they offer the possibilities
* submit pages for assessment / feedback
.. note::
Groups can be created by every user, staff or administrators only. The site administrator decides that in *Administration → Configure site → Group settings*.
Groups can be created by every user, staff or administrators only. The site administrator decides that in *Administration menu → Configure site → Site options → Group settings*.
This page lists all your groups. You can see the groups
......
......@@ -6,7 +6,7 @@
Topics
--------------
*Main menu → Engage → Topics*
*Main menu → Engage → Discussion topics*
*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.
......
......@@ -118,7 +118,7 @@ You can change certain aspects of your dashboard, namely the :ref:`user-specific
Administrators and staff who have access to the administration area, see the *Administration menu navigation* icon |admin menu| in addition to the main menu navigation so they can navigate within the administration area.
#. **Quick links**: These :ref:`quick links <dashboard_quick_links>` take you directly to certain areas of Mahara.
#. **Edit dashboard**: The *Edit dashboard* button allows you to jump directly into the edit screen for your dashboard without having to go to *Portfolio → Pages* first.
#. **Edit dashboard**: The *Edit dashboard* button allows you to jump directly into the edit screen for your dashboard without having to go to *Main menu → Create → Pages and Collections* first.
.. note::
You cannot add a :ref:`skin <skins>` to your dashboard page.
......@@ -241,9 +241,9 @@ Quick links
When you log in to Mahara, you see three new boxes with quick links:
* **Create**: Create your electronic portfolio in a flexible personal learning environment. This takes you to *Portfolio → Pages*.
* **Share**: Share your achievements and development in a space you control. Clicking on this box takes you to *Portfolio → Shared by me*.
* **Engage**: Engage with other people in discussion forums and collaborate in groups. This takes you to *Groups → Find groups*.
* **Create**: Create your electronic portfolio in a flexible personal learning environment. This takes you to *Main menu → Create → Pages and collections*.
* **Share**: Share your achievements and development in a space you control. Clicking on this box takes you to *Main menu → Share → Shared by me*.
* **Engage**: Engage with other people in discussion forums and collaborate in groups. This takes you to *Main menu → Engage → Find groups*.
.. figure:: /images/dashboard_boxes.*
:alt: Dashboard boxes
......@@ -253,7 +253,7 @@ When you log in to Mahara, you see three new boxes with quick links:
With the help of these quick links you can reach the different parts of your portfolio directly from your dashboard.
.. note::
If you removed these boxes from your dashboard but want to get them back at a later point, you can re-active them under *Settings → Dashboard information*.
If you removed these boxes from your dashboard but want to get them back at a later point, you can re-active them under *User menu → Settings → Preferences → Dashboard information*.
If you do not see the dashboard boxes and do not have the option to turn this setting on, your site administrator disabled this feature in the :ref:`site configuration <site_settings>`.
......
......@@ -273,4 +273,4 @@ Safari:
#. Look for the meta tag "generator".
.. note::
Only the major version number of Mahara is displayed for security purposes. The minor version number is only visible to the administrator on *Administration → Admin home*. We recommend you keep Mahara up-to-date with security updates to ensure that your instance is not vulnerable to known security issues.
Only the major version number of Mahara is displayed for security purposes. The minor version number is only visible to the administrator on *Administration menu → Admin home*. We recommend you keep Mahara up-to-date with security updates to ensure that your instance is not vulnerable to known security issues.
......@@ -147,7 +147,7 @@ The glossary gives you a very quick definition of a term. Where possible, terms
:ref:`Notifications <notifications>` are automatically created by the system and inform you about new feedback on your pages, new forum posts in groups, new access to other users’ pages and much more. The notifications appear in your inbox and can be delivered via email.
:darkred:`Objectionable material`
On the page of a user to which you have access, you might come across content that is inappropriate, offensive or violates the terms of usage of the site. You can click the :ref:`Report objectionable material" <objectionable_report>` link on the page or the artefact details page and give your reason why you marked this content as objectionable. Administrators are notified, can review the content and could block the offender from accessing the system until the content is removed. It cannot be defined in general terms what is considered inappropriate. The owner of the site has to define this based on the purpose of the site and the age of its users for example.
On the page of a user to which you have access, you might come across content that is inappropriate, offensive or violates the terms of usage of the site. You can click the :ref:`Report objectionable material <objectionable_report>` link on the page or the artefact details page and give your reason why you marked this content as objectionable. Administrators are notified, can review the content and could block the offender from accessing the system until the content is removed. It cannot be defined in general terms what is considered inappropriate. The owner of the site has to define this based on the purpose of the site and the age of its users for example.
Forum posts can also be reported as objectionable by clicking the *Report* button.
......@@ -166,7 +166,7 @@ The glossary gives you a very quick definition of a term. Where possible, terms
Pages can also be created as templates for further use by others.
:orange:`Page layout`
The :ref:`page layout <edit_layout>` defines the number and width (wide or narrow) of columns on a page. You can also define rows in order to align your conent on the page.
The :ref:`page layout <edit_layout>` defines the number and width (wide or narrow) of columns on a page. You can also define rows in order to align your content on the page.
:darkred:`Plan`
:ref:`Plans <plans>` are simple ToDo lists consisting of tasks. You can add your plans as blocks into your pages.
......
......@@ -20,7 +20,7 @@ Mobile browsing
-----------------------------------------
.. note::
This section needs to be updated for Mahara 15.10 and tested if device detection is still relevant.
This section needs to be updated for Mahara 18.10 and tested if device detection is still relevant.
Mahara comes with a `responsive design <https://en.wikipedia.org/wiki/Responsive_web_design>`_. The purpose is to provide the best viewing experience on any device, but in particular mobile devices. Furthermore, certain functionality is not available on a mobile device if it does not allow for it, e.g. the use of the visual editor.
......
......@@ -17,7 +17,7 @@ Export
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:
* **Standalone HTML website**: 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 this website, extract the zip file and click on the ``index.html`` file that is in the folder.
* **Leap2A**: A zip file containing a folder in the `Leap2A standard format <http://edutechwiki.unige.ch/en/LEAP2A>`_ is created. You can then import this into another `Leap2A-compliant system <https://wiki.mahara.org/wiki/Developer_Area/Import//Export/Interoperability>`_ or have it :ref:`imported by an administrator into your current Mahara or another one <add_user>`. A new user is created during the import process. You can also import it into your own account again in *Portfolio → Import*
* **Leap2A**: A zip file containing a folder in the `Leap2A standard format <http://edutechwiki.unige.ch/en/LEAP2A>`_ is created. You can then import this into another `Leap2A-compliant system <https://wiki.mahara.org/wiki/Developer_Area/Import//Export/Interoperability>`_ or have it :ref:`imported by an administrator into your current Mahara or another one <add_user>`. A new user is created during the import process. You can also import it into your own account again in *Manage → Import*
.. note::
It is recommended that you export your portfolio **both** in HTML and Leap2A because you never know whether you will be able to import it back into Mahara or maybe even another ePortfolio system.
......@@ -27,7 +27,7 @@ You can export your portfolio to keep your files and Mahara-created content offl
Export your portfolio
To export your portfolio on *Portfolio → Export*:
To export your portfolio on *Manage → Export*:
#. Choose either *Standalone HTML website* or *Leap2A*. You can run through the export twice in order to get both formats.
#. Choose what you want to export:
......
......@@ -9,9 +9,9 @@
Shared by me
---------------
*Main menu → Engage → Shared by me*
*Main menu → Share → Shared by me*
When you have created portfolio pages (and collections), you may wish to share them with others, e.g. to receive feedback. You can set the access permissions on the *Edit access* page. It is accessible via *Portfolio → Shared by me* or directly from the :ref:`page editor <page_editor>` when you edit a portfolio page.
When you have created portfolio pages (and collections), you may wish to share them with others, e.g. to receive feedback. You can set the access permissions on the *Edit access* page. It is accessible via *Main menu → Share → Shared by me* or directly from the :ref:`page editor <page_editor>` when you edit a portfolio page.
The *Share* overview page shows you the following.
......@@ -49,7 +49,7 @@ You can assign access to a single page or collection at a time or to multiple pa
Users and groups to whom you can give access to pages and / or collections
#. Click the *Edit access* icon |edit access| next to the collection or page for which you want to give access permissions under *Portfolio → Shared by me*. On the next screen...
#. Click the *Edit access* icon |edit access| next to the collection or page for which you want to give access permissions under *Share → Shared by me*. On the next screen...
#. You see the collection displayed if you selected one in step 1. You can add more collections by searching for them in the select box if you want to give other collections the same sharing permissions.
#. You see the page displayed if you selected one in step 1. You can add more pages by searching for them in the select box if you want to give other pages the same sharing permissions.
#. **Advanced options**: You have more settings available that apply to all selected collections and pages.
......@@ -134,7 +134,7 @@ You select the users or groups with whom to share your portfolio under *Shared w
* **Public**: Anybody online who knows the URL(s) can see your selection of pages / collections.
.. note::
This option is only available if the site administrator allowed public pages under *Administration → Site options →* :ref:`General settions <general_settings>` *→ Allow public pages*.
This option is only available if the site administrator allowed public pages under *Administration menu → Site options →* :ref:`General settions <general_settings>` *→ Allow public pages*.
If you are on a multi-tennanted site, the institution administrator must also allow public pages in the :ref:`institution settings <add_institution>`.
......@@ -176,7 +176,7 @@ You select the users or groups with whom to share your portfolio under *Shared w
Edit access to your profile page
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
You can restrict full access to your profile page to the members of your institution if the site administrator allowed that in *Administration → Configure site →* :ref:`User settings <user_settings>` *→ Profile access for all registered users*.
You can restrict full access to your profile page to the members of your institution if the site administrator allowed that in *Administration menu → Configure site →* :ref:`User settings <user_settings>` *→ Profile access for all registered users*.
If you allow only members of your own institution(s) to see your profile page, other users who have an account can only see basic information, e.g. your name, your institution membership and messaging information.
......@@ -206,7 +206,7 @@ Besides giving users who have a login or the entire public access to your portfo
You can create a secret URL the following way when you are on the :ref:`share overview page <share>`:
#. Click the *Edit secret URL access* icon |secret url| next to the collection or page for which you want to give access permissions under *Portfolio → Shared by me*. On the next screen...
#. Click the *Edit secret URL access* icon |secret url| next to the collection or page for which you want to give access permissions under *Share → Shared by me*. On the next screen...
#. Click the *New secret URL* button to generate a new secret URL. You can add as many secret URLs as you wish.
#. Click the *Copy* button |copy secret url| to copy the secret URL to your clipboard. You can then paste it into an email to send to somebody.
#. You can click the *Edit* button |edit secret url| to add a time restriction for access to your page / collection via this URL. The "From" and "To" date fields become visible when you click the *Edit* button.
......@@ -215,4 +215,4 @@ You can create a secret URL the following way when you are on the :ref:`share ov
#. Click the *Save* button to save the date access changes.
.. note::
Logged-out users or those who do not have an account can only leave comments on public pages or pages which they can access via a secret URL if the site administrator turned on the *Anonymous comments* function under *Administration → Configure site →* :ref:`User settings <user_settings>`.
Logged-out users or those who do not have an account can only leave comments on public pages or pages which they can access via a secret URL if the site administrator turned on the *Anonymous comments* function under *Administration menu → Configure site →* :ref:`User settings <user_settings>`.
......@@ -9,7 +9,7 @@
Shared with me
-----------------
*Main menu → Engage → Shared with me*
*Main menu → Share → Shared with me*
On this page you can list the most recently modified or commented on pages and collections that have been shared with:
......
......@@ -159,7 +159,7 @@ Advanced
Choose a skin
~~~~~~~~~~~~~~~~~~
*Main menu → Create → Pages* → Edit a page
*Main menu → Create → Pages and collections* → Edit a page
When the *Skins* feature is turned on, you see another item in the page editor navigation: **Choose skin**.
......
......@@ -40,7 +40,7 @@ When an institution allows SmartEvidence, any user in that institution can work
#. Click the *New collection* button under *Portfolio → Collections*. On the next screen...
#. **Collection name**: Provide a title for your collection.
#. **Collection description**: Optionally, you can write a short description about your collection. You do not have a visual editor, but just a plain text box.
#. **Tags**: Enter tags to find your collection more easily at a later stage. You can choose from your existing tags by starting to type a letter and then selecting the tag you want to use. You can also type a new tag, and it is added to your list of tags.
#. **Tags**: :index:`Enter tags <single: Tags on collections>` to find your collection more easily at a later stage. You can choose from your existing tags by starting to type a letter and then selecting the tag you want to use. You can also type a new tag, and it is added to your list of tags.
.. seealso::
You can find more information on how to use the tag selector in the :ref:`"Tags" section <tag_add>`.
......
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