Merge pull request #1013 from modxcms/develop

v1.2RC2

Author: Dmi3yy

assets/plugins/elementsintree/assets/txt_content.tpl

@@ -479,6 +479,8 @@
     font-weight:bold;
 }
 
+.tab-page { margin-bottom:0; }
+
 [+unifyFrames_css+]
 [+treeButtonsInTab_css+]
 
@@ -648,7 +650,7 @@
             winHeight = jQuery(window).height();
             tabsHeight = jQuery(".tab-row:first").height();
             buttonsSize = jQuery(".filterElements-form:first").getSize();
-            themeMargins = 70; // All MODxRE2 top/bottom margins
+            themeMargins = 60; // All MODxRE2 top/bottom margins
             tabHeight = winHeight - tabsHeight - buttonsSize.height - themeMargins;
         }
         

assets/plugins/elementsintree/includes/functions.inc.php

@@ -30,7 +30,7 @@ function getLockedByUser($lockType,$rowLock,$id) {
 
     $ph = array();
     $ph['element_type'] = $_lang['lock_element_type_'.$lockType];
-    $ph['lasthit_df']  = $rowLock['lasthit_df'];
+    $ph['firsthit_df']  = $rowLock['firsthit_df'];
 
         if($rowLock['internalKey'] == $modx->getLoginUserID()) {
         $title = $modx->parseText($_lang['lock_element_editing'], $ph);
@@ -54,7 +54,7 @@ function getLockedByUser($lockType,$rowLock,$id) {
 
 // create elements list function
 function createElementsList($elmTable,$action,$nameField = 'name') {
-    global $modx, $_lang;
+    global $modx, $_lang, $modx_textdir;
 
     $field = array();
     if    ($elmTable == 'site_plugins')  $field['disabled'] = '[+prefix+]site_plugins.disabled';
@@ -128,7 +128,7 @@ function createElementsList($elmTable,$action,$nameField = 'name') {
 
 function createModulesList($action) {
 
-    global $modx, $_lang;
+    global $modx, $_lang, $modx_textdir;
 
     $output  = '
         <form class="filterElements-form filterElements-form--eit" style="margin-top: 0;">

assets/snippets/DocLister/core/controller/site_content.php

@@ -47,6 +47,8 @@ public function getDocs($tvlist = '')
             $tvlist = $this->getCFGDef('tvList', '');
         }
 
+        $this->extTV->getAllTV_Name();
+
         if ($this->extPaginate = $this->getExtender('paginate')) {
             $this->extPaginate->init($this);
         } else {
@@ -55,7 +57,6 @@ public function getDocs($tvlist = '')
         $type = $this->getCFGDef('idType', 'parents');
         $this->_docs = ($type == 'parents') ? $this->getChildrenList() : $this->getDocList();
         if ($tvlist != '' && count($this->_docs) > 0) {
-            $this->extTV->getAllTV_Name();
             $tv = $this->extTV->getTVList(array_keys($this->_docs), $tvlist);
             if (!is_array($tv)) {
                 $tv = array();

assets/templates/help/version_notices/1.2.php

@@ -136,6 +136,10 @@
     &param=`value`
 ]]</pre>
 	</li>
+    <li><strong>Wayfinder Debug-Mode</strong>
+        <p>More infos at <a href="https://github.com/modxcms/evolution/issues/719" target="_blank">#719</a></p>
+        <pre>[[Wayfinder?debug]]</pre>
+    </li>
 </ul>
 
 <h1>New Manager Roles</h1>

install/actions/action_summary.php

@@ -300,7 +300,7 @@
 <input type="checkbox" value="1" id="chkagree" name="chkagree" style="line-height:18px" <?php echo isset($_POST['chkagree']) ? 'checked="checked" ':""; ?><?php echo $agreeToggle;?>/><label for="chkagree" style="display:inline;float:none;line-height:18px;"> <?php echo $_lang['iagree_box']?> </label>
 </p>
     <p class="buttonlinks">
-        <a href="javascript:document.getElementById('install_form').action='index.php?action=options&language=<?php $install_language?>';document.getElementById('install_form').submit();" class="prev" title="<?php echo $_lang['btnback_value']?>"><span><?php echo $_lang['btnback_value']?></span></a>
+        <a href="javascript:document.getElementById('install_form').action='index.php?action=options&language=<?php echo $install_language?>';document.getElementById('install_form').submit();" class="prev" title="<?php echo $_lang['btnback_value']?>"><span><?php echo $_lang['btnback_value']?></span></a>
         <a id="nextbutton" href="javascript:document.getElementById('install_form').submit();" title="<?php echo $nextButton ?>" style="visibility:<?php echo $nextVisibility;?>"><span><?php echo $nextButton ?></span></a>
     </p>
 </form>

install/actions/tpl_options.html

@@ -74,7 +74,7 @@ <h4>[%checkbox_select_options%]</h4>
                 jQuery(this).prop('disabled', false);
     }
         });
-    }
+    };
 
     // handle state of demo content checkbox on page load
     handleSampleDataCheckbox();

install/assets/plugins/ElementsInTree.tpl

@@ -19,7 +19,7 @@
  * @author      Nicola1971 https://github.com/Nicola1971
  * @author      Deesen https://github.com/Deesen
  * @author      yama https://github.com/yama
- * @lastupdate  27/11/2016
+ * @lastupdate  29/11/2016
  */
 
 require MODX_BASE_PATH.'assets/plugins/elementsintree/plugin.elementsintree.php';

install/assets/plugins/tinymce4.tpl

@@ -10,7 +10,6 @@
  * @internal    @properties &styleFormats=Custom Style Formats;textarea;Title,cssClass|Title2,cssClass &customParams=Custom Parameters <b>(Be careful or leave empty!)</b>;textarea; &entityEncoding=Entity Encoding;list;named,numeric,raw;named &entities=Entities;text; &pathOptions=Path Options;list;Site config,Absolute path,Root relative,URL,No convert;Site config &resizing=Advanced Resizing;list;true,false;false &disabledButtons=Disabled Buttons;text; &webTheme=Web Theme;test;webuser &webPlugins=Web Plugins;text; &webButtons1=Web Buttons 1;text;bold italic underline strikethrough removeformat alignleft aligncenter alignright &webButtons2=Web Buttons 2;text;link unlink image undo redo &webButtons3=Web Buttons 3;text; &webButtons4=Web Buttons 4;text; &webAlign=Web Toolbar Alignment;list;ltr,rtl;ltr &width=Width;text;100% &height=Height;text;400px &introtextRte=<b>Introtext RTE</b><br/>add richtext-features to "introtext";list;enabled,disabled;disabled &inlineMode=<b>Inline-Mode</b>;list;enabled,disabled;disabled &inlineTheme=<b>Inline-Mode</b><br/>Theme;text;inline
  * @internal    @events OnLoadWebDocument,OnParseDocument,OnWebPagePrerender,OnLoadWebPageCache,OnRichTextEditorRegister,OnRichTextEditorInit,OnInterfaceSettingsRender
  * @internal    @modx_category Manager and Admin
- * @internal    @legacy_names TinyMCE4
  * @internal    @installset base
  * @logo        /assets/plugins/tinymce4/tinymce/logo.png
  * @reportissues https://github.com/extras-evolution/tinymce4-for-modx-evo

install/instprocessor.php

@@ -99,8 +99,8 @@
         $errors += 1;
 ?>
         <pre>
-        database charset = <?php $database_charset ?>
-        database collation = <?php $database_collation ?>
+        database charset = <?php echo $database_charset ?>
+        database collation = <?php echo $database_collation ?>
         </pre>
         <p><?php echo $_lang['setup_database_creation_failed_note2']?></p>
 <?php

install/setup.info.php

@@ -171,7 +171,7 @@
             );
         }
 		if (intval($params['shareparams']) || !empty($params['dependencies'])) {
-			$dependencies = explode(',', $dependencies);
+			$dependencies = explode(',', $params['dependencies']);
 			foreach ($dependencies as $dependency) {
 				$dependency = explode(':', $dependency);
 				switch (trim($dependency[0])) {