Merge pull request #1113 from ExpressionEngine/7.dev

Docs updates 7.5.20

Author: bryannielsen

docs/channels/categories.md

@@ -128,6 +128,20 @@ You may alternatively specify which categories to not show
 
 If you specify that a parent category is not shown, then any children of that parent category are then unable to be shown by the tag. The parent category is required for any and all children categories.
 
+### `orderby=`
+
+This parameter allows you to specify the order in which the categories are displayed. Only applicable when using the "[linear](#style)" style. The default is to display the categories in the order they are displayed in the CP, where also they can be reordered. You can order by any of the following:
+
+    orderby="category_name"
+
+    orderby="category_url_title"
+
+    orderby="category_description"
+
+You can also the name of the custom field as the parameter value. If you have a custom field called "my_custom_field" you would use
+
+    orderby="my_custom_field"
+
 ### `show_empty=`
 
     show_empty="no"
@@ -152,6 +166,14 @@ Determines whether entries dated in the "future" to are included when calculatin
 
 By default, future dated entries will **not** count when determining whether a category is empty.
 
+### `sort=`
+
+    sort="asc"
+    
+The sort order can be ascending (asc) or descending (desc). The order will default to “descending” if nothing is specified.
+
+This parameter is only applicable when using the "[orderby](#orderby)" parameter to specify the sort order.
+
 ### `status=`
 
     status="open"

docs/channels/channel-form/examples.md

@@ -121,7 +121,7 @@
                 <li>{error}</li>
                 {/global_errors}
                 {field_errors}
-                <li>{error}</li>
+                <li>{field}: {error}</li>
                 {/field_errors}
             </ul>
         {/if}

docs/channels/channel-form/overview.md

@@ -432,7 +432,7 @@ If you have chosen [inline error handling](#error_handling), you can display the
 
 ### `{field_errors}`
 
-    {field_errors}{error}{/field_errors}
+    {field_errors}{field}: {error}{/field_errors}
 
 If you have chosen [inline error handling](#error_handling), you can display field-related entry submission errors.
 

docs/config/config-files.md

@@ -75,3 +75,9 @@ We generally recommend using [Template Routes](templates/routes.md) and not modi
 `stopwords.php`
 
 This file contains an array of words that the search functions in EE will ignore in order to a) reduce load, and b) generate better results.
+
+### Reserved field names
+
+`reserved_field_names.php`
+
+This file contains an array of variable names that are reserved by ExpressionEngine and cannot be used as custom field names. 

docs/control-panel/template-manager.md

@@ -74,7 +74,7 @@ The Template Notes tab enables you to save notes and information about your temp
 ### Access
 
 - **Allowed member roles** -- Choose which member roles are allowed to access the template.
-- **No access redirect** -- Page to redirect users without permissions to. If a template is selected the user does not have access to, the 404 page will be displayed instead.
+- **No access template** -- Page to display to users without permissions to access the current template. If a template is selected the user does not have access to, the 404 page will be displayed instead.
 - **Enable HTTP Authentication?** -- When set to enable, users with permissions will have to login to view this template.
 
 NOTE: **Note:** If you are running PHP-FPM / FastCGI, you will probably need to add this to your `.htaccess` so the server makes the necessary environment variables available to PHP & ExpressionEngine.

docs/development/services/modal.md

@@ -132,6 +132,23 @@ Now when a user selects some content in the table, the bulk action controls shou
 
 ## Advanced functionality
 
+### Required interaction
+
+By default, clicking the close button, the escape key, or anywhere outside of the modal will close it, acting similar to cancelling the action the modal was prompting for. But if you want to prevent this default behavior and instead want to require the modal to be interacted with, you can add the `must-interact` class as part of the `name` parameter.
+
+    $modal_vars = array(
+      'name' => 'hello must-interact',
+      // ... other settings
+    );
+    $modal_html = ee('View')->make('ee:_shared/modal_confirm_delete')->render($modal_vars);
+
+NOTE: Note: you will also need to add custom JS to remove `.must-interact`, and then trigger the `modal:close` event in order to close it.
+
+    $('.modal-wrap .dialog__buttons button').on('click', function() {
+        $(this).closest('.must-interact').removeClass('must-interact');
+        $(this).closest('.modal').trigger('modal:close');
+    });
+    
 ### Automatically open a modal
 
 If you manually build a modal view, you can add `.app-modal` and a `rev` attribute like: