Merge branch '2.5.x' into 2.x

modxcms · Jul 21, 2016 · ece8a0f · ece8a0f
2 parents ed1d114 + 70d7e86
commit ece8a0f
Show file tree

Hide file tree

Showing 15 changed files with 92 additions and 76 deletions.
diff --git a/_build/templates/default/sass/_forms.scss b/_build/templates/default/sass/_forms.scss
@@ -10,7 +10,7 @@ textarea.x-form-field,
 }
 
 /* use default manager font for TV textareas to have unified look across TVs */
-.modx-tv .x-form-textarea {
+.modx-tv .x-form-textarea:not(div) {
   font-family: inherit;
 }
 
@@ -1261,7 +1261,7 @@ input::-moz-focus-inner {
 
 /* this is the dropdown list to select the options, it's outside of the main superboxselect wrapper */
 /*.x-superboxselect-list {
-  
+
 }*/
 
 /* The date TV calendar styles */
@@ -1337,7 +1337,7 @@ input::-moz-focus-inner {
 .x-date-mp-ybtn a.x-date-mp-prev {
   &:before {
     content: $fa-var-caret-left;
-  }  
+  }
 }
 .x-date-inner {
   margin: 0 auto;
@@ -1460,4 +1460,3 @@ td.x-date-mp-year a:hover {
 /*.x-date-mp-ybtn a {
   background-image: url($imgPath + 'modx-theme/panel/tool-sprites.gif');
 }*/
-
diff --git a/core/docs/changelog.txt b/core/docs/changelog.txt
@@ -2,6 +2,8 @@
 This file shows the changes in recent releases of MODX. The most current release is usually the
 development release, and is only shown to give an idea of what's currently in the pipeline.
 
+- Preserve original behavior for 3PC RTE TVs [#13071]
+- Fix with of install button after text change [#13078]
 - Fix server port check in setup start script [#13037]
 - Update phpThumb to version 1.7.14 [#13039]
 - Show image preview in file tree for S3 media source [#13059]

diff --git a/core/lexicon/de/file.inc.php b/core/lexicon/de/file.inc.php
@@ -63,7 +63,7 @@
 $_lang['file_folder_remove'] = 'Verzeichnis löschen';
 $_lang['file_folder_remove_confirm'] = 'Sind Sie sicher, dass Sie dieses Verzeichnis löschen möchten? Das könnte möglicherweise dazu führen, dass Ihre Website ganz oder teilweise nicht mehr funktioniert.';
 $_lang['file_last_accessed'] = 'Letzter Zugriff';
-$_lang['file_last_modified'] = 'Zuletzt geändert';
+$_lang['file_last_modified'] = 'Letzte Änderung';
 $_lang['file_name'] = 'Dateiname';
 $_lang['file_quick_create'] = 'Datei schnell erstellen';
 $_lang['file_quick_update'] = 'Datei schnell bearbeiten';

diff --git a/core/lexicon/ru/setting.inc.php b/core/lexicon/ru/setting.inc.php
@@ -185,7 +185,7 @@
 $_lang['setting_clear_cache_refresh_trees_desc'] = 'Если включено, то после обновления кэша сайта будут обновлятся древовидные меню.';
 
 $_lang['setting_compress_css'] = 'Использовать сжатый CSS';
-$_lang['setting_compress_css_desc'] = 'Если эта опция включена, MODX будет использовать сжатую версию CSS-стилей в интерфейсе панели управления.';
+$_lang['setting_compress_css_desc'] = 'Если выбрано «Да», MODX будет использовать сжатые версии файлов CSS-стилей в панели управления.';
 
 $_lang['setting_compress_js'] = 'Использовать сжатые javascript-библиотеки';
 $_lang['setting_compress_js_desc'] = 'Если выбрано «Да», MODX будет предоставлять сжатую версию файла со скриптами панели управления.';

diff --git a/manager/assets/modext/modx.jsgrps-min.js b/manager/assets/modext/modx.jsgrps-min.js
diff --git a/manager/assets/modext/workspace/package.containers.js b/manager/assets/modext/workspace/package.containers.js
@@ -68,6 +68,8 @@ MODx.panel.Packages = function(config) {
 			,hidden: true
 			,handler: this.onSetupOptions
 			,scope: this
+			,autoWidth: true
+			,autoHeight: true
 		}]
 	});
 	MODx.panel.Packages.superclass.constructor.call(this,config);

diff --git a/manager/assets/modext/workspace/package.panels.js b/manager/assets/modext/workspace/package.panels.js
@@ -324,11 +324,8 @@ MODx.grid.PackageDependencies = function(config) {
 
     this.store.on('load', function () {
         if (!this.checkDependencies()) {
-            Ext.getCmp('package-show-setupoptions-btn').setText(_('install_dependencies_first'));
-            Ext.getCmp('package-show-setupoptions-btn').disable();
-
-            Ext.getCmp('package-install-btn').setText(_('install_dependencies_first'));
-            Ext.getCmp('package-install-btn').disable();
+            Ext.getCmp('package-show-setupoptions-btn').disable().setText(_('install_dependencies_first')).syncSize();
+            Ext.getCmp('package-install-btn').disable().setText(_('install_dependencies_first')).syncSize();
         }
     }, this);
 };

diff --git a/manager/templates/default/css/index-min.css b/manager/templates/default/css/index-min.css