Progress changes

Post-rebase fixes and and updated modal behavior in response to reviewer feedback.

Author: Jim Graham

_build/data/transport.core.system_settings.php

@@ -2148,5 +2148,59 @@
     'area' => 'static_elements',
     'editedon' => null,
 ], '', true, true);
+$settings['enable_overlays'] = $xpdo->newObject(modSystemSetting::class);
+$settings['enable_overlays']->fromArray([
+    'key' => 'enable_overlays',
+    'value' => true,
+    'xtype' => 'combo-boolean',
+    'namespace' => 'core',
+    'area' => 'manager',
+    'editedon' => null,
+], '', true, true);
+$settings['overlay_color'] = $xpdo->newObject(modSystemSetting::class);
+$settings['overlay_color']->fromArray([
+    'key' => 'overlay_color',
+    'value' => '#0d141d',
+    'xtype' => 'textfield',
+    'namespace' => 'core',
+    'area' => 'manager',
+    'editedon' => null,
+], '', true, true);
+$settings['overlay_opacity_blocking'] = $xpdo->newObject(modSystemSetting::class);
+$settings['overlay_opacity_blocking']->fromArray([
+    'key' => 'overlay_opacity_blocking',
+    'value' => 50,
+    'xtype' => 'numberfield',
+    'namespace' => 'core',
+    'area' => 'manager',
+    'editedon' => null,
+], '', true, true);
+$settings['overlay_opacity_nonblocking'] = $xpdo->newObject(modSystemSetting::class);
+$settings['overlay_opacity_nonblocking']->fromArray([
+    'key' => 'overlay_opacity_nonblocking',
+    'value' => 50,
+    'xtype' => 'numberfield',
+    'namespace' => 'core',
+    'area' => 'manager',
+    'editedon' => null,
+], '', true, true);
+$settings['overlay_tint_blocking'] = $xpdo->newObject(modSystemSetting::class);
+$settings['overlay_tint_blocking']->fromArray([
+    'key' => 'overlay_tint_blocking',
+    'value' => 0,
+    'xtype' => 'numberfield',
+    'namespace' => 'core',
+    'area' => 'manager',
+    'editedon' => null,
+], '', true, true);
+$settings['overlay_tint_nonblocking'] = $xpdo->newObject(modSystemSetting::class);
+$settings['overlay_tint_nonblocking']->fromArray([
+    'key' => 'overlay_tint_nonblocking',
+    'value' => 70,
+    'xtype' => 'numberfield',
+    'namespace' => 'core',
+    'area' => 'manager',
+    'editedon' => null,
+], '', true, true);
 
 return $settings;

_build/templates/default/sass/_forms.scss

@@ -449,8 +449,8 @@ input::-moz-focus-inner {
           color: $darkGray;
         }
       }
-    }
   }
