diff --git a/e107_admin/image.php b/e107_admin/image.php index 1d240199a..855737163 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -826,8 +826,7 @@ class media_admin_ui extends e_admin_ui public $deleteConfirmScreen = true; public $deleteConfirmMessage = IMALAN_129; - protected $grid = array('title'=>'media_name', 'image'=>'media_preview', 'body'=>'', 'class'=>'col-md-2', 'perPage'=>12, 'carousel'=>false); - + protected $grid = array('title'=>'media_name', 'image'=>'media_preview', 'body'=>'', 'class'=>'col-sm-6 col-md-4 col-lg-2', 'perPage'=>12, 'carousel'=>false); protected $preftabs = array(IMALAN_78,IMALAN_89, 'Youtube'); diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php index c3efb3484..ef718edf3 100755 --- a/e107_admin/plugin.php +++ b/e107_admin/plugin.php @@ -96,9 +96,9 @@ class plugman_adminArea extends e_admin_dispatcher 'installed/list' => array('caption'=> EPL_ADLAN_22, 'perm' => 'Z'), 'avail/list' => array('caption'=> EPL_ADLAN_23, 'perm' => 'Z'), - 'online/grid' => array('caption'=> EPL_ADLAN_220, 'perm' => 'Z'), + 'online/grid' => array('caption'=> EPL_ADLAN_220, 'perm' => 'Z', 'icon'=>'fas-search'), 'avail/upload' => array('caption'=>EPL_ADLAN_38, 'perm' => '0'), - 'create/build' => array('caption'=>EPL_ADLAN_114, 'perm' => '0'), + 'create/build' => array('caption'=>EPL_ADLAN_114, 'perm' => '0', 'icon'=>'fas-toolbox'), // 'main/create' => array('caption'=> LAN_CREATE, 'perm' => 'P'), diff --git a/e107_admin/theme.php b/e107_admin/theme.php index 00ad3c57e..350566873 100644 --- a/e107_admin/theme.php +++ b/e107_admin/theme.php @@ -58,12 +58,12 @@ class theme_admin extends e_admin_dispatcher protected $adminMenu = array( - 'main/main' => array('caption'=> TPVLAN_33, 'perm' => '0|1|TMP'), - 'main/admin' => array('caption'=> TPVLAN_34, 'perm' => '0'), - 'main/choose' => array('caption'=> TPVLAN_51, 'perm' => '0'), - 'main/online' => array('caption'=> TPVLAN_62, 'perm' => '0'), + 'main/main' => array('caption'=> TPVLAN_33, 'perm' => '0|1|TMP', 'icon'=>'fas-home'), + 'main/admin' => array('caption'=> TPVLAN_34, 'perm' => '0', 'icon'=>'fas-tachometer-alt'), + 'main/choose' => array('caption'=> TPVLAN_51, 'perm' => '0', 'icon'=>'fas-exchange-alt'), + 'main/online' => array('caption'=> TPVLAN_62, 'perm' => '0', 'icon'=>'fas-search'), 'main/upload' => array('caption'=> TPVLAN_38, 'perm' => '0'), - 'convert/main' => array('caption'=> ADLAN_CL_6, 'perm' => '0') + 'convert/main' => array('caption'=> ADLAN_CL_6, 'perm' => '0', 'icon'=>'fas-toolbox') ); diff --git a/e107_core/templates/admin_icons_template.php b/e107_core/templates/admin_icons_template.php index 294f53faa..8229011e8 100644 --- a/e107_core/templates/admin_icons_template.php +++ b/e107_core/templates/admin_icons_template.php @@ -126,7 +126,7 @@ $ADMIN_ICONS_TEMPLATE['E_16_THEMEMANAGER'] = "
-
-   -
'; } @@ -329,4 +326,4 @@ $ADMIN_TEMPLATE['menu']['heading'] = '
    • '; -$ADMIN_TEMPLATE['menu']['caption'] = '{ICON}{CAPTION}'; +$ADMIN_TEMPLATE['menu']['caption'] = '{ICON}{CAPTION}×'; diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 7dbe817c6..f42af7369 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -7087,7 +7087,7 @@ var_dump($select_options);*/ } - $cls = !empty($options['grid']['class']) ? $options['grid']['class'] : 'col-md-2'; + $cls = !empty($options['grid']['class']) ? $options['grid']['class'] : 'col-sm-6 col-md-4 col-lg-2'; $pid = $options['pid']; $perPage = $options['grid']['perPage']; diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css index 2681c3935..9aeafe7af 100644 --- a/e107_themes/bootstrap3/admin_style.css +++ b/e107_themes/bootstrap3/admin_style.css @@ -77,7 +77,9 @@ a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; } .e-overlay .thumbnail { margin:0; } .admin-ui-grid img.fallback { opacity: 0.3; } -.admin-ui-grid img.thumbnail { max-width: 100%; height:auto; } +.admin-ui-grid img { max-width: 100%; height:auto; margin-left: auto; margin-right: auto; display:flex} +.admin-ui-grid img.icon { padding:15px; max-height: 250px; margin-left: auto; margin-right: auto; display: flex; } +.admin-ui-grid img.icon-svg { width: 100%; } .admin-ui-grid .panel-footer { font-size:1em; /*height:30px; overflow:hidden*/} .admin-ui-grid .panel-footer a { overflow: hidden; white-space: nowrap; width: 88%; display: inline-block; } @@ -1894,11 +1896,6 @@ tr.highlight-even, .table-striped > tbody > tr.highlight-even { background-colo width: 55px; } -.admin-left-panel-collapsed .admin-menu, -.admin-left-panel-collapsed .admin-menu .panel-heading { - border-top-right-radius: 10px; - border-bottom-right-radius: 10px; -} .adminlist img.icon { max-width: 64px diff --git a/e107_themes/bootstrap3/css/bootstrap-dark.min.css b/e107_themes/bootstrap3/css/bootstrap-dark.min.css index bc46f60ba..3fac56080 100644 --- a/e107_themes/bootstrap3/css/bootstrap-dark.min.css +++ b/e107_themes/bootstrap3/css/bootstrap-dark.min.css @@ -1511,4 +1511,14 @@ thead tr{background-color:#363636;background-image:linear-gradient(to bottom,#44 #admin-ui-nav-menu a.link-active{color:#fff} .tab-content{background-color:#373737} input:invalid:focus,select:invalid:focus,textarea:invalid:focus{border-color:red;box-shadow:0 1px 1px 0 rgba(255,0,0,.75) inset} -td.forumheader{background-image:linear-gradient(#303030,#212121 60%,#171717);filter:none} \ No newline at end of file +td.forumheader{background-image:linear-gradient(#303030,#212121 60%,#171717);filter:none} +.admin-left-panel-collapsed .admin-left-panel { width: 70px } +.admin-left-panel-collapsed .admin-right-panel { width: calc(100% - 70px) } +.admin-left-panel-collapsed .nav-pills > li > a { border-radius:0} +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 > a:hover > span > i, +div.admin-left-panel-collapsed .nav-pills > li.active > a > span > i + { color: white } +.admin-left-panel .close { opacity: .4; } +.admin-left-panel .tooltip { margin-left:35px } \ No newline at end of file diff --git a/e107_themes/bootstrap3/css/modern-dark.css b/e107_themes/bootstrap3/css/modern-dark.css index e60100dde..807d54a6a 100644 --- a/e107_themes/bootstrap3/css/modern-dark.css +++ b/e107_themes/bootstrap3/css/modern-dark.css @@ -812,7 +812,7 @@ select[multiple].input-lg,textarea.input-lg{height:auto} .btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px} .btn-block{display:block} .btn-block+.btn-block{margin-top:5px} -.fade{opacity:0;-webkit-transition:opacity .5s linear;-o-transition:opacity .5s linear;transition:opacity .5s linear} +.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear} .fade.in{opacity:1} .collapse{display:none} .collapse.in{display:block} @@ -828,9 +828,9 @@ tbody.collapse.in{display:table-row-group} .dropdown-header,.dropdown-menu>li>a{white-space:nowrap;padding:3px 20px;line-height:1.42857143} .dropdown-menu-right,.dropdown-menu.pull-right{left:auto;right:0} .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{display:block;clear:both;font-weight:400;color:rgba(255,255,255,0.5)} .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} @@ -1017,7 +1017,7 @@ select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.i .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>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#5bc0de;background-color:#101010} .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} @@ -1550,10 +1550,10 @@ div.admin-right-panel { padding-top: 20px; border-top-left-radius: 5px; backgrou div.admin-left-panel .panel { background: none; border:0} .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; } +.admin-left-panel .panel-default .panel-heading { color:white; background:none; padding-top: 28px; } span.sidebar-toggle-switch { float: right; display: block; width: 20px; height: 20px; cursor: pointer; } -span.sidebar-toggle-switch:after { content: '×'; } + thead tr, .navbar { background-image: none !important; border-left:0; border-right:0; background-color: #2f2f2f; } thead th, thead tr, .table > thead > tr > th { border-bottom: 0; border-left:0; border-right:0 } @@ -1562,10 +1562,27 @@ 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: #373737; + 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: white } +div.admin-left-panel-collapsed .nav-header.sidebar-toggle-panel { display: none; } +div.admin-left-panel .nav-pills > li.active > a > span > i { color: #5bc0de } /* @@ -1574,6 +1591,7 @@ div.admin-left-panel .nav-pills > li.active > a > span > i { color: white } } */ +.e-debug { margin-left: 60px; } @media only screen and (min-width : 768px) { .is-table-row { display: table; @@ -1586,4 +1604,6 @@ div.admin-left-panel .nav-pills > li.active > a > span > i { color: white } display: table-cell; vertical-align: top; } + + .admin-left-panel { max-width: 300px; } } \ No newline at end of file diff --git a/e107_themes/bootstrap3/css/modern-light.css b/e107_themes/bootstrap3/css/modern-light.css index 7b3abfa31..53d65450e 100644 --- a/e107_themes/bootstrap3/css/modern-light.css +++ b/e107_themes/bootstrap3/css/modern-light.css @@ -1544,7 +1544,7 @@ .admin-left-panel .panel-default .panel-heading { color:white; background:none; padding-top: 28px; } span.sidebar-toggle-switch { float: right; display: block; width: 20px; height: 20px; cursor: pointer; } - span.sidebar-toggle-switch:after { content: '×'; } + thead tr, .navbar { background-image: none !important; border-left:0; border-right:0; /*background-color: rgba(0,0,0,0.05);*/ } thead th, thead tr, .table > thead > tr > th { border-bottom: 0; border-left:0; border-right:0 } @@ -1607,7 +1607,7 @@ .form-control.bootstrap-switch span.bootstrap-switch-default { background: rgba(0,0,0,0.1) } - +.e-debug { margin-left: 60px; } @media only screen and (min-width : 768px) {