-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/backend/assets/js/preferences/preferences.js b/modules/backend/assets/js/preferences/preferences.js
index d710cf075..206a48f88 100644
--- a/modules/backend/assets/js/preferences/preferences.js
+++ b/modules/backend/assets/js/preferences/preferences.js
@@ -23,6 +23,19 @@ $(document).ready(function(){
session.setFoldStyle($(this).val())
})
+ $('#Form-field-Preferences-editor_autocompletion').on('change', function(){
+ editor.setOption('enableBasicAutocompletion', false)
+ editor.setOption('enableLiveAutocompletion', false)
+
+ var val = $(this).val()
+ if (val == 'basic') {
+ editor.setOption('enableBasicAutocompletion', true)
+ }
+ else if (val == 'live') {
+ editor.setOption('enableLiveAutocompletion', true)
+ }
+ })
+
$('#Form-field-Preferences-editor_tab_size').on('change', function(){
session.setTabSize($(this).val())
})
@@ -31,18 +44,10 @@ $(document).ready(function(){
editor.setShowInvisibles($(this).is(':checked'))
})
- $('#Form-field-Preferences-editor_enable_basic_autocompletion').on('change', function(){
- editor.setOption('enableBasicAutocompletion', $(this).is(':checked'))
- })
-
$('#Form-field-Preferences-editor_enable_snippets').on('change', function(){
editor.setOption('enableSnippets', $(this).is(':checked'))
})
- $('#Form-field-Preferences-editor_enable_live_autocompletion').on('change', function(){
- editor.setOption('enableLiveAutocompletion', $(this).is(':checked'))
- })
-
$('#Form-field-Preferences-editor_display_indent_guides').on('change', function(){
editor.setDisplayIndentGuides($(this).is(':checked'))
})
diff --git a/modules/backend/assets/less/core/variables.less b/modules/backend/assets/less/core/variables.less
index edc2b0f2c..ff1a5b88d 100644
--- a/modules/backend/assets/less/core/variables.less
+++ b/modules/backend/assets/less/core/variables.less
@@ -17,11 +17,11 @@
@color-border: #cccccc;
@color-border-light: #e1e1e1;
-@color-mainmenu: #111111;
+@color-mainmenu: #000000;
@color-mainmenu-inactive: rgba(255,255,255,.6);
@color-mainmenu-active: #ffffff;
@color-mainmenu-active-bg: #262626;
-@color-mainmenu-collapsed: #111111;
+@color-mainmenu-collapsed: #000000;
@color-accountmenu-bg: #2b3e50;
@color-accountmenu-divider: #4b6372;
diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less
index 3d512824c..89526f350 100644
--- a/modules/backend/assets/less/layout/mainmenu.less
+++ b/modules/backend/assets/less/layout/mainmenu.less
@@ -39,8 +39,9 @@ body.mainmenu-open {
}
.mainmenu-item-link-active() {
- // background: @color-mainmenu-active-bg;
- // .border-radius(5px);
+ background: @color-mainmenu-active-bg;
+ .border-radius(3px);
+ .box-shadow(inset 0 -2px 0 rgba(0,0,0,.25));
}
.mainmenu-set-height(@height) {
diff --git a/modules/backend/controllers/Preferences.php b/modules/backend/controllers/Preferences.php
index dfbf7639c..4ff5555ae 100644
--- a/modules/backend/controllers/Preferences.php
+++ b/modules/backend/controllers/Preferences.php
@@ -1,5 +1,7 @@
formFindModelObject();
$model->resetDefault();
+ Flash::success(Lang::get('backend::lang.form.reset_success'));
+
return Backend::redirect('backend/preferences');
}
diff --git a/modules/backend/controllers/preferences/_field_editor_preview.htm b/modules/backend/controllers/preferences/_field_editor_preview.htm
index 4578395b3..554d311df 100644
--- a/modules/backend/controllers/preferences/_field_editor_preview.htm
+++ b/modules/backend/controllers/preferences/_field_editor_preview.htm
@@ -10,8 +10,7 @@
data-show-invisibles="editor_show_invisibles ?>"
data-highlight-active-line="editor_highlight_active_line ?>"
data-use-soft-tabs="editor_use_hard_tabs ?>"
- data-enable-basic-autocompletion="editor_enable_basic_autocompletion ?>"
- data-enable-live-autocompletion="editor_enable_live_autocompletion ?>"
+ data-autocompletion="editor_autocompletion ?>"
data-enable-snippets="editor_enable_snippets ?>"
data-display-indent-guides="editor_display_indent_guides ?>"
data-show-print-margin="editor_show_print_margin ?>"
diff --git a/modules/backend/formwidgets/CodeEditor.php b/modules/backend/formwidgets/CodeEditor.php
index f471f8c68..bc8ab7172 100644
--- a/modules/backend/formwidgets/CodeEditor.php
+++ b/modules/backend/formwidgets/CodeEditor.php
@@ -73,20 +73,15 @@ class CodeEditor extends FormWidgetBase
public $readOnly = false;
/**
- * @var boolean If true, the editor activate Basic Autocompletion if press Ctrl+Space
+ * @var string Autocomplete mode: manual, basic, live.
*/
- public $enableBasicAutocompletion = true;
+ public $autocompletion = 'manual';
/**
* @var boolean If true, the editor activate use Snippets
*/
public $enableSnippets = true;
- /**
- * @var boolean If true, the editor activate Live Autocompletion mode
- */
- public $enableLiveAutocompletion = true;
-
/**
* @var boolean If true, the editor show Indent Guides
*/
@@ -125,9 +120,8 @@ class CodeEditor extends FormWidgetBase
'margin',
'theme',
'readOnly',
- 'enableBasicAutocompletion',
+ 'autocompletion',
'enableSnippets',
- 'enableLiveAutocompletion',
'displayIndentGuides',
'showPrintMargin'
]);
@@ -163,9 +157,8 @@ class CodeEditor extends FormWidgetBase
$this->vars['size'] = $this->formField->size;
$this->vars['name'] = $this->formField->getName();
$this->vars['readOnly'] = $this->readOnly;
- $this->vars['enableBasicAutocompletion'] = $this->enableBasicAutocompletion;
+ $this->vars['autocompletion'] = $this->autocompletion;
$this->vars['enableSnippets'] = $this->enableSnippets;
- $this->vars['enableLiveAutocompletion'] = $this->enableLiveAutocompletion;
$this->vars['displayIndentGuides'] = $this->displayIndentGuides;
$this->vars['showPrintMargin'] = $this->showPrintMargin;
@@ -201,9 +194,8 @@ class CodeEditor extends FormWidgetBase
$this->highlightActiveLine = $preferences->editor_highlight_active_line;
$this->useSoftTabs = !$preferences->editor_use_hard_tabs;
$this->showGutter = $preferences->editor_show_gutter;
- $this->enableBasicAutocompletion = $preferences->editor_enable_basic_autocompletion;
+ $this->autocompletion = $preferences->editor_autocompletion;
$this->enableSnippets = $preferences->editor_enable_snippets;
- $this->enableLiveAutocompletion = $preferences->editor_enable_live_autocompletion;
$this->displayIndentGuides = $preferences->editor_display_indent_guides;
$this->showPrintMargin = $preferences->editor_show_print_margin;
}
diff --git a/modules/backend/formwidgets/RecordFinder.php b/modules/backend/formwidgets/RecordFinder.php
index ff154da4c..fb47533ec 100644
--- a/modules/backend/formwidgets/RecordFinder.php
+++ b/modules/backend/formwidgets/RecordFinder.php
@@ -241,7 +241,7 @@ class RecordFinder extends FormWidgetBase
$config->alias = $this->alias . 'List';
$config->showSetup = false;
$config->showCheckboxes = false;
- $config->recordsPerPage = 20;
+ $config->recordsPerPage = 10;
$config->recordOnClick = sprintf("$('#%s').recordFinder('updateRecord', this, ':" . $this->keyFrom . "')", $this->getId());
$widget = $this->makeWidget('Backend\Widgets\Lists', $config);
diff --git a/modules/backend/formwidgets/codeeditor/assets/js/build-min.js b/modules/backend/formwidgets/codeeditor/assets/js/build-min.js
index 6b1cadd9b..2422d2049 100644
--- a/modules/backend/formwidgets/codeeditor/assets/js/build-min.js
+++ b/modules/backend/formwidgets/codeeditor/assets/js/build-min.js
@@ -4605,7 +4605,7 @@ $.oc.foundation.controlUtils.markDisposable(element)
this.init();this.$el.trigger('oc.codeEditorReady')}
CodeEditor.prototype=Object.create(BaseProto)
CodeEditor.prototype.constructor=CodeEditor
-CodeEditor.DEFAULTS={fontSize:12,wordWrap:'off',codeFolding:'manual',tabSize:4,theme:'textmate',showInvisibles:true,highlightActiveLine:true,useSoftTabs:true,autoCloseTags:true,showGutter:true,enableEmmet:true,language:'php',margin:0,vendorPath:'/',showPrintMargin:false,highlightSelectedWord:false,hScrollBarAlwaysVisible:false,readOnly:false}
+CodeEditor.DEFAULTS={fontSize:12,wordWrap:'off',codeFolding:'manual',autocompletion:'manual',tabSize:4,theme:'textmate',showInvisibles:true,highlightActiveLine:true,useSoftTabs:true,autoCloseTags:true,showGutter:true,enableEmmet:true,language:'php',margin:0,vendorPath:'/',showPrintMargin:false,highlightSelectedWord:false,hScrollBarAlwaysVisible:false,readOnly:false}
CodeEditor.prototype.init=function(){var self=this;if(!this.$el.attr('id')){this.$el.attr('id','element-'+Math.random().toString(36).substring(7))}
this.$code=$('').addClass('editor-code').attr('id',this.$el.attr('id')+'-code').css({position:'absolute',top:0,right:0,bottom:0,left:0}).appendTo(this.$el)
var editor=this.editor=ace.edit(this.$code.attr('id')),options=this.options,$form=this.$el.closest('form');editor.$blockScrolling=Infinity
@@ -4627,7 +4627,6 @@ editor.renderer.setShowGutter(options.showGutter)
editor.renderer.setShowPrintMargin(options.showPrintMargin)
editor.setHighlightSelectedWord(options.highlightSelectedWord)
editor.renderer.setHScrollBarAlwaysVisible(options.hScrollBarAlwaysVisible)
-editor.setOptions({enableEmmet:options.enableEmmet,enableBasicAutocompletion:options.enableBasicAutocompletion,enableSnippets:options.enableSnippets,enableLiveAutocompletion:options.enableLiveAutocompletion})
editor.setDisplayIndentGuides(options.displayIndentGuides)
editor.getSession().setUseSoftTabs(options.useSoftTabs)
editor.getSession().setTabSize(options.tabSize)
@@ -4638,6 +4637,7 @@ editor.on('blur',this.proxy(this.onBlur))
editor.on('focus',this.proxy(this.onFocus))
this.setWordWrap(options.wordWrap)
ace.require('ace/config').set('basePath',this.options.vendorPath)
+editor.setOptions({enableEmmet:options.enableEmmet,enableBasicAutocompletion:options.autocompletion==='basic',enableSnippets:options.enableSnippets,enableLiveAutocompletion:options.autocompletion==='live'})
editor.renderer.setScrollMargin(options.margin,options.margin,0,0)
editor.renderer.setPadding(options.margin)
this.$toolbar.find('>ul>li>a').each(function(){var abbr=$(this).find('>abbr'),label=abbr.text(),help=abbr.attr('title'),title=label+' ('+help+')';$(this).attr('title',title)}).tooltip({delay:500,placement:'bottom',html:true});this.$fullscreenDisable.hide()
diff --git a/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js b/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
index a75b748da..972298b14 100644
--- a/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
+++ b/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
@@ -58,6 +58,7 @@
fontSize: 12,
wordWrap: 'off',
codeFolding: 'manual',
+ autocompletion: 'manual',
tabSize: 4,
theme: 'textmate',
showInvisibles: true,
@@ -147,12 +148,6 @@
editor.renderer.setShowPrintMargin(options.showPrintMargin)
editor.setHighlightSelectedWord(options.highlightSelectedWord)
editor.renderer.setHScrollBarAlwaysVisible(options.hScrollBarAlwaysVisible)
- editor.setOptions({
- enableEmmet: options.enableEmmet,
- enableBasicAutocompletion: options.enableBasicAutocompletion,
- enableSnippets: options.enableSnippets,
- enableLiveAutocompletion: options.enableLiveAutocompletion
- })
editor.setDisplayIndentGuides(options.displayIndentGuides)
editor.getSession().setUseSoftTabs(options.useSoftTabs)
editor.getSession().setTabSize(options.tabSize)
@@ -166,6 +161,13 @@
// Set the vendor path for Ace's require path
ace.require('ace/config').set('basePath', this.options.vendorPath)
+ editor.setOptions({
+ enableEmmet: options.enableEmmet,
+ enableBasicAutocompletion: options.autocompletion === 'basic',
+ enableSnippets: options.enableSnippets,
+ enableLiveAutocompletion: options.autocompletion === 'live'
+ })
+
editor.renderer.setScrollMargin(options.margin, options.margin, 0, 0)
editor.renderer.setPadding(options.margin)
diff --git a/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm b/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm
index 08a3a2350..3a754ff9c 100644
--- a/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm
+++ b/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm
@@ -12,11 +12,10 @@
data-tab-size=""
data-theme=""
data-show-invisibles=""
- data-enable-basic-autocompletion=""
- data-enable-snippets=""
- data-enable-live-autocompletion=""
- data-display-indent-guides=""
- data-show-print-margin=""
+ data-autocompletion=""
+ data-enable-snippets=""
+ data-display-indent-guides=""
+ data-show-print-margin=""
data-highlight-active-line=""
data-use-soft-tabs=""
data-show-gutter=""
@@ -49,8 +48,8 @@
-
-
+
+
@@ -61,7 +60,7 @@
-
+
diff --git a/modules/backend/formwidgets/fileupload/assets/css/fileupload.css b/modules/backend/formwidgets/fileupload/assets/css/fileupload.css
index 06f5e38d7..5e8b354be 100644
--- a/modules/backend/formwidgets/fileupload/assets/css/fileupload.css
+++ b/modules/backend/formwidgets/fileupload/assets/css/fileupload.css
@@ -4,12 +4,12 @@
.field-fileupload .upload-object .icon-container i{color:#95a5a6;display:inline-block}
.field-fileupload .upload-object .icon-container div{display:table-cell;text-align:center;vertical-align:middle}
.field-fileupload .upload-object .icon-container.image > div.icon-wrapper{display:none}
-.field-fileupload .upload-object h4{font-size:15px;color:#2A3E51;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;line-height:150%;margin:15px 0 5px 0;padding-right:0;-webkit-transition:padding 0.1s;transition:padding 0.1s;position:relative}
+.field-fileupload .upload-object h4{font-size:13px;color:#2A3E51;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;line-height:150%;margin:15px 0 5px 0;padding-right:0;-webkit-transition:padding 0.1s;transition:padding 0.1s;position:relative}
.field-fileupload .upload-object h4 a{position:absolute;right:0;top:0;display:none;font-weight:400}
.field-fileupload .upload-object p.size{font-size:12px;color:#95a5a6}
.field-fileupload .upload-object p.size strong{font-weight:400}
.field-fileupload .upload-object .meta .drag-handle{position:absolute;bottom:0;right:0;cursor:move;display:block}
-.field-fileupload .upload-object .info h4 a,.field-fileupload .upload-object .meta a.upload-remove-button,.field-fileupload .upload-object .meta a.drag-handle{color:#2b3e50;display:none;font-size:15px;text-decoration:none}
+.field-fileupload .upload-object .info h4 a,.field-fileupload .upload-object .meta a.upload-remove-button,.field-fileupload .upload-object .meta a.drag-handle{color:#2b3e50;display:none;font-size:13px;text-decoration:none}
.field-fileupload .upload-object .icon-container{position:relative}
.field-fileupload .upload-object .icon-container:after{background-image:url('../../../../../system/assets/ui/images/loader-transparent.svg');position:absolute;content:' ';width:40px;height:40px;left:50%;top:50%;margin-top:-20px;margin-left:-20px;display:block;background-size:40px 40px;background-position:50% 50%;-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite}
.field-fileupload .upload-object.is-success .icon-container{opacity:1}
diff --git a/modules/backend/formwidgets/fileupload/assets/less/fileupload.base.less b/modules/backend/formwidgets/fileupload/assets/less/fileupload.base.less
index d734ab66a..903bb5a66 100644
--- a/modules/backend/formwidgets/fileupload/assets/less/fileupload.base.less
+++ b/modules/backend/formwidgets/fileupload/assets/less/fileupload.base.less
@@ -158,7 +158,7 @@
}
h4 {
- font-size: 15px;
+ font-size: 13px;
color: #2A3E51;
white-space: nowrap;
overflow: hidden;
@@ -200,7 +200,7 @@
.meta a.drag-handle {
color: #2b3e50;
display: none;
- font-size: 15px;
+ font-size: 13px;
text-decoration: none;
}
diff --git a/modules/backend/layouts/_flash_messages.htm b/modules/backend/layouts/_flash_messages.htm
index 4d5ba0667..8d58edaba 100644
--- a/modules/backend/layouts/_flash_messages.htm
+++ b/modules/backend/layouts/_flash_messages.htm
@@ -1,3 +1,3 @@
$message): ?>
-
+
\ No newline at end of file
diff --git a/modules/backend/models/Preferences.php b/modules/backend/models/Preferences.php
index 2c51256a4..a4d1feb9b 100644
--- a/modules/backend/models/Preferences.php
+++ b/modules/backend/models/Preferences.php
@@ -44,16 +44,15 @@ class Preferences extends Model
$this->editor_code_folding = $config->get('editor.code_folding', 'manual');
$this->editor_tab_size = $config->get('editor.tab_size', 4);
$this->editor_theme = $config->get('editor.theme', static::DEFAULT_THEME);
- $this->editor_show_invisibles = $config->get('editor.show_invisibles', true);
+ $this->editor_show_invisibles = $config->get('editor.show_invisibles', false);
$this->editor_highlight_active_line = $config->get('editor.highlight_active_line', true);
$this->editor_use_hard_tabs = $config->get('editor.use_hard_tabs', false);
$this->editor_show_gutter = $config->get('editor.show_gutter', true);
- $this->editor_auto_closing = $config->get('editor.auto_closing', true);
- $this->editor_enable_basic_autocompletion = $config->get('editor.enable_basic_autocompletion', true);
- $this->editor_enable_live_autocompletion = $config->get('editor.enable_live_autocompletion', true);
- $this->editor_enable_snippets = $config->get('editor.enable_snippets', true);
- $this->editor_display_indent_guides = $config->get('editor.display_indent_guides', true);
- $this->editor_show_print_margin = $config->get('editor.show_print_margin', true);
+ $this->editor_auto_closing = $config->get('editor.auto_closing', false);
+ $this->editor_autocompletion = $config->get('editor.editor_autocompletion', 'manual');
+ $this->editor_enable_snippets = $config->get('editor.enable_snippets', false);
+ $this->editor_display_indent_guides = $config->get('editor.display_indent_guides', false);
+ $this->editor_show_print_margin = $config->get('editor.show_print_margin', false);
}
public static function setAppLocale()
diff --git a/modules/backend/models/preferences/fields.yaml b/modules/backend/models/preferences/fields.yaml
index 28b876933..a74d62ca0 100644
--- a/modules/backend/models/preferences/fields.yaml
+++ b/modules/backend/models/preferences/fields.yaml
@@ -24,18 +24,11 @@ tabs:
tab: backend::lang.backend_preferences.code_editor
path: field_editor_preview
- editor_font_size:
- label: backend::lang.editor.font_size
+ editor_theme:
+ label: backend::lang.editor.theme
tab: backend::lang.backend_preferences.code_editor
span: auto
type: dropdown
- options:
- 11: 11px
- 12: 12px
- 13: 13px
- 14: 14px
- 15: 15px
- 16: 16px
editor_word_wrap:
label: backend::lang.editor.word_wrap
@@ -48,15 +41,18 @@ tabs:
80: 80 Characters
fluid: Fluid
- editor_code_folding:
- label: backend::lang.editor.code_folding
+ editor_font_size:
+ label: backend::lang.editor.font_size
tab: backend::lang.backend_preferences.code_editor
- type: dropdown
span: auto
+ type: dropdown
options:
- manual: Off
- markbegin: Mark begin
- markbeginend: Mark begin and end
+ 11: 11px
+ 12: 12px
+ 13: 13px
+ 14: 14px
+ 15: 15px
+ 16: 16px
editor_tab_size:
label: backend::lang.editor.tab_size
@@ -72,19 +68,28 @@ tabs:
7: 7
8: 8
- editor_theme:
- label: backend::lang.editor.theme
+ editor_code_folding:
+ label: backend::lang.editor.code_folding
tab: backend::lang.backend_preferences.code_editor
type: dropdown
-
- editor_auto_closing:
- label: backend::lang.editor.auto_closing
- tab: backend::lang.backend_preferences.code_editor
- type: checkbox
span: auto
+ options:
+ manual: backend::lang.editor.mode_off
+ markbegin: backend::lang.editor.code_folding_begin
+ markbeginend: backend::lang.editor.code_folding_begin_end
- editor_show_invisibles:
- label: backend::lang.editor.show_invisibles
+ editor_autocompletion:
+ label: backend::lang.editor.autocompletion
+ tab: backend::lang.backend_preferences.code_editor
+ type: dropdown
+ span: auto
+ options:
+ manual: backend::lang.editor.mode_off
+ basic: backend::lang.editor.basic_autocompletion
+ live: backend::lang.editor.live_autocompletion
+
+ editor_show_gutter:
+ label: backend::lang.editor.show_gutter
tab: backend::lang.backend_preferences.code_editor
type: checkbox
span: auto
@@ -101,38 +106,32 @@ tabs:
type: checkbox
span: auto
- editor_show_gutter:
- label: backend::lang.editor.show_gutter
- tab: backend::lang.backend_preferences.code_editor
- type: checkbox
- span: auto
-
- editor_enable_basic_autocompletion:
- label: backend::lang.editor.enable_basic_autocompletion
- tab: backend::lang.backend_preferences.code_editor
- type: checkbox
- span: auto
-
- editor_enable_snippets:
- label: backend::lang.editor.enable_snippets
- tab: backend::lang.backend_preferences.code_editor
- type: checkbox
- span: auto
-
- editor_enable_live_autocompletion:
- label: backend::lang.editor.enable_live_autocompletion
- tab: backend::lang.backend_preferences.code_editor
- type: checkbox
- span: auto
-
editor_display_indent_guides:
label: backend::lang.editor.display_indent_guides
tab: backend::lang.backend_preferences.code_editor
type: checkbox
span: auto
+ editor_show_invisibles:
+ label: backend::lang.editor.show_invisibles
+ tab: backend::lang.backend_preferences.code_editor
+ type: checkbox
+ span: auto
+
editor_show_print_margin:
label: backend::lang.editor.show_print_margin
tab: backend::lang.backend_preferences.code_editor
type: checkbox
span: auto
+
+ editor_auto_closing:
+ label: backend::lang.editor.auto_closing
+ tab: backend::lang.backend_preferences.code_editor
+ type: checkbox
+ span: auto
+
+ editor_enable_snippets:
+ label: backend::lang.editor.enable_snippets
+ tab: backend::lang.backend_preferences.code_editor
+ type: checkbox
+ span: auto
diff --git a/modules/cms/controllers/themes/_theme_list_item.htm b/modules/cms/controllers/themes/_theme_list_item.htm
index ebb285e64..8ea25c13e 100644
--- a/modules/cms/controllers/themes/_theme_list_item.htm
+++ b/modules/cms/controllers/themes/_theme_list_item.htm
@@ -19,7 +19,7 @@
@@ -37,7 +37,7 @@
hasCustomData()): ?>
+ class="btn btn-secondary">
@@ -45,7 +45,7 @@
diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php
index f7c6db885..dc4c843e1 100644
--- a/modules/cms/widgets/AssetList.php
+++ b/modules/cms/widgets/AssetList.php
@@ -47,7 +47,7 @@ class AssetList extends WidgetBase
/**
* @var string Message to display when the Delete button is clicked.
*/
- public $deleteConfirmation = 'Do you really want to delete selected files or directories?';
+ public $deleteConfirmation = 'Delete selected files or directories?';
public function __construct($controller, $alias)
{
diff --git a/modules/cms/widgets/TemplateList.php b/modules/cms/widgets/TemplateList.php
index 28fef8719..61f49f625 100644
--- a/modules/cms/widgets/TemplateList.php
+++ b/modules/cms/widgets/TemplateList.php
@@ -52,7 +52,7 @@ class TemplateList extends WidgetBase
/**
* @var string Message to display when the Delete button is clicked.
*/
- public $deleteConfirmation = 'Do you really want to delete selected templates?';
+ public $deleteConfirmation = 'Delete selected templates?';
/**
* @var string Specifies the item type.
diff --git a/modules/cms/widgets/mediamanager/partials/_sorting.htm b/modules/cms/widgets/mediamanager/partials/_sorting.htm
index 4dd47bf55..79e409cac 100644
--- a/modules/cms/widgets/mediamanager/partials/_sorting.htm
+++ b/modules/cms/widgets/mediamanager/partials/_sorting.htm
@@ -9,9 +9,12 @@
-