+
   .feedback {
       margin-left: 1.4rem;
       color: scale-color($blue, $lightness: -35%);

_build/templates/default/sass/_windows.scss

@@ -306,9 +306,13 @@
 .ext-el-mask {
   background-color: $colorSplashShadow;
   opacity: 0;
-  transition: opacity .25s;
+  transition: opacity .5s;
   /*z-index: 10;*/ /* this is handeled by extjs and set to 9000 on show */
 
+  &.clickthrough {
+    pointer-events: none;
+  }
+
   &.fade-in {
     opacity: .5;
   }

core/lexicon/en/chunk.inc.php

@@ -7,9 +7,6 @@
  * @subpackage lexicon
  */
 
-// Entry out of alpha order because it must come before the entry it's used in below
-$_lang['example_tag_chunk_name'] = 'NameOfChunk';
-
 $_lang['chunk'] = 'Chunk';
 $_lang['chunk_category_desc'] = 'Use to group Chunks within the Elements tree.';
 $_lang['chunk_delete_confirm'] = 'Are you sure you want to delete this chunk?';
@@ -27,11 +24,11 @@
 $_lang['chunk_err_ns_name'] = 'Please specify a name.';
 $_lang['chunk_lock'] = 'Lock chunk for editing';
 $_lang['chunk_lock_desc'] = 'Only users with “edit_locked” permissions can edit this Chunk.';
-$_lang['chunk_name_desc'] = 'Place the content generated by this Chunk in a Resource, Template, or other Chunk using the following MODX tag: [[+tag]]';
 $_lang['chunk_new'] = 'Create Chunk';
 $_lang['chunk_properties'] = 'Default Properties';
 $_lang['chunk_tab_general_desc'] = 'Here you can enter the basic attributes for this <em>Chunk</em> as well as its content. The content must be HTML, either placed in the <em>Chunk Code</em> field below or in a static external file, and may include MODX tags. Note, however, that PHP code will not run in this element.';
-$_lang['chunk_tag_copied'] = 'Chunk tag copied!';
+$_lang['chunk_title'] = 'Create/edit chunk';
+$_lang['chunk_untitled'] = 'Untitled Chunk';
 $_lang['chunks'] = 'Chunks';
 
 // Temporarily match old keys to new ones to ensure compatibility
@@ -49,6 +46,9 @@
     quick create/edit panels access to them when opened
     outside the context of their respective element types)
 
+    example_tag_chunk_name
     chunk_code
     chunk_description_desc
+    chunk_name_desc
+    chunk_tag_copied
 */

core/lexicon/en/default.inc.php

@@ -572,10 +572,16 @@
 */
 
 // All
+$_lang['static_file'] = 'Static File';
+$_lang['static_file_desc'] = 'The external file location where the source code for this element is stored.';
 
 // Chunks
+$_lang['example_tag_chunk_name'] = 'NameOfChunk';
 $_lang['chunk_code'] = 'Chunk Code (HTML)';
 $_lang['chunk_description_desc'] = 'Usage information for this Chunk shown in search results and as a tooltip in the Elements tree.';
+$_lang['chunk_name_desc'] = 'Place the content generated by this Chunk in a Resource, Template, or other Chunk using the following MODX tag: [[+tag]]';
+$_lang['chunk_new_name'] = 'New Chunk Name';
+$_lang['chunk_tag_copied'] = 'Chunk tag copied!';
     // Temporarily match old keys to new ones to ensure compatibility
     $_lang['chunk_desc_description'] = $_lang['chunk_description_desc'];
 
@@ -584,32 +590,46 @@
 $_lang['plugin_description_desc'] = 'Usage information for this Plugin shown in search results and as a tooltip in the Elements tree.';
 $_lang['plugin_disabled'] = 'Deactivate Plugin';
 $_lang['plugin_disabled_desc'] = 'When deactivated, this Plugin will not respond to events.';
+$_lang['plugin_new_name'] = 'New Plugin Name';
     // Temporarily match old keys to new ones to ensure compatibility
     $_lang['plugin_desc'] = $_lang['description'];
     $_lang['plugin_desc_description'] = $_lang['plugin_description_desc'];
     $_lang['plugin_disabled_msg'] = $_lang['plugin_disabled_desc'];
 
 // Snippets
+$_lang['example_tag_snippet_name'] = 'NameOfSnippet';
 $_lang['snippet_code'] = 'Snippet Code (PHP)';
 $_lang['snippet_description_desc'] = 'Usage information for this Snippet shown in search results and as a tooltip in the Elements tree.';
+$_lang['snippet_name_desc'] = 'Place the content generated by this Snippet in a Resource, Template, or Chunk using the following MODX tag: [[+tag]]';
+$_lang['snippet_new_name'] = 'New Snippet Name';
+$_lang['snippet_tag_copied'] = 'Snippet tag copied!';
     // Temporarily match old keys to new ones to ensure compatibility
     $_lang['snippet_desc'] = $_lang['description'];
     $_lang['snippet_desc_description'] = $_lang['snippet_description_desc'];
 
 // Templates
 $_lang['template_code'] = 'Template Code (HTML)';
 $_lang['template_description_desc'] = 'Usage information for this Template shown in search results and as a tooltip in the Elements tree.';
+$_lang['template_new_name'] = 'New Template Name';
     // Temporarily match old keys to new ones to ensure compatibility
     $_lang['template_desc'] = $_lang['description'];
     $_lang['template_desc_description'] = $_lang['template_description_desc'];
 
 // TVs
-$_lang['tv_tab_input_options'] = 'Input Options';
-$_lang['tv_type'] = 'Input Type';
-$_lang['tv_default'] = 'Default Value';
-$_lang['tv_default_desc'] = 'The content this TV will show if user-entered content is not provided.';
+$_lang['example_tag_tv_name'] = 'NameOfTV';
 $_lang['tv_caption_desc'] = 'The label shown for this TV in Resource editing pages (can be overridden per template or other criteria using <a href="?a=security/forms" target="_blank">Form Customization</a>).';
 $_lang['tv_category_desc'] = 'Use to group TVs in Resource editing pages and within the Elements tree.';
-$_lang['tv_description_desc'] = 'Usage information for this TV shown next to its caption in Resource editing pages and as a tooltip in the Elements tree.';
+$_lang['tv_default'] = 'Default Value';
+$_lang['tv_default_desc'] = 'The content this TV will show if user-entered content is not provided.';
+// $_lang['tv_description_desc'] = 'Usage information for this TV shown next to its caption in Resource editing pages and as a tooltip in the Elements tree.';
+$_lang['tv_description_desc'] = 'Usage information for this TV shown next to its caption in Resource editing pages, as a tooltip in the Elements tree, and within search results.';
 $_lang['tv_elements'] = 'Input Option Values';
 $_lang['tv_elements_short_desc'] = 'Defines the selectable options for this TV, which may be manually entered or built with a one-line <a href="https://docs.modx.com/current/en/building-sites/elements/template-variables/bindings/select-binding" target="_blank">database query</a>.';
+$_lang['tv_name_desc'] = 'Place the content generated by this TV in a Resource, Template, or Chunk using the following MODX tag: [[+tag]]';
+$_lang['tv_new_caption'] = 'New TV Caption';
+$_lang['tv_new_name'] = 'New TV Name';
+$_lang['tv_tag_copied'] = 'TV tag copied!';
+$_lang['tv_type'] = 'Input Type';
+$_lang['tv_type_desc'] = 'The html input or content component type generated by this TV.';
+    // Temporarily match old keys to new ones to ensure compatibility
+    $_lang['tv_description'] = $_lang['description'];

core/lexicon/en/element.inc.php

@@ -27,8 +27,6 @@
 $_lang['quick_update_tv'] = 'Quick Edit TV';
 $_lang['property_preprocess'] = 'Pre-process tags in Property Values';
 $_lang['property_preprocess_msg'] = 'If enabled, tags in Default Property/Property Set values will be processed before they are used for Element processing.';
-$_lang['static_file'] = 'Static File';
-$_lang['static_file_desc'] = 'The external file location where the source code for this element is stored.';
 $_lang['static_source'] = 'Media Source';
 $_lang['static_source_desc'] = 'Sets the basePath for the Static File to the one specified in the chosen Media Source. Choose “None” when specifying an absolute or other custom path to the file.';
 $_lang['tv_elements'] = 'Input Option Values';
@@ -42,3 +40,14 @@
 $_lang['is_static_msg'] = $_lang['is_static_desc'];
 $_lang['static_file_msg'] = $_lang['static_file_desc'];
 $_lang['static_source_msg'] = $_lang['static_source_desc'];
+
+/*
+    Refer to default.inc.php for the keys below.
+    (Placement in this default file necessary to allow
+    quick create/edit/duplicate panels access to them when opened
+    outside the context of their respective element types)
+
+    static_file
+    static_file_desc
+
+*/

core/lexicon/en/setting.inc.php

@@ -494,6 +494,23 @@
 
 $_lang['setting_package_installer_at_top'] = 'Pin Package-Installer at top';
 $_lang['setting_package_installer_at_top_desc'] = 'If enabled, the Installer entry will be pinned to the top of the Extras menu. Otherwise it will be positioned according to its menuindex.';
+$_lang['setting_enable_overlays'] = 'Enable Overlays';
+$_lang['setting_enable_overlays_desc'] = 'If enabled, a semi-transparent overlay will mask the manager’s main interface below editing windows and dialog boxes, enhancing user focus on the front window(s).';
+
+$_lang['setting_overlay_color'] = 'Overlay Color';
+$_lang['setting_overlay_color_desc'] = 'Any valid css color specified in Hexadecimal, RGB/A, HSL/A, W3C named, or transparent format.';
+
+$_lang['setting_overlay_opacity_blocking'] = 'Overlay Opacity (Blocking)';
+$_lang['setting_overlay_opacity_blocking_desc'] = 'Controls how opaque a dialog window’s underlying overlay (mask) will be. This type of overlay is also used as a mask for disabled grids and blocks interaction with the elements below. Valid values range from 0 (completely transparent) to 100 (completely opaque).';
+
+$_lang['setting_overlay_opacity_nonblocking'] = 'Overlay Opacity (Non-Blocking)';
+$_lang['setting_overlay_opacity_nonblocking_desc'] = 'Controls how opaque an editing window’s non-blocking underlying overlay (mask) will be. This type of overlay allows interaction with the elements below. Valid values range from 0 (completely transparent) to 100 (completely opaque).';
+
+$_lang['setting_overlay_tint_blocking'] = 'Overlay Tint (Blocking)';
+$_lang['setting_overlay_tint_blocking_desc'] = 'The percentage of white added to lighten a dialog window’s underlying overlay color. This type of overlay is also used as a mask for disabled grids and blocks interaction with the elements below. Valid values range from 0 (no lightening) to 100 (completely white) in increments of 5.';
+
+$_lang['setting_overlay_tint_nonblocking'] = 'Overlay Tint (Non-Blocking)';
+$_lang['setting_overlay_tint_nonblocking_desc'] = 'The percentage of white added to lighten an editing window’s non-blocking underlying overlay color. This type of overlay allows interaction with the elements below. Valid values range from 0 (no lightening) to 100 (completely white) in increments of 5.';
 
 $_lang['setting_parser_recurse_uncacheable'] = 'Delay Uncacheable Parsing';
 $_lang['setting_parser_recurse_uncacheable_desc'] = 'If disabled, uncacheable elements may have their output cached inside cacheable element content. Disable this ONLY if you are having problems with complex nested parsing which stopped working as expected.';

core/lexicon/en/snippet.inc.php

@@ -6,7 +6,6 @@
  * @package modx
  * @subpackage lexicon
  */
-$_lang['example_tag_snippet_name'] = 'NameOfSnippet';
 $_lang['snippet'] = 'Snippet';
 $_lang['snippets_available'] = 'Snippets available for you to include in your page';
 $_lang['snippet_category_desc'] = 'Use to group Snippets within the Elements tree.';
@@ -28,11 +27,11 @@
 $_lang['snippet_lock'] = 'Lock snippet for editing';
 $_lang['snippet_lock_desc'] = 'Only users with “edit_locked” permissions can edit this Snippet.';
 $_lang['snippet_management_msg'] = 'Here you can choose which snippet you wish to edit.';
-$_lang['snippet_name_desc'] = 'Place the content generated by this Snippet in a Resource, Template, or Chunk using the following MODX tag: [[+tag]]';
 $_lang['snippet_new'] = 'Create Snippet';
 $_lang['snippet_properties'] = 'Default Properties';
-$_lang['snippet_tab_general_desc'] = 'Here you can enter the basic attributes for this <em>Snippet</em> as well as its content. The content must be PHP, either placed in the <em>Snippet Code</em> field below or in a static external file. To receive output from your Snippet at the point where it is called (within a Template or Chunk), a value must be returned from within the code.';
-$_lang['snippet_tag_copied'] = 'Snippet tag copied!';
+$_lang['snippet_tab_general_desc'] = 'Here you can enter the basic attributes for this <em>Snippet</em> as well as its content. The content must be PHP, either placed in the <a href="#x-form-el-modx-snippet-snippet">Snippet Code</a> field below or in a static external file. To receive output from your Snippet at the point where it is called (within a Template or Chunk), a value must be returned from within the code.';
+$_lang['snippet_title'] = 'Create/edit snippet';
+$_lang['snippet_untitled'] = 'Untitled snippet';
 $_lang['snippets'] = 'Snippets';
 
 // Temporarily match old keys to new ones to ensure compatibility
@@ -50,6 +49,9 @@
     quick create/edit panels access to them when opened
     outside the context of their respective element types)
 
