diff --git a/e107_admin/header.php b/e107_admin/header.php index f36ec51a3..4c1abd030 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -465,6 +465,10 @@ if(deftrue('e_MENUMANAGER_ACTIVE')) { $body_onload .= " id=\"layout-".e107::getForm()->name2id(THEME_LAYOUT)."\" "; } +else +{ + $body_onload .= " id=\"admin-".str_replace(".php","",e_PAGE)."\" "; +} // // J: Send end of and start of diff --git a/e107_admin/menus.php b/e107_admin/menus.php index d385e5bde..32aee2589 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -45,14 +45,14 @@ if(e_MENUMANAGER_ACTIVE === false ) e107::library('load', 'bootstrap.switch'); e107::js('footer', '{e_WEB}js/bootstrap.switch.init.js', 'jquery', 5); - if(!deftrue("e_DEBUG")) +// if(!deftrue("e_DEBUG")) { e107::getJs()->inlineCSS(' body { overflow:hidden } '); } - else - { +// else +/* { e107::js('footer-inline'," $('#menu_iframe').attr('scrolling','no'); $('#menu_iframe').load(function() { @@ -60,7 +60,7 @@ if(e_MENUMANAGER_ACTIVE === false ) $(this).css('height',height); }); "); - } + }*/ e107::getJs()->inlineCSS(" .menu-manager-items { padding-right:15px} @@ -90,20 +90,20 @@ if(e_MENUMANAGER_ACTIVE === false ) .menu-selector ul li:nth-child(odd){ background-color:rgba(0,0,0,0.2) } - .menu-selector { height:330px; display:block; padding-bottom:50px; overflow-y:scroll; margin-bottom:10px } + .menu-selector { /*height:330px; */ display:block; padding-bottom:50px; /*overflow-y:scroll;*/ margin-bottom:10px } .menu-selector input:checked + span { color: white; } @media all and (min-height: 1000px) { - .menu-selector { height:500px } + /*.menu-selector { height:200px }*/ } @media all and (max-height: 800px) { - .menu-selector { height:250px } + /*.menu-selector { height:250px }*/ iframe#menu_iframe { height: 87vh } - .menu-selector ul li { font-size: 0.8em } + /*.menu-selector ul li { font-size: 0.8em }*/ } ul.dropdown-menu.e-mm-selector { padding: 10px; margin-top: -2px; margin-right:-2px; } diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 65563ea9f..917488b6b 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -157,6 +157,7 @@ class admin_shortcodes if(function_exists('e_help') && ($tmp = e_help())) // new in v2.x for non-admin-ui admin pages. { + $ns->setUniqueId('sc-admin-help'); $help_text = $ns->tablerender($tmp['caption'],$tmp['text'],'e_help',true); } diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css index c2c948cda..a07af048b 100644 --- a/e107_themes/bootstrap3/admin_style.css +++ b/e107_themes/bootstrap3/admin_style.css @@ -1488,6 +1488,81 @@ footer { */ + + + +body#admin-menus > .container-fluid > .row, +body#admin-menus .admin-left-panel, + +.row-flex, +.row-flex > div[class*='col-'] { + display: -webkit-box; + display: -moz-box; + display: -ms-flexbox; + display: -webkit-flex; + display: flex; + flex:1 1 auto; + +} + +body#admin-menus > .container-fluid > .row { + height: 92vh; +} + +body#admin-menus .admin-left-panel { +flex-flow: column nowrap; +} + +.row-flex > div[class*='col-'], .container-flex > div[class*='col-'] { + margin:-.2px; /* hack adjust for wrapping */ +} + +.container-flex > div[class*='col-'] div, +.row-flex > div[class*='col-'] div { + width:100%; +} + +body#admin-menus #sc-admin-help, +body#admin-menus #sc-admin-help .panel-body, +.flex-col { + display: flex; + display: -webkit-flex; + flex: 1 100%; + flex-flow: column nowrap; +} + +.flex-grow { + display: flex; + -webkit-flex: 2; + flex: 2; +} + +body#admin-menus #sc-admin-help { + overflow-y:hidden; + } + +body#admin-menus #sc-admin-help .panel-body { + overflow-y:scroll; + } + + + + + + + + + + + + + + + + + + + @media (min-width: 1101px ){ .navbar-fixed-top { height: 51px; } } diff --git a/e107_themes/bootstrap3/admin_theme.php b/e107_themes/bootstrap3/admin_theme.php index efbe9f77e..b6ee6e898 100644 --- a/e107_themes/bootstrap3/admin_theme.php +++ b/e107_themes/bootstrap3/admin_theme.php @@ -192,7 +192,12 @@ class bootstrap3_admintheme case 'core-infopanel': case 'site_info': - echo '
+ echo '

' . $caption . '