portfolio/page_editor: Update info for new settings buttongs

New in Mahara 17.10: Consolidated edit screen buttons
and more specific sharing options when clicking the
"Share" button from one of the editing screens
(Bug 1668888).

source/portfolio/page_editor.rst

@@ -20,26 +20,17 @@ The *page editor* is important in Mahara because it allows you to compose your p
 Editor navigation
 ~~~~~~~~~~~~~~~~~~~
 
+|new in Mahara 17.10| :index:`The <single: New in Mahara 17.10; Consolidated page editing buttons>` page edit buttons were consolidated in Mahara 17.10. Now all settings, i.e. title, description, tags, layout, and skins, are found on the *Settings* page. When you click the *Share* button, you can only change the sharing options for the current page (or collection if the page is part of one).
+
 .. figure:: /images/page_editor/navigation.*
    :alt: Page editor navigation
 
    Page editor navigation bar
 
 #. **Display page**: Preview your page to see how others, who have access to it, would see it. You can also use the *Display page* button |display page| at the bottom of the page.
-#. **Share page**: Decide who shall have access to your page. See :ref:`"Shared by me" <share>` for more details.
-#. **Edit content**: Place your content on a page. See :ref:`content chooser <artefact_chooser>`, :ref:`individual content blocks <individual_artefact_blocks>` and :ref:`page layout area <page_layout_area>`.
-#. **Edit layout**: Change the overall layout of your page.
-#. **Choose skin**: Choose a skin from the ones that you have created or added to your :ref:`skin collection <skins>` if you are allowed to work with skins.
-#. **Edit title and description**: Add and modify your page title, description and tags.
-
-.. index::
-   single: Page editor; Edit title and description
-
-Edit title and description
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. seealso::
-   Please see the sections :ref:`"Create a new page" <create_page>` and :ref:`"Edit an existing page" <custom_page_url>` for information on how to set up a page.
+#. **Edit**: Place your content on a page. See :ref:`content chooser <artefact_chooser>`, :ref:`individual content blocks <individual_artefact_blocks>` and :ref:`page layout area <page_layout_area>`.
+#. **Settings**: Add and modify page settings like :ref:`title and description <create_page>`, :ref:`layout <edit_layout>`, and :ref:`skin <choose_skin>`.
+#. **Share**: Decide who shall have access to your page. See :ref:`"Edit access" <page_edit_access>` for more details.
 
 .. index::
    single: Page editor; Edit layout
@@ -55,23 +46,26 @@ The layout editor is very flexible and allows you to design your layout not only
 .. note::
    Be careful when choosing 4 or more columns. Your portfolio page may look very good on your big 21" screen, but a user looking at it on a notebook or tablet may not have the same experience. In most cases, up to 3 columns is the best choice.
 
+Choose a basic layout
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 .. figure:: /images/page_editor/layout.*
    :alt: Overall page layout editor
 
    Edit the overall layout of a page by choosing the number of columns and rows
 
-#. Go to the *Edit layout* tab.
+#. Click the *Settings* button.
 
    .. note::
-      When you work on a small screen, the text on the tab is removed and you only see the icon.
+      When you work on a small screen, the text on the button is removed and you only see the icon.
 
-#. *Basic options*: Click the radio button below the layout that you wish to apply to your page. You can change it at any time. When you reduce the number of columns, your blocks simply move to the first column. You can then move them around to their correct position (see :ref:`page layout area <page_layout_area>`).
+#. **Layout**: Click the |retracted| icon in the **Layout** panel and the panel content will be visible. If you want to close the panel, click the |retractable| icon. You can change the layout at any time. When you reduce the number of columns, your blocks simply move to the first column. You can then move them around to their correct position (see :ref:`page layout area <page_layout_area>`).
 
    .. note::
       When you hover over the layout options, you can see the percentages for each column.
 
-#. *Advanced options*: If you wish to have more complicated page layouts, you can choose those here.
-#. *Create custom layout*: If you don't like any of the built-in layouts, you can create your own in this section.
+#. Click the radio button below a layout that you want to use.
+#. **Create custom layout**: If you don't like any of the built-in layouts, you can :ref:`create your own <custom_layout>` in this section.
 #. Click the *Save* button to save your layout choice.
 
 .. note::
@@ -82,31 +76,26 @@ The layout editor is very flexible and allows you to design your layout not only
 
    You can use the *Add* and *Remove* buttons for quick changes to the layout when you have enabled them.
 
-If you want to have more options, you can choose to view the *Advanced options*.
-
-.. figure:: /images/page_editor/layout_advanced.*
-   :alt: Advanced layout options
-
-   Advanced layout options
+.. _custom_layout:
 
-#. Click the *Advanced options* panel.
-#. Click the radio button below the layout that you wish to apply to your page.
-#. Click the *Save* button to return to the content editor.
+Create a custom layout
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-You can also set up your own custom layout under *Create custom layout* where you can be more precise in how many rows and what sort of column width you'd like to have.
+You can set up your own custom layout under **Create custom layout** where you can be more precise in how many rows and what sort of column width you'd like to have.
 
 .. figure:: /images/page_editor/layout_custom.*
    :alt: Custom layout options
 
    Custom layout options
 
-#. Click the *Create custom layout* panel.
-#. *Number of columns*: Choose the number of columns that you want to display in a particular row. You can choose up to 5 columns.
-#. *Column layout*: Choose the percentages for the distribution of your columns in the row that you are editing.
+#. Click the *Settings* button.
+#. **Layout**: Click the |retracted| icon in the **Layout** panel and the panel content will be visible. If you want to close the panel, click the |retractable| icon. In the **Create custom layout** section...
+#. **Number of columns**: Choose the number of columns that you want to display in a particular row. You can choose up to 5 columns.
+#. **Column layout**: Choose the percentages for the distribution of your columns in the row that you are editing.
 #. Click the *Add a row* button to add more rows with a different column layout. You can create up to 6 rows.
-#. Click the *Delete* button |delete| to remove a row if you do not want it in your layout anymore.
-#. *Layout preview*: You can see what your layout is going to look like.
-#. Click the *Create new layout* button to generate your new page layout. It will be saved in the *Advanced options*, and you can use it in all your pages.
+#. Click the *Demove this row* button to remove a row if you do not want it in your layout anymore.
+#. **Layout preview**: You can see what your layout is going to look like.
+#. Click the *Create new layout* button to generate your new page layout. You can use it in all your pages.
 #. Click the *Save* button to return to the content editor.
 
 .. note::
@@ -188,3 +177,21 @@ The *page layout area* is the place where you arrange all your content items for
 
 .. seealso::
    Please refer to the section :ref:`edit layout <edit_layout>` to learn how to change the number of columns and rows on a page and make certain columns wider than others.
+
+.. _page_edit_access:
+
+Edit access
+~~~~~~~~~~~~~~~~~~
+
+|new in Mahara 17.10| :index:`The <single: New in Mahara 17.10; Set access and secret URL for a page on one screen>` *Edit access* screen is displayed for the selected page. You can only select the sharing options for the page that you are editing (and the collection if the page is in a collection).
+
+You can set a secret URL immediately rather than having to provide a secret URL separately from the other sharing options.
+
+.. figure:: /images/page_editor/edit_access.*
+   :alt: Edit access for the page you are editing
+
+   Edit access for the page you are editing
+
+#. Click the *Share* button.
+#. **Secret URLs**: Give your page a secret URL. For all available options, check out :ref:`how to set up a secret URL <secret_url>`.
+#. **Share with others**: You can :ref:`share your page with people who have an account <edit_access>` on the site.