+    example_tag_snippet_name
     snippet_code
     snippet_description_desc
+    snippet_name_desc
+    snippet_tag_copied
 */

core/lexicon/en/tv.inc.php

@@ -6,7 +6,6 @@
  * @package modx
  * @subpackage lexicon
  */
-$_lang['example_tag_tv_name'] = 'NameOfTV';
 $_lang['has_access'] = 'Has Access?';
 $_lang['filter_by_category'] = 'Filter by Category...';
 $_lang['rank'] = 'Rank';
@@ -15,12 +14,8 @@
 $_lang['tvs'] = 'Template Variables';
 $_lang['tv_binding_msg'] = 'This field supports data source bindings using the @ commands';
 $_lang['tv_caption'] = 'Caption';
-$_lang['tv_caption_desc'] = 'The label shown for this TV in Resource editing pages (can be overridden per template or other criteria using <a href="?a=security/forms" target="_blank">Form Customization</a>).';
-$_lang['tv_category_desc'] = 'Use to group TVs in Resource editing pages and within the Elements tree.';
 $_lang['tv_change_template_msg'] = 'Changing this template will cause the page to reload the TVs, losing any unsaved changes.<br /><br /> Are you sure you want to change this template?';
 $_lang['tv_delete_confirm'] = 'Are you sure you want to delete this TV?';
