diff --git a/assets/plugins/codemirror/codemirror.plugin.php b/assets/plugins/codemirror/codemirror.plugin.php index 1d4bc9c74f..f6edf6624d 100644 --- a/assets/plugins/codemirror/codemirror.plugin.php +++ b/assets/plugins/codemirror/codemirror.plugin.php @@ -113,7 +113,7 @@ case 'OnPluginFormRender' : case 'OnModFormRender' : $tvMode = true; - $limitedHeight = true; + // $limitedHeight = true; // No limited height since MODX 1.2 $elements = array($textarea_name,'properties'); $mode = 'application/x-httpd-php-open'; $rte = ($prte ? $prte : 'none'); diff --git a/assets/templates/help/04About_MODX.php b/assets/templates/help/04About_MODX.php index 624cf3a8be..6b2746a66a 100644 --- a/assets/templates/help/04About_MODX.php +++ b/assets/templates/help/04About_MODX.php @@ -2,10 +2,10 @@ if(IN_MANAGER_MODE!="true") die("INCLUDE_ORDERING_ERROR

Please use the MODX Content Manager instead of accessing this file directly."); $downloadLinks = array( - 0=>array('title'=>'Information','link'=>'https://modx.com/community/modx-evolution'), - 1=>array('title'=>'Download','link'=>'https://modx.com/download/evolution/'), - 2=>array('title'=>'Previous Releases','link'=>'https://modx.com/download/evolution/previous-releases.html'), - 3=>array('title'=>'Extras','link'=>array( + 0=>array('title'=>$_lang["information"],'link'=>'https://modx.com/community/modx-evolution'), + 1=>array('title'=>$_lang["download"],'link'=>'https://modx.com/download/evolution/'), + 2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'), + 3=>array('title'=>$_lang["extras"],'link'=>array( 'https://modx.com/extras/?product=evolution', 'http://extras.evolution-cms.com/', 'https://github.com/extras-evolution' @@ -14,7 +14,7 @@ $translationLinks = array( 0=>array('title'=>'MODX Evolution','link'=>'https://www.transifex.com/modx/modx-evolution/'), - 1=>array('title'=>'Extras','link'=>'https://www.transifex.com/modx/modx-evolution-extras/'), + 1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/modx/modx-evolution-extras/'), ); function createList($sectionHeader, $linkArr) { diff --git a/install/assets/plugins/ElementsInTree.tpl b/install/assets/plugins/ElementsInTree.tpl index 74bb836bc7..c9e948a7ee 100644 --- a/install/assets/plugins/ElementsInTree.tpl +++ b/install/assets/plugins/ElementsInTree.tpl @@ -327,6 +327,11 @@ if ($e->name == 'OnManagerTreePrerender') { }); } }); + jQuery(".filterElements-form").keydown(function (e) { + if (e.keyCode == 13) { + e.preventDefault(); + } + }); } var storageKey = "MODX_elementsInTreeParams"; diff --git a/manager/actions/mutate_module.dynamic.php b/manager/actions/mutate_module.dynamic.php index 86b1bdf36e..679411f4c6 100644 --- a/manager/actions/mutate_module.dynamic.php +++ b/manager/actions/mutate_module.dynamic.php @@ -142,7 +142,7 @@ function showParameters(ctrl) { currentParams = JSON.parse(props); } - t = ''; + t = '
'; try { var type, options, found, info, sd; @@ -469,7 +469,8 @@ function SetUrl(url, width, height, alt) { +
+
value="on" class="inputBox" /> '.$_lang['module_disabled'].'' : $_lang['module_disabled']?>
class="inputBox" /> -
@@ -482,36 +483,39 @@ function SetUrl(url, width, height, alt) { +

- - - - - - - - - +
:

class="inputBox" onclick="documentDirty=true;" /> :

 
+ + +
+
    +
+
 

- - - - - -
:

:
- - + + + + + + + + +
:

class="inputBox" onclick="documentDirty=true;" /> :

+
+
@@ -519,7 +523,7 @@ function SetUrl(url, width, height, alt) {

- +
-hasPermission('save_role')):?> - - - - + + +



" align="absmiddle" />

diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index 424b2f4d13..4385be61c2 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -128,7 +128,7 @@ function showParameters(ctrl) { currentParams = JSON.parse(props); } - t = ''; + t = '
'; try { var type, options, found, info, sd; @@ -228,9 +228,9 @@ function showParameters(ctrl) { info = ''; info += desc ? '
' + desc + '' : ''; - sd = defaultVal != undefined ? '
' : ''; + sd = defaultVal != undefined ? '
' : ''; - t += ''; + t += ''; }); t += '
' + label + ''+ info + '' + c + sd + '
' + label + ''+ info + '' + c + sd + '
'; @@ -337,7 +337,7 @@ function createAssignEventsButton() { if(document.getElementById('assignEvents') === null) { var button = document.createElement("div"); button.setAttribute('id', 'assignEvents'); - button.innerHTML = '
'; + button.innerHTML = '
'; var tab = document.getElementById("tabEvents"); tab.insertBefore(button, tab.firstChild); } @@ -482,11 +482,9 @@ function contains(a, obj) {


@@ -496,17 +494,36 @@ function contains(a, obj) {
- +
+

- - +
+ + + + + + +
+
    +
+
 
+
+ + +
+

+ + + + + - - - - - - -
:  
-

- -
 
-
- - -
-

- - + + + + - -

- +
+
-
+ +

diff --git a/manager/actions/mutate_snippet.dynamic.php b/manager/actions/mutate_snippet.dynamic.php index 92101de4cf..06d4a83c65 100644 --- a/manager/actions/mutate_snippet.dynamic.php +++ b/manager/actions/mutate_snippet.dynamic.php @@ -129,7 +129,7 @@ function showParameters(ctrl) { currentParams = JSON.parse(props); } - t = ''; + t = '
'; try { @@ -230,9 +230,9 @@ function showParameters(ctrl) { info = ''; info += desc ? '
'+desc+'' : ''; - sd = defaultVal != undefined ? ' Set Default' : ''; + sd = defaultVal != undefined ? '
' : ''; - t += ''; + t += ''; }); @@ -446,7 +446,10 @@ function contains(a, obj) { hasPermission('save_role')):?> - + + + +
' + label + ''+ info + '' + c + sd + '
' + label + ''+ info + '' + c + sd + '
@@ -463,13 +466,31 @@ function contains(a, obj) {
+ +
+

+ + + + + + + + +
+
    +
+
 
+
+

- + - - - - - - @@ -508,7 +523,7 @@ function contains(a, obj) {
:  
:

:
- - +
+
 
-
+
diff --git a/manager/includes/lang/english.inc.php b/manager/includes/lang/english.inc.php index e115b7e162..13b026fbd3 100644 --- a/manager/includes/lang/english.inc.php +++ b/manager/includes/lang/english.inc.php @@ -1338,4 +1338,8 @@ $_lang["option_default"] = "Default"; $_lang['evo_downloads_title'] = "Evolution Downloads"; -$_lang['help_translating_title'] = "Help translating MODX Evolution"; \ No newline at end of file +$_lang['help_translating_title'] = "Help translating MODX Evolution"; +$_lang['download'] = "Download"; +$_lang['downloads'] = "Downloads"; +$_lang["previous_releases"] = "Previous Releases"; +$_lang["extras"] = "Extras"; \ No newline at end of file diff --git a/manager/media/style/MODxRE2/style.css b/manager/media/style/MODxRE2/style.css index ffad644908..17cf4d2b56 100644 --- a/manager/media/style/MODxRE2/style.css +++ b/manager/media/style/MODxRE2/style.css @@ -3378,4 +3378,7 @@ table.actionButtons .searchtext { color: #777; } -.userprofiletable {margin-bottom:-20px;} \ No newline at end of file +.userprofiletable {margin-bottom:-20px;} + +.btn-small { padding:2px 4px !important; font-size:11px !important; } +.relative { position:relative; } \ No newline at end of file