mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 14:46:56 +02:00
Code Issues Releases Wiki Activity

Admin-UI enhancements (i hope!)

Browse Source
This commit is contained in:
Cameron
2017-01-14 16:10:47 -08:00
parent 0a0c0dda59
commit abcbf0656a
4 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -491,14 +491,14 @@ class admin_shortcodes
$allconfigs = multiarray_sort($allconfigs,'title'); //XXX FIXME - not sorting correctly. $allconfigs = multiarray_sort($allconfigs,'title'); //XXX FIXME - not sorting correctly.
$text = "<ul id='e-latest' class='unstyled list-unstyled'>"; $text = "<ul id='e-latest' class='list-group'>";
foreach($allconfigs as $k=>$v) foreach($allconfigs as $k=>$v)
{ {
foreach($v as $val) foreach($v as $val)
{ {
$class = admin_shortcodes::getBadge($val['total']); $class = admin_shortcodes::getBadge($val['total']);
$link = "<a href='".$val['url']."'>".str_replace(":"," ",$val['title'])." <span class='".$class."'>".$val['total']."</span></a>"; $link = "<a href='".$val['url']."'>".str_replace(":"," ",$val['title'])." <span class='".$class."'>".$val['total']."</span></a>";
$text .= "<li class='clearfix'>".$val['icon']." ".$link."</li>\n"; $text .= "<li class='list-group-item clearfix'>".$val['icon']." ".$link."</li>\n";
} }
} }
$text .= "</ul>"; $text .= "</ul>";
@@ -1199,7 +1199,7 @@ class admin_shortcodes
$allconfigs = multiarray_sort($allconfigs,'title'); //XXX FIXME - not sorting correctly. $allconfigs = multiarray_sort($allconfigs,'title'); //XXX FIXME - not sorting correctly.
$text = "<ul id='e-status' class='unstyled list-unstyled'>"; $text = "<ul id='e-status' class='list-group'>";
foreach($allconfigs as $k=>$v) foreach($allconfigs as $k=>$v)
{ {
foreach($v as $val) foreach($v as $val)
@@ -1207,7 +1207,7 @@ class admin_shortcodes
$type = empty($val['invert']) ? 'latest' : 'invert'; $type = empty($val['invert']) ? 'latest' : 'invert';
$class = admin_shortcodes::getBadge($val['total'], $type); $class = admin_shortcodes::getBadge($val['total'], $type);
$link = "<a href='".$val['url']."'>".str_replace(":"," ",$val['title'])." <span class='".$class."'>".$val['total']."</span></a>"; $link = "<a href='".$val['url']."'>".str_replace(":"," ",$val['title'])." <span class='".$class."'>".$val['total']."</span></a>";
$text .= "<li>".$val['icon']." ".$link."</li>\n"; $text .= "<li class='list-group-item'>".$val['icon']." ".$link."</li>\n";
} }
} }
$text .= "</ul>"; $text .= "</ul>";

18
e107_handlers/sitelinks_class.php
View File