-$_lang['tv_description'] = 'Description';
-$_lang['tv_description_desc'] = 'Usage information for this TV shown next to its caption in Resource editing pages, as a tooltip in the Elements tree, and within search results.';
 $_lang['tv_err_delete'] = 'An error occurred while trying to delete the TV.';
 $_lang['tv_err_duplicate'] = 'An error occurred while trying to duplicate the TV.';
 $_lang['tv_err_duplicate_templates'] = 'An error occurred while duplicating the TV templates.';
@@ -42,7 +37,7 @@
 $_lang['tv_lock'] = 'Restrict Editing';
 $_lang['tv_lock_desc'] = 'Only users with “edit_locked” permissions can edit this TV.';
 $_lang['tv_management_msg'] = 'Manage additional custom TVs for your documents.';
-$_lang['tv_name_desc'] = 'Place the content generated by this TV in a Resource, Template, or Chunk using the following MODX tag: [[+tag]]';
+$_lang['tv_name'] = 'TV Name';
 $_lang['tv_new'] = 'Create TV';
 $_lang['tv_novars'] = 'No TVs found';
 $_lang['tv_properties'] = 'Default Properties';
@@ -51,13 +46,13 @@
 $_lang['tv_reset_params'] = 'Reset parameters';
 $_lang['tv_tab_access_desc'] = 'Select the Resource Groups that this TV belongs to. Only users with access to the Groups selected will be able to modify this TV. If no Groups are selected, all users with access to the Manager will be able to modify the TV.';
 $_lang['tv_tab_general_desc'] = 'Here you can enter the basic attributes for this <em>Template Variable</em> (TV). Note that TVs must be assigned to templates in order to access them from snippets and documents.';
