Commit 18973a30 authored by Kristina Hoeppner's avatar Kristina Hoeppner
Browse files

Update and add index entries for all files

parent 7fb06c5b
.. include:: /shortcuts.rstext
.. index::
pair: Account; Settings
single: Account; Settings
.. _account_settings:
......@@ -16,7 +16,7 @@ The account settings of a user can be accessed via the *Settings* page. It is lo
Link to the *Settings* page on the *Dashboard*
.. index::
pair: Account; Password
single: Account; Password
New password
~~~~~~~~~~~~~~~~~
......@@ -39,7 +39,7 @@ Your password must have a minimum of six characters. Passwords are case sensitiv
If you do not see the *New password* box, you cannot change your password. Your login and password are managed elsewhere. This is the case if your institution has set up single sign-on to other applications for example. If you want to change your password, please contact your institution administrators. They will be able to tell you where you can change your password.
.. index::
pair: Account; Username
single: Account; Username
Change username
~~~~~~~~~~~~~~~~~~~
......@@ -54,8 +54,8 @@ You need a username to log in to Mahara. If your account is not managed by singl
.. note::
Usernames are 3-30 characters long and may contain letters, numbers and most common symbols excluding spaces.
.. index::
pair: Account; General account settings
.. index:: Mobile upload
single: Account; General account settings
.. _general_account_options:
......@@ -88,14 +88,14 @@ The general account options are visible to all users no matter whether you can c
#. **Enable multiple journals**: By default, you have one journal. If you would like to keep more than one journal, choose this option. |new15| Once you have chosen this option, it will disappear from your accounts settings page unless you only have one journal again.
#. **Maximum tags in cloud**: Decide how many tags you wish to display in your personal tag cloud in the sidebar in *Content* and *Portfolio*.
#. **Homepage information**: Choose this option if you want to display the :ref:`quick links <dashboard_quick_links>` on your dashboard.
#. **Mobile upload token**: Enter a token, e.g. a word, here and on your Android phone or iPhone to enable uploads. Your token changes automatically after each upload. See :ref:`mobile_mahara` for more information on using Mahara with a mobile device.
#. **Mobile upload token**: Enter a token, e.g. a word, here and on your Android phone or iPhone to enable uploads. Your token changes automatically after each upload. See :ref:`mobile_mahara` for more information on using Mahara with a mobile device. The :ref:`site administrator must have allowed mobile uploads <general_settings>` for this option to be displayed.
#. Click the *Save* button when you have finished making your changes.
.. warning::
If you disable your email address, you cannot reset your password as that requires the sending of an email to your address. You will have to contact an administrator and have your password reset.
.. index::
pair: Account; Delete
single: Account; Delete
.. _user_delete_account:
......
......@@ -2,7 +2,7 @@
.. index::
pair: Inbox; Account
pair: Selective deletion of notifications; New in Mahara 1.5
single: New in Mahara 1.5; Selective deletion of notifications
.. _inbox:
......
.. index:: ! Blocks
.. _individual_artefact_blocks:
Blocks
......
.. include:: /shortcuts.rstext
.. index:: Blocks
.. index:: Blocks usage matrix
.. _blocks_in_context:
......
.. include:: /shortcuts.rstext
.. index::
pair: Blocks; External content
External content
pair: Block category; External content
External content
-----------------
------------------
With the help of the external content blocks, you can include RSS feeds, external media or GoogleApps documents etc. into a page.
.. index::
pair: Blocks; External feed
External content; External feed
pair: Insecure SSL mode for feeds; New in Mahara 1.5
pair: Allow authenticated feeds; New in Mahara 1.5
single: External content block; External feed
single: New in Mahara 1.5; Insecure SSL mode for feeds
single: New in Mahara 1.5; Allow authenticated feeds
.. _external_feed_block:
......@@ -44,8 +43,8 @@ Embed an external RSS or ATOM feed, e.g. to display an external blog.
.. index::
pair: Blocks; External media
External content; External media
pair: External media filters; New in Mahara 1.5
single: External content block; External media
single: New in Mahara 1.5; External media filters
.. _external_media_block:
......@@ -72,7 +71,6 @@ And |new15| also:
* `Vimeo <http://vimeo.com/>`_
* `Voki <http://www.voki.com/>`_
.. figure:: /images/page_editor/blocks/externalmedia_configure.*
:alt: Configure external media
......@@ -88,7 +86,7 @@ And |new15| also:
.. index::
pair: Blocks; Google Apps
External content; Google Apps
single: External content block; Google Apps
.. _googleapps_block:
......@@ -120,8 +118,6 @@ You can only display the content, but not immediately edit documents, spreadshee
#. **Height**: Choose the height for the embedded content. The width is adjusted to the column width of the block automatically.
#. Click the *Save* button to accept your changes, or click the *Remove* button to remove this block from your page.
.. index:: Google document
**Google document**
#. Open the document.
......@@ -130,8 +126,6 @@ You can only display the content, but not immediately edit documents, spreadshee
#. Copy the document link or embed code.
#. Paste the link or embed code into the *Embed code or URL* box in the Google Apps block.
.. index:: Google spreadsheet
**Google spreadsheet**
#. Open the spreadsheet.
......@@ -141,8 +135,6 @@ You can only display the content, but not immediately edit documents, spreadshee
#. Copy the link for the option *Web page* or the embed code for the option *HTML to embed in a page*.
#. Paste the link or embed code into the *Embed code or URL* box in the Google Apps block.
.. index:: Google presentation
**Google presentation**
#. Open the presentation.
......@@ -151,8 +143,6 @@ You can only display the content, but not immediately edit documents, spreadshee
#. Copy the link or embed code.
#. Paste the link or embed code into the *Embed code or URL* box in the Google Apps block.
.. index:: Google collection
**Google collections**
#. Click on the arrow to the right of the collection name and then on *Share* and *Share* again.
......@@ -160,8 +150,6 @@ You can only display the content, but not immediately edit documents, spreadshee
#. Copy the link.
#. Paste the link into the *Embed code or URL* box in the Google Apps block.
.. index:: Google docs viewer
**Google docs viewer**
When you have access to a document, e.g. PDF file, through Google Docs from another person, you can embed it:
......
.. include:: /shortcuts.rstext
.. index::
pair: Blocks; Files and images and video
Files and images and video
pair: Block category; Files and images and video
Files, images and video
---------------------------
......@@ -16,7 +15,7 @@ These artefacts are internal Mahara ones to display:
.. index::
pair: Blocks; File to download
Files and images and video; File to download
single: Files and images and video block; File(s) to download
.. _file_download_block:
......@@ -73,12 +72,12 @@ When a user clicks on the *Details* link, he is taken to the details page for th
.. index::
pair: Blocks; Folder
Files and images and video; Folder
single: Files and images and video block; Folder
.. _folder_block:
Folder
~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~
.. image:: /images/page_editor/blocks/folder.*
:alt: Display an entire folder
......@@ -98,13 +97,12 @@ Select files that viewers of your portfolio can download.
#. Click the *Remove* button if you wish to revert your choice.
#. Click the *Save* button to accept your changes, or click the *Cancel* button to leave the block's content as it is. The *Remove* button is shown only when you place the block into the page and have not yet added any artefacts.
.. warning::
When you place a folder with group, institution or site files into a page, beware that these files may not be available at some point anymore when the person in charge deletes them.
.. index::
pair: Blocks; Image gallery
Files and images and video; Image gallery
single: Files and images and video block; Image gallery
.. _image_gallery_block:
......@@ -142,7 +140,7 @@ Image gallery with uploaded images
When you place group, institution or site files into a page, beware that these files may not be available at some point anymore when the person in charge deletes them.
.. index::
pair: Image gallery from external images; New in Mahara 1.5
single: New in Mahara 1.5; Image gallery from external images
|new15| Image gallery from external images
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
......@@ -175,12 +173,12 @@ Image gallery with uploaded images
.. index::
pair: Blocks; Some HTML
Files and images and video; Some HTML
single: Files and images and video block; Some HTML
.. _html_block:
Some HTML
~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~
.. image:: /images/page_editor/blocks/html.*
:alt: Include HTML code
......@@ -209,12 +207,12 @@ Display the content of an HTML file in a page.
.. index::
pair: Blocks; Image
Files and images and video; Image
single: Files and images and video block; Image
.. _image_block:
Image
~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~
.. image:: /images/page_editor/blocks/image.*
:alt: Display an image in a block
......@@ -242,7 +240,7 @@ Display a single image in a block.
.. index::
pair: Blocks; Embedded media
Files and images and video; Embedded media
single: Files and images and video block; Embedded media
.. _embedded_media_block:
......
.. include:: /shortcuts.rstext
.. index::
pair: Blocks; General
General
pair: Block category; General
General
-----------
......@@ -17,7 +16,7 @@ When you create a page in a group, you do not have the :ref:`navigation <navigat
.. index::
pair: Blocks; Creative Commons license
General; Creative Commons license
single: General block; Creative Commons license
.. _creative_commons_block:
......@@ -45,7 +44,7 @@ Add a block to your page which lets users know under which `Creative Commons lic
.. index::
pair: Blocks; Navigation
General; Navigation
single: General block; Navigation
.. _navigation_block:
......@@ -71,12 +70,12 @@ Add a navigation block to display links to pages in a collection.
.. index::
pair: Blocks; Plans
General; Plans
single: General block; Plans
.. _plans_block:
Plans
~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~
.. image:: /images/page_editor/blocks/plans.*
:alt: Add a plan to your page
......@@ -102,7 +101,7 @@ Display one of your plans in a block.
.. index::
pair: Blocks; Recent forum posts
General; Recent forum posts
single: General block; Recent forum posts
.. _recent_forum_posts_block:
......@@ -129,12 +128,12 @@ Display a specified number of recent forum posts from one group on a page.
.. index::
pair: Blocks; Text box
General; Text box
single: General block; Text box
.. _textbox_block:
Text box
~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~
.. image:: /images/page_editor/blocks/textbox.*
:alt: Add text
......@@ -158,7 +157,7 @@ Add a new text box
We recommend you do not include images that you have uploaded to Mahara in a text box. It cannot be guaranteed that they are displayed for other users if they do not have access to the image via another portfolio page. All access in Mahara is granted to pages and through them to the artefact blocks. An image in a text box is not recognized as artefact and can therefore not receive its proper permissions.
.. index::
pair: Re-usable text box; New in Mahara 1.5
single: New in Mahara 1.5; Re-usable text box
.. _textbox_copy:
......@@ -195,7 +194,7 @@ You can re-use text from other text boxes (a.k.a. :ref:`Notes <notes>`) from one
.. index::
pair: Blocks; My inbox
General; My inbox
single: General block; My inbox
.. _inbox_block:
......@@ -222,7 +221,7 @@ The *My inbox* block displays the latest messages that you have received.
.. index::
pair: Blocks; Latest pages
General; Latest pages
single: General block; Latest pages
.. _latest_pages_block:
......@@ -248,8 +247,8 @@ The *Latest pages* block displays the latest pages to which you have access acro
.. index::
pair: Blocks; My watched pages
General; My watched pages
pair: My watched pages; New in Mahara 1.5
single: General block; My watched pages
single: New in Mahara 1.5; My watched pages
.. _watchlist_block:
......@@ -275,7 +274,7 @@ The *My watched pages* block displays the pages that are on your watchlist.
.. index::
pair: Blocks; Group info
General; Group info
single: General block; Group info
.. _group_info_block:
......@@ -297,7 +296,7 @@ This block is a default block on the group homepage. There is no configuration p
.. index::
pair: Blocks; Group members
General; Group members
single: General block; Group members
.. _group_members_block:
......@@ -325,7 +324,7 @@ This block is a default block on the group homepage. You can display member prof
.. index::
pair: Blocks; Group pages
General; Group pages
single: General block; Group pages
.. _group_pages_block:
......
.. include:: /shortcuts.rstext
.. index::
pair: Blocks; Journal
Journal
pair: Block category; Journal
Journals
----------
......@@ -22,7 +21,7 @@ You can embed content from your journals in various ways in a page:
.. index::
pair: Blocks; Display an entire journal
Journal; Display an entire journal
single: Journal block; Display an entire journal
.. _journal_block:
......@@ -55,7 +54,7 @@ Display an entire journal in your portfolio page.
.. index::
pair: Blocks; Display one journal entry
Journal; Display one journal entry
single: Journal block; Display one journal entry
.. _journal_entry_block:
......@@ -84,7 +83,7 @@ Display an entire journal in your portfolio page.
.. index::
pair: Blocks; Display recent journal entries
Journal; Display recent journal entries
single: Journal block; Display recent journal entries
.. _recent_journal_entry_block:
......@@ -111,8 +110,8 @@ Display recent journal entries across all your journals in your portfolio page.
.. index::
pair: Blocks; Display tagged journal entries
Journal; Display tagged journal entries
pair: Display tagged journal entries; New in Mahara 1.5
single: Journal block; Display tagged journal entries
single: New in Mahara 1.5; Display tagged journal entries
.. _tagged_journal_entries_block:
......
.. index::
pair: Blocks; Profile
Profile
pair: Block category; Profile
Profile
------------
......@@ -16,7 +15,7 @@ Furthermore, you can also put certain blocks onto your profile page that only ex
.. index::
pair: Blocks; Contact information
Profile; Contact information
single: Profile block; Contact information
.. _contact_info_block:
......@@ -43,7 +42,7 @@ Add a block with contact information to your page.
.. index::
pair: Blocks; My friends
Profile; My friends
single: Profile block; My friends
.. _friends_block:
......@@ -59,7 +58,7 @@ You only need to place the block into your profile page. There is no further con
.. index::
pair: Blocks; My groups
Profile; My groups
single: Profile block; My groups
.. _groups_block:
......@@ -75,7 +74,7 @@ You only need to place the block into your profile page. There is no further con
.. index::
pair: Blocks; My pages
Profile; My pages
single: Profile block; My pages
.. _pages_block:
......@@ -94,7 +93,7 @@ You only need to place the block into your profile page. There is no further con
.. index::
pair: Blocks; Profile information
Profile; Profile information
single: Profile block; Profile information
.. _profile_info_block:
......@@ -123,7 +122,7 @@ Add a block with profile fields to your page.
.. index::
pair: Blocks; Wall
Profile; Wall
single: Profile block; Wall
.. _wall:
......
.. index::
pair: Blocks; Résumé
Résumé
pair: Block category; Résumé
Résumé
------------
......@@ -9,7 +8,7 @@ You can display either your entire résumé or parts of it in any portfolio page
.. index::
pair: Blocks; Display your entire résumé
Résumé; Display your entire résumé
single: Résumé block; Display your entire résumé
.. _full_resume_block:
......@@ -31,7 +30,7 @@ Add a block with your entire résumé to your page.
.. index::
pair: Blocks; Display one résumé field
Résumé; Display one résumé field
single: Résumé block; Display one résumé field
.. _resume_field_block:
......
.. include:: /shortcuts.rstext
.. index:: Files
pair: New in Mahara 1.5; Parent folder icon
.. index::
single: Content; Files
single: New in Mahara 1.5; Parent folder icon
.. _files_area:
......@@ -19,6 +20,9 @@ You will find that some folders are automatically created by the system such as
.. note::
You can move files and folders to your heart's content without having to re-link them in the pages where you use them. Also renaming them will not have a negative impact on links.
.. index::
single: File; Upload a file
.. _upload_file:
Upload a file
......@@ -58,7 +62,8 @@ When the file was uploaded successfully, it appears in your file list. You can e
You can move your file to a folder by clicking on the icon before the file's name and then dragging and dropping it onto a folder icon.
.. index::
pair: New in Mahara 1.5; Upload multiple files
single: File; Upload multiple files
single: New in Mahara 1.5; Upload multiple files
Upload multiple files
~~~~~~~~~~~~~~~~~~~~~~
......@@ -86,6 +91,9 @@ You can upload multiple files at once in two different ways:
Once you have uploaded your zip file to Mahara, you can unzip it there. Click on the *Unzip* button |unzip| next to the *Edit* button |edit|. Please follow the on-screen instructions.
.. index::
single: File; Create a folder
Create a folder
~~~~~~~~~~~~~~~~
......@@ -96,6 +104,9 @@ Type the name of the folder into the text field and click the *Create folder* bu
* add tags which you can use to search your portfolio content
* allow comments (this setting can be overwritten for the artefact on a page)
.. index::
single: File; Delete a file or folder
Delete a file or folder
~~~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -103,6 +114,9 @@ You can delete a file or an entire folder and its content by clicking on the *De
If you use a file in a journal entry and / or on a page, you are warned before deleting the file so that you don't delete it by accident.
.. index::
single: File; File quota
File quota
~~~~~~~~~~~
......
.. include:: /shortcuts.rstext
.. index::
Journal
pair: Enable multiple journals; New in Mahara 1.5
single: Content; Journal
single: New in Mahara 1.5; Enable multiple journals
.. _journal:
......@@ -22,7 +22,7 @@ Per default, every user has one journal available.
|new15| If you already have multiple journals enabled, you do not see this option on your *Settings*.
.. index::
pair: Journal; Settings
single: Journal; Settings
Change your journal settings
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -41,7 +41,7 @@ You can change the title of your default journal (and all others if you have ena
#. Click *Save Settings*.
.. index::
pair: Journal; Add journal entry
single: Journal; Add journal entry
Add a journal entry
~~~~~~~~~~~~~~~~~~~~~~
......@@ -69,7 +69,7 @@ Post your journal entry by following the steps below.
#. Click the *Save* button to save your entry.
.. index::
pair: Journal; Add attachment
single: Journal; Add attachment
Add a file as attachment to a journal entry
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -86,9 +86,6 @@ When you attach files directly to a journal entry, others can see them whenever
#. If you attached a file that you do not wish to attach anymore, you can *Remove* it.
#. Once you are done, you can click the *Close* button.
.. index::
pair: Journal; Add image
Add an image to a journal entry
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -98,7 +95,7 @@ You can add images to your journal entry in two ways:
#. Use an image that you have on Mahara.
.. index::
pair: Journal; Link image
single: Journal; Link image
Link to an image online
^^^^^^^^^^^^^^^^^^^^^^^^
......@@ -119,14 +116,13 @@ Images that are freely accessible online are easy to add to a journal entry. How
#. **Vertical / Horizontal space**: Add more space around the image by adding a number in *Vertical space* and / or *Horizontal space*.
#. Click the *Insert* button. Alternatively, click the *Cancel* button if you want to abort inserting the image.
.. note::
The dimensions are given in pixel. The first value is for the width and the second one for the height. Only change one of the dimensions and delete the value from the second to retain the original proportions of the image.
If you are not happy with how the image looks in your journal entry, select it (it will get little square handles) and click on the *Image* button |tinymce_image| again to make adjustments.
.. index::
pair: Journal; Add image from Mahara
single: Journal; Add image from Mahara
Add an image from Mahara
^^^^^^^^^^^^^^^^^^^^^^^^^^
......
.. include:: /shortcuts.rstext
.. index::
pair: Notes; New in Mahara 1.5
single: Content; Notes
single: New in Mahara 1.5; Notes
see: Notes; Text box
.. _notes:
|new15| My notes
-----------------
------------------
*Content -> Notes*
......