@@ -679,8 +679,8 @@ class e_navigation
$this->admin_cat['title'][1] = LAN_SETTINGS; $this->admin_cat['title'][1] = LAN_SETTINGS;
$this->admin_cat['id'][1] = 'setMenu'; $this->admin_cat['id'][1] = 'setMenu';
$this->admin_cat['img'][1] = $tp->toGlyph('e-settings-16'); $this->admin_cat['img'][1] = 'fa-cogs.glyph';
$this->admin_cat['lrg_img'][1] = $tp->toGlyph('e-settings-32'); $this->admin_cat['lrg_img'][1] = 'e-settings-32.glyph';
$this->admin_cat['sort'][1] = true; $this->admin_cat['sort'][1] = true;
/* /*
@@ -697,26 +697,26 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
$this->admin_cat['title'][2] = ADLAN_CL_2; $this->admin_cat['title'][2] = ADLAN_CL_2;
$this->admin_cat['id'][2] = 'userMenu'; $this->admin_cat['id'][2] = 'userMenu';
$this->admin_cat['img'][2] = $tp->toGlyph('e-cat_users-16'); $this->admin_cat['img'][2] = 'fa-users.glyph'; // $tp->toGlyph('e-cat_users-16');
$this->admin_cat['lrg_img'][2] = $tp->toGlyph('e-cat_users-32'); $this->admin_cat['lrg_img'][2] = $tp->toGlyph('e-cat_users-32');
$this->admin_cat['sort'][2] = true; $this->admin_cat['sort'][2] = true;
$this->admin_cat['title'][3] = ADLAN_CL_3; $this->admin_cat['title'][3] = ADLAN_CL_3;
$this->admin_cat['id'][3] = 'contMenu'; $this->admin_cat['id'][3] = 'contMenu';
$this->admin_cat['img'][3] = $tp->toGlyph('e-cat_content-16'); $this->admin_cat['img'][3] = 'file-text-o.glyph'; // $tp->toGlyph('e-cat_content-16');
$this->admin_cat['lrg_img'][3] = $tp->toGlyph('e-cat_content-32'); $this->admin_cat['lrg_img'][3] = $tp->toGlyph('e-cat_content-32');
$this->admin_cat['sort'][3] = true; $this->admin_cat['sort'][3] = true;
$this->admin_cat['title'][4] = ADLAN_CL_6; $this->admin_cat['title'][4] = ADLAN_CL_6;
$this->admin_cat['id'][4] = 'toolMenu'; $this->admin_cat['id'][4] = 'toolMenu';
$this->admin_cat['img'][4] = $tp->toGlyph('e-cat_tools-16'); $this->admin_cat['img'][4] = 'wrench.glyph'; // $tp->toGlyph('e-cat_tools-16');
$this->admin_cat['lrg_img'][4] = $tp->toGlyph('e-cat_tools-32'); $this->admin_cat['lrg_img'][4] = $tp->toGlyph('e-cat_tools-32');
$this->admin_cat['sort'][4] = true; $this->admin_cat['sort'][4] = true;
// Manage // Manage
$this->admin_cat['title'][5] = LAN_MANAGE; $this->admin_cat['title'][5] = LAN_MANAGE;
$this->admin_cat['id'][5] = 'managMenu'; $this->admin_cat['id'][5] = 'managMenu';
$this->admin_cat['img'][5] = $tp->toGlyph('e-manage-16'); $this->admin_cat['img'][5] = 'fa-desktop.glyph' ; // $tp->toGlyph('e-manage-16');
$this->admin_cat['lrg_img'][5] = $tp->toGlyph('e-manage-32'); $this->admin_cat['lrg_img'][5] = $tp->toGlyph('e-manage-32');
$this->admin_cat['sort'][5] = TRUE; $this->admin_cat['sort'][5] = TRUE;
@@ -724,7 +724,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
{ {
$this->admin_cat['title'][6] = ADLAN_CL_7; $this->admin_cat['title'][6] = ADLAN_CL_7;
$this->admin_cat['id'][6] = 'plugMenu'; $this->admin_cat['id'][6] = 'plugMenu';
$this->admin_cat['img'][6] = $tp->toGlyph('e-cat_plugins-16'); $this->admin_cat['img'][6] = 'fa-puzzle-piece.glyph'; // $tp->toGlyph('e-cat_plugins-16');
$this->admin_cat['lrg_img'][6] = $tp->toGlyph('e-cat_plugins-32'); $this->admin_cat['lrg_img'][6] = $tp->toGlyph('e-cat_plugins-32');
$this->admin_cat['sort'][6] = false; $this->admin_cat['sort'][6] = false;
} }
@@ -733,7 +733,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
// Misc. // Misc.
$this->admin_cat['title'][6] = ADLAN_CL_8; $this->admin_cat['title'][6] = ADLAN_CL_8;
$this->admin_cat['id'][6] = 'miscMenu'; $this->admin_cat['id'][6] = 'miscMenu';
$this->admin_cat['img'][6] = ''; // E_16_CAT_MISC; $this->admin_cat['img'][6] = 'fa-puzzle-piece.glyph'; ; // E_16_CAT_MISC;
$this->admin_cat['lrg_img'][6] = ''; // E_32_CAT_MISC; $this->admin_cat['lrg_img'][6] = ''; // E_32_CAT_MISC;
$this->admin_cat['sort'][6] = TRUE; $this->admin_cat['sort'][6] = TRUE;
} }
@@ -741,7 +741,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
//About menu - No 20 - leave space for user-categories. //About menu - No 20 - leave space for user-categories.
$this->admin_cat['title'][20] = LAN_ABOUT; $this->admin_cat['title'][20] = LAN_ABOUT;
$this->admin_cat['id'][20] = 'aboutMenu'; $this->admin_cat['id'][20] = 'aboutMenu';
$this->admin_cat['img'][20] = ''; // E_16_CAT_ABOUT;//E_16_NAV_DOCS $this->admin_cat['img'][20] = 'fa-info-circle.glyph'; // E_16_CAT_ABOUT;//E_16_NAV_DOCS
$this->admin_cat['lrg_img'][20] = ''; // E_32_CAT_ABOUT; $this->admin_cat['lrg_img'][20] = ''; // E_32_CAT_ABOUT;
$this->admin_cat['sort'][20] = false; $this->admin_cat['sort'][20] = false;

11
e107_themes/bootstrap3/admin_template.php
View File

@@ -26,8 +26,8 @@ $E_ADMIN_NAVIGATION['start_other'] = '<ul class="nav navbar-nav navbar-right">';
$E_ADMIN_NAVIGATION['button'] = ' $E_ADMIN_NAVIGATION['button'] = '
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" > <a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_TEXT}">
{LINK_TEXT} {LINK_IMAGE} {LINK_TEXT}
<b class="caret"></b> <b class="caret"></b>
</a> </a>
{SUB_MENU} {SUB_MENU}
@@ -284,11 +284,12 @@ else
</div> </div>
{ADMIN_SITEINFO=creditsonly} {ADMIN_SITEINFO=creditsonly}
{SETSTYLE=admin_menu}
{SETSTYLE=lists}
{ADMIN_LATEST=infopanel} {ADMIN_LATEST=infopanel}
{ADMIN_STATUS=infopanel} {ADMIN_STATUS=infopanel}
{SETSTYLE=admin_menu}
{ADMIN_LOG=request} {ADMIN_LOG=request}
{ADMIN_MSG=request} {ADMIN_MSG=request}
{ADMIN_PLUGINS} {ADMIN_PLUGINS}

11
e107_themes/bootstrap3/admin_theme.php
View File

@@ -187,6 +187,17 @@ class bootstrap3_admintheme
</div>'; </div>';
break; break;
case 'lists':
echo '<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">' . $caption . '</h3>
</div>
' . $text . '
</div>';
break;
case 'no_caption': case 'no_caption':
echo '<!-- Start Style: ' . $style . ' Mode: ' . $mode . ' --> echo '<!-- Start Style: ' . $style . ' Mode: ' . $mode . ' -->
<div class="block"> <div class="block">