diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index f077e0103..b377a5d49 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -61,7 +61,7 @@ class admin_shortcodes extends e_shortcode } } - +/* public function sc_admin_rightpanel_toggle($parm=null) { if(varset($_COOKIE['e107_adminLeftPanel']) === 'closed') @@ -71,7 +71,7 @@ class admin_shortcodes extends e_shortcode return 'col-md-9 col-lg-10'; - } + }*/ public function sc_admin_leftpanel_toggle($parm=null) { @@ -80,7 +80,7 @@ class admin_shortcodes extends e_shortcode return 'admin-left-panel-collapsed'; } - return 'col-md-3 col-lg-2'; + // return 'col-md-3 col-lg-2'; } diff --git a/e107_core/templates/admin_template.php b/e107_core/templates/admin_template.php index b4f9a7949..ad6ae1ef4 100644 --- a/e107_core/templates/admin_template.php +++ b/e107_core/templates/admin_template.php @@ -212,7 +212,7 @@ $ADMIN_TEMPLATE['header'] = '
-
+
'; $adminstyle = e107::getConfig()->get('adminstyle', 'infopanel'); @@ -220,14 +220,14 @@ if(defset('e_PAGE') == 'admin.php' && $adminstyle == 'flexpanel' && varset($_GET { $ADMIN_TEMPLATE['header'] .= '
-
+
'; } else { $ADMIN_TEMPLATE['header'] .= ' -
+
{SETSTYLE=warning} {ADMIN_ADDON_UPDATES} {SETSTYLE=site_info} @@ -259,9 +259,9 @@ else
{SETSTYLE=default}
-
+
-   +  
'; @@ -288,13 +288,13 @@ $ADMIN_TEMPLATE['menu']['start'] = ' $ADMIN_TEMPLATE['menu']['button'] = '
  • - {LINK_IMAGE} {LINK_TEXT}{LINK_BADGE} + {LINK_IMAGE} {LINK_TEXT}{LINK_BADGE} {SUB_MENU}
    • '; $ADMIN_TEMPLATE['menu']['button_active'] = '
  • - {LINK_IMAGE} {LINK_TEXT}{LINK_BADGE} + {LINK_IMAGE} {LINK_TEXT}{LINK_BADGE} {SUB_MENU}
    • '; @@ -327,4 +327,4 @@ $ADMIN_TEMPLATE['menu']['end'] = ' $ADMIN_TEMPLATE['menu']['divider'] = ''; -$ADMIN_TEMPLATE['menu']['caption'] = '{ICON}{CAPTION}'; +$ADMIN_TEMPLATE['menu']['caption'] = '{ICON}{CAPTION}'; diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css index 7b082c70d..2681c3935 100644 --- a/e107_themes/bootstrap3/admin_style.css +++ b/e107_themes/bootstrap3/admin_style.css @@ -441,7 +441,7 @@ a.brand:hover img { img.image-selector { margin-bottom:0; } .nav-collapse { margin-top:8px; } -.dropdown-menu { box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3); } +.dropdown-menu { box-shadow: 0 5px 10px rgba(0, 0, 0, 0.5); } .dropdown-menu i, .dropdown-menu img { padding: 0 0; margin-right: 10px; } diff --git a/e107_themes/bootstrap3/css/modern-light.css b/e107_themes/bootstrap3/css/modern-light.css index fc8dea1c0..18d70d1e1 100644 --- a/e107_themes/bootstrap3/css/modern-light.css +++ b/e107_themes/bootstrap3/css/modern-light.css @@ -318,7 +318,7 @@ button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:i a{color:#77acd9;text-decoration:none} .admin-right-panel a { color:#337ab7 } .admin-right-panel a.btn { color:#fff } -a:focus,a:hover{color:#fff;text-decoration:none} +a:focus,a:hover{color:#000000;text-decoration:none} a:focus{outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px} .carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto} .img-rounded{border-radius:6px} @@ -809,7 +809,7 @@ tbody.collapse.in{display:table-row-group} .collapsing{height:0;overflow:hidden;-webkit-transition-property:height,visibility;transition-property:height,visibility;-webkit-transition-duration:.35s;transition-duration:.35s;-webkit-transition-timing-function:ease;transition-timing-function:ease} .caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent} .dropdown-toggle:focus{outline:0} -.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;text-align:left;background-color:#212121;border:1px solid #171717;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);background-clip:padding-box} +.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;text-align:left;background-color:#212121;border:0;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);background-clip:padding-box} .btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle,.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0} .btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child,.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0} .btn-group-vertical>.btn:not(:first-child):not(:last-child),.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn,.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0} @@ -818,7 +818,7 @@ tbody.collapse.in{display:table-row-group} .dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#171717} .dropdown-menu>li>a{display:block;clear:both;font-weight:400;color:#c6c6c6} .dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{text-decoration:none;color:#fff;background-color:#337ab7} -.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;outline:0;background-color:transparent} +.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#5bc0de;text-decoration:none;outline:0;background-color:transparent} .dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#c6c6c6} .dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);cursor:not-allowed} .open>.dropdown-menu{display:block} @@ -890,7 +890,7 @@ select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.i .input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px} .nav{margin-bottom:0;padding-left:0;list-style:none} .nav>li>a{padding:10px 15px} -.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#f5f6f7} +.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:transparent} .nav>li.disabled>a{color:#555} .nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#c6c6c6;text-decoration:none;background-color:transparent;cursor:not-allowed} .nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#2f2f2f;border-color:#77acd9} @@ -900,7 +900,7 @@ select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.i .nav-tabs>li{float:left;margin-bottom:-1px} .nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0} .nav-tabs>li>a:hover{border-color:#999} -.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:rgba(0,0,0,0.9);/*background-color:#373737;*/border:1px solid #999;border-bottom-color:#ebedf0;cursor:default} +.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:rgba(0,0,0,0.9);color: black; /*background-color:#373737;*/border:1px solid #999;border-bottom-color:#ebedf0;cursor:default} .nav-tabs.nav-justified{width:100%;border-bottom:0} .nav-tabs.nav-justified>li{float:none} .nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px;margin-right:0;border-radius:4px} @@ -989,7 +989,7 @@ select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.i } @media (min-width:768px){.navbar-form{width:auto;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0;-webkit-box-shadow:none;box-shadow:none} } -.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0} +.navbar-nav>li>.dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0} .navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-radius:4px 4px 0 0} .navbar-btn{margin-top:6px;margin-bottom:6px} .navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px} @@ -1004,8 +1004,8 @@ select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.i .navbar-default .navbar-brand{color:#c6c6c6} .navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#fff;background-color:none} .navbar-default .navbar-nav>li>a,.navbar-default .navbar-text{color:#c6c6c6} -.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#fff;background-color:#0d0d0d} -.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#fff;background-color:#101010} +.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#fff;background:transparent} +.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#5bc0de; background-color:transparent} .navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent} .navbar-default .navbar-toggle{border-color:#0d0d0d} .navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#0d0d0d} @@ -1246,7 +1246,7 @@ a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-gro .embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;left:0;bottom:0;height:100%;width:100%;border:0} .embed-responsive-16by9{padding-bottom:56.25%} .embed-responsive-4by3{padding-bottom:75%} -.well{min-height:20px;padding:19px;margin-bottom:20px;border:1px solid #0f0f0f;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)} +.well{min-height:20px;padding:19px;margin-bottom:20px;border:1px solid rgba(0,0,0,0.3);border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)} .well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)} .well-lg{padding:24px;border-radius:6px} .well-sm{padding:9px;border-radius:3px} @@ -1466,7 +1466,7 @@ td.visible-print,th.visible-print{display:table-cell!important} .table-bordered tbody tr.danger td,.table-bordered tbody tr.danger:hover td,.table-bordered tbody tr.success td,.table-bordered tbody tr.success:hover td,.table-bordered tbody tr.warning td,.table-bordered tbody tr.warning:hover td{border-color:#0a0a0a} .table-responsive>.table{background-color:#373737} label{font-weight:400} -.well,input,select,textarea{color:#eee;background-color:rgba(0,0,0,0.1)} +.well,input,select,textarea{color:rgba(0,0,0,0.75);background-color:rgba(0,0,0,0.1)} input[type=date],input[type=time],input[type=datetime-local],input[type=month],input[type=text],input[type=password],input[type=datetime],input[type=week],input[type=email],input[type=url],input[type=tel],input[type=color],input[type=number],input[type=search],select,textarea{line-height:1.42857;background-image:none;border:1px solid rgba(0,0,0,0.3);border-radius:4px;transition:border-color .15s ease-in-out 0s,box-shadow .15s ease-in-out 0s;padding:8px 12px;font-size:14px} .has-warning .control-label,.has-warning .form-control-feedback,.has-warning .help-block{color:#f89406} .has-warning .form-control,.has-warning .form-control:focus{border-color:#f89406} @@ -1535,8 +1535,10 @@ h1, h2, h3, h4, h5, h6 { color: rgba(0, 0, 0, 0.75) } .admin-container { padding:0 } - +.admin-left-panel a:hover { color: #fff } div.admin-left-panel .panel { background: none; border:0} +.admin-left-panel .close { opacity: .4; } +.admin-left-panel .tooltip { margin-left:35px } .admin-left-panel .panel-heading { padding-top:40px; } .admin-left-panel .panel-heading { background: none; border:0; color: white} .admin-left-panel .panel-default .panel-heading { color:white; background:none; border-bottom: 1px solid #484848; padding-top: 28px; } @@ -1553,6 +1555,41 @@ thead th, thead tr, .table > thead > tr > th { border-bottom: 0; border-left:0; min-height: 1000px; } +div.admin-left-panel-collapsed .admin-left-panel { +position: fixed; +display: block; +width: 55px; +opacity: 1; +z-index: 5; +background: #2f2f2f; +height: 100%; +} + +div.admin-left-panel-collapsed .admin-right-panel { +padding-left: 80px; +width:100%; +} + + +div.admin-left-panel .nav-pills > li > a > span > i { color: rgba(255,255,255,0.5); font-size:1.25em; opacity: 0; width:0; } +div.admin-left-panel-collapsed .nav-pills > li > a > span > i { opacity: 1; padding-left: 2px; } +div.admin-left-panel-collapsed .nav-pills > li.active > a { background:none; } +div.admin-left-panel .nav-pills > li.active > a > span > i { color: #5bc0de !important } +div.admin-left-panel .nav-pills > li > a:hover > span > i { color: white } + +.nav-tabs .nav-link:hover { color: black } +.nav-tabs .nav-item.active, .tab-content { background: rgba(255,255,255,0.5); } +.tab-content .table { background: transparent } +.tab-content { border: 1px solid rgb(153, 153, 153); border-top:0; } + + + + + + + + + @media only screen and (min-width : 768px) { .is-table-row { display: table; diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js index 5b415ebe5..3f87315a6 100644 --- a/e107_web/js/core/admin.jquery.js +++ b/e107_web/js/core/admin.jquery.js @@ -411,45 +411,28 @@ $(document).ready(function() { e.preventDefault(); - var $leftPanel = $(".sidebar-toggle-panel"); - var $rightPanel = $(".admin-right-panel"); - - - if ($(".admin-left-panel").hasClass("admin-left-panel-collapsed")) + if ($(".is-table-row").hasClass("admin-left-panel-collapsed")) { - console.log('admin panel collapsed already'); - $rightPanel.toggleClass("col-md-9 col-md-12"); - $rightPanel.toggleClass("col-lg-10 col-lg-12"); - $(".admin-left-panel").toggleClass("col-md-3 col-lg-2"); - $(".admin-left-panel").toggleClass("admin-left-panel-collapsed"); - // $leftPanel.toggle(500); - + $(".is-table-row").toggleClass("admin-left-panel-collapsed"); } else { - - $(".admin-left-panel").toggleClass("col-md-3 col-lg-2"); - $(".admin-left-panel").toggleClass("admin-left-panel-collapsed"); - - $rightPanel.toggleClass("col-md-9 col-md-12"); - $rightPanel.toggleClass("col-lg-10 col-lg-12"); - // $leftPanel.toggle(500); - + $(".is-table-row").toggleClass("admin-left-panel-collapsed"); } - var tmp = $(".admin-left-panel").hasClass("admin-left-panel-collapsed"); + var tmp = $(".is-table-row").hasClass("admin-left-panel-collapsed"); - if(tmp === true) - { - var toggleStatus = 'closed'; - } - else - { - var toggleStatus = 'open'; - } + if(tmp === true) + { + var toggleStatus = 'closed'; + } + else + { + var toggleStatus = 'open'; + } - document.cookie = 'e107_adminLeftPanel = ' + toggleStatus +'; expires = 1; samesite=strict'; + document.cookie = 'e107_adminLeftPanel = ' + toggleStatus +'; expires = 1; samesite=strict'; });