mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-29 10:38:08 +01:00
Code Issues Releases Wiki Activity

FontAwesome5 admin icon fix. Collapsing admin-left-panel cookie added.

Browse Source
This commit is contained in:
Cameron 2021-02-01 07:24:47 -08:00
parent 0b1a84068f
commit fe8167709a
4 changed files with 88 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@ -61,6 +61,28 @@ class admin_shortcodes extends e_shortcode
}
}
public function sc_admin_rightpanel_toggle($parm=null)
{
if(varset($_COOKIE['e107_adminLeftPanel']) === 'closed')
{
return 'col-md-9 col-lg-12';
}
return 'col-md-12 col-lg-10';
}
public function sc_admin_leftpanel_toggle($parm=null)
{
if(varset($_COOKIE['e107_adminLeftPanel']) === 'closed')
{
return 'admin-left-panel-collapsed';
}
return 'col-md-3 col-lg-2';
}
// {ADMIN_COREUPDATE}
public function sc_admin_coreupdate($parm='')

4
e107_core/templates/admin_template.php
View File

@ -227,7 +227,7 @@ else
{
$ADMIN_TEMPLATE['header'] .= '
<div class="col-md-3 col-lg-2 admin-left-panel hidden-print">
<div class="admin-left-panel hidden-print {ADMIN_LEFTPANEL_TOGGLE}">
{SETSTYLE=warning}
{ADMIN_ADDON_UPDATES}
{SETSTYLE=site_info}
@ -259,7 +259,7 @@ else
</div>
{SETSTYLE=default}
</div>
<div class="col-md-9 col-lg-10 admin-right-panel">
<div class="admin-right-panel {ADMIN_RIGHTPANEL_TOGGLE}">
<div class="sidebar-toggle">
<a href="#" title="Toggle Sidebar" data-toggle-sidebar="true">&nbsp;</a>
</div>

55
e107_themes/bootstrap3/admin_style.css
View File

@ -192,7 +192,7 @@ ul.checkboxes { display: inline-block; list-style: none; margin: 0; padding: 0;}
#admin-ui-list-batch img { padding-top:5px }
#admin-ui-list-filter { margin-bottom: 15px }
#admin-ui-list-search #searchquery { padding-right:5px }
#admin-ui-list-search:before { content: "\f002"; margin-left:12px; position:absolute; top: 50%; transform: translateY(-50%); font-family: "FontAwesome" }
#admin-ui-list-search:before { content: "\f002"; margin-left:12px; position:absolute; top: 50%; transform: translateY(-50%); font-family: "Font Awesome 5 Free" ; font-weight: 900 }
.form-control-feedback-left { left:0; top:0 }
.has-feedback-left input { padding-left:30px; }
@ -568,8 +568,8 @@ img.S32:hover {}
.adminlist tr.last td { border-bottom: 0 solid;}
.adminlist th a.sorted-asc,
.adminlist th a.sorted-desc { text-decoration: none }
.adminlist th a.sorted-asc:after { padding-left:5px; font-family: FontAwesome; content: '\f0d8' }
.adminlist th a.sorted-desc:after { padding-left:5px; font-family: FontAwesome; content: '\f0d7' }
.adminlist th a.sorted-asc:after { padding-left:5px; font-family:'Font Awesome 5 Free'; font-weight: 900; content: '\f0d8' }
.adminlist th a.sorted-desc:after { padding-left:5px; font-family:'Font Awesome 5 Free'; font-weight: 900; content: '\f0d7' }
.adminlist .col-selection-cont { position: relative; float:right; }
table.adminlist { margin-bottom: 0 }
@ -1127,7 +1127,7 @@ ul.col-selection ul.nav > li { padding:0 }
ul.scroll-menu { max-height:350px; overflow:auto; }
ul.col-selection li.col-selection-list { padding: 5px; }
ul.col-selection input { opacity:0; }
ul.col-selection label.active:before { font-family:FontAwesome; margin-left:-20px ; margin-right:6px ; content: '\f00c'; color: #51a351; position:relative; }
ul.col-selection label.active:before { font-family:'Font Awesome 5 Free'; font-weight: 900; margin-left:-20px ; margin-right:6px ; content: '\f00c'; color: #51a351; position:relative; }
.nav ul li ul.dropdown-menu { border-left:1px solid rgb(51, 51, 51); background-color: rgb(39, 39, 39); }
@ -1634,7 +1634,7 @@ form#simplesef h4 { margin: 4px }
.admin-icon-debug > li.dropdown > a.dropdown-toggle { border-left: 0 !important }
.admin-icon-debug .dropdown-menu > .active > a { color: orange }
.admin-icon-debug .dropdown-menu > .active > a:after { font-family: FontAwesome; content: '\f0d9'; position: absolute;
.admin-icon-debug .dropdown-menu > .active > a:after { font-family: 'Font Awesome 5 Free'; font-weight: 900; content: '\f0d9'; position: absolute;
padding-left: 5px; }
@ -1847,7 +1847,9 @@ td img.thumbnail { margin-bottom:0 }
.adminlist { border:1px solid rgba(0,0,0,0.1); }
.nav-admin .fa { font-size:18px }
.nav-admin .fa, .nav-admin .fas, .nav-admin .far, .nav-admin .fab {
font-size: 18px
}
.nav-admin.navbar-left li a { padding-left:20px; padding-right:20px}
.navbar-nav > li.active a.dropdown-toggle i {
opacity:1;
@ -1877,21 +1879,50 @@ td img.thumbnail { margin-bottom:0 }
.editableform-loading:before { font-size:24px; font-family: "FontAwesome"; content: '\f110'; }
.editableform-loading:before { font-size:24px; font-family: "Font Awesome 5 Free"; font-weight: 900; content: '\f110' }
.editable-input input[type=text] { padding-top: 1px; padding-bottom: 1px; }
tr.highlight-odd, .table-striped > tbody > tr.highlight-odd { background-color: rgba(0,0,0,0.15); }
tr.highlight-even, .table-striped > tbody > tr.highlight-even { background-color: rgba(0,0,0,0.15); }
.admin-left-panel, .admin-right-panel {
transition: width 0.5s;
}
.admin-left-panel-collapsed {
width: 60px;
}
.admin-left-panel-collapsed { width:60px; }
.admin-left-panel-collapsed .admin-menu,
.admin-left-panel-collapsed .admin-menu .panel-heading { border-top-right-radius: 10px;
border-bottom-right-radius: 10px; }
.admin-left-panel-collapsed .admin-menu .panel-heading {
border-top-right-radius: 10px;
border-bottom-right-radius: 10px;
}
.adminlist img.icon {
max-width: 64px
}
body#admin-image-main-dialog {
margin-top: 0
}
div.admin-left-panel-collapsed .sidebar-toggle-panel { /*display:none; */
transition: opacity 1s ease-in-out;
opacity: 0;
height: 0;
width: 0;
overflow: hidden;
}
.adminlist img.icon { max-width: 64px }
body#admin-image-main-dialog { margin-top: 0 }
@media (min-width: 1101px ){
.navbar-fixed-top { height: 51px; }

30
e107_web/js/core/admin.jquery.js
View File

@ -414,14 +414,15 @@ $(document).ready(function()
var $leftPanel = $(".sidebar-toggle-panel");
var $rightPanel = $(".admin-right-panel");
if ($rightPanel.hasClass('col-md-12'))
{
console.log('has class');
$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);
// $leftPanel.toggle(500);
}
else
@ -429,17 +430,28 @@ $(document).ready(function()
$(".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);
/*
$leftPanel.toggle(500, function() {
$(".admin-left-panel").toggleClass("col-md-3 col-lg-2");
$rightPanel.toggleClass("col-md-9 col-md-12");
$rightPanel.toggleClass("col-lg-10 col-lg-12");
});*/
// $leftPanel.toggle(500);
}
var tmp = $(".admin-left-panel").hasClass("admin-left-panel-collapsed");
if(tmp === true)
{
var toggleStatus = 'closed';
}
else
{
var toggleStatus = 'open';
}
document.cookie = 'e107_adminLeftPanel = ' + toggleStatus +'; expires = 1; samesite=strict';
});