diff --git a/e107_admin/header.php b/e107_admin/header.php index 614cdf688..4876a9160 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -489,11 +489,20 @@ e107Event.trigger('loaded', null, document); e107::getJs()->renderJs('header_inline', 5); -echo " -\n"; +echo ""; -echo getModal(); -echo getAlert(); +if(deftrue('e_MENUMANAGER_ACTIVE') && defset('THEME_LAYOUT') && e_theme::loadLayout(THEME_LAYOUT)) // v2.2.2+ html layout is active which contains tag. +{ + echo "\n\n\n"; +} +else +{ + echo " + \n"; + + echo getModal(); + echo getAlert(); +} function getModal() { diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php index 18d38396f..fd10b6a50 100644 --- a/e107_handlers/menumanager_class.php +++ b/e107_handlers/menumanager_class.php @@ -1405,7 +1405,7 @@ class e_menuManager { if(strpos($LAYOUT,' tag from the admin header when menu-manager is active. { - $LAYOUT = preg_replace('/]*>/','', $LAYOUT); + // $LAYOUT = preg_replace('/]*>/','', $LAYOUT); } // Split up using the same function as the shortcode handler @@ -1512,9 +1512,40 @@ class e_menuManager { // } elseif(strstr($str, '{---MODAL---}')) { - echo "\n \n"; - //echo '
'; - //echo getAlert(); + //echo "\n \n"; + echo '
'; + + //TODO Store in a central area - currently used in header.php, header_default.php and here. + echo ' + + '; + + //echo getModal(); + } + elseif(strstr($str, '{---CAPTION---}')) + { + echo LAN_CAPTION; + } + elseif(strstr($str, '{LAYOUT_ID}')) + { + echo 'layout-'.e107::getForm()->name2id($this->curLayout); } elseif(strstr($str, "ALERT")) { diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index f9e3339f0..9c3073e4f 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -765,6 +765,7 @@ class e_theme // echo "

".$themeArray['name']."

"; // print_a($lays); $themeArray['legacy'] = true; + $themeArray['html'] = false; return $themeArray; } @@ -808,6 +809,7 @@ class e_theme $vars['@attributes']['default'] = (varset($vars['@attributes']['default']) && strtolower($vars['@attributes']['default']) == 'true') ? 1 : 0; $vars['preview'] = varset($vars['screenshots']['image']); $vars['thumbnail'] = isset($vars['preview'][0]) && file_exists(e_THEME.$path.'/'.$vars['preview'][0]) ? $vars['preview'][0] : ''; + $vars['html'] = file_exists(e_THEME.$path.'/theme.html') && is_dir(e_THEME.$path.'/layouts') ? true : false; if(!empty($vars['themePrefs']))