+$_lang['tv_tab_input_options'] = 'Input Options';
 $_lang['tv_tab_input_options_desc'] = '<p>Here you can edit the input options for the TV, specific to the type of input render that you select.</p>';
 $_lang['tv_tab_output_options'] = 'Output Options';
 $_lang['tv_tab_output_options_desc'] = '<p>Here you can edit the output options for the TV, specific to the type of output render that you select.</p>';
 $_lang['tv_tab_sources_desc'] = 'Here you can assign the Media Sources that are to be used for this TV in each specified Context. Double-click on the Source name in the grid to change it.';
 $_lang['tv_tab_tmpl_access'] = 'Template Access';
 $_lang['tv_tab_tmpl_access_desc'] = 'Select the templates that are allowed to access this TV.';
-$_lang['tv_tag_copied'] = 'TV tag copied!';
 $_lang['tv_widget'] = 'Widget';
 $_lang['tv_widget_prop'] = 'Widget Properties';
 $_lang['tvd_err_remove'] = 'An error occurred while trying to delete the TV from the document.';
@@ -94,9 +89,11 @@
     quick create/edit panels access to them when opened
     outside the context of their respective element types)
 
-    tv_tab_input_options
     tv_caption_desc
     tv_category_desc
     tv_description_desc
+    tv_name_desc
+    tv_tag_copied
+    tv_type_desc
 
 */