More admin page changes

merge-requests/27/head
Mike Koch 8 years ago
parent e57f2e34c2
commit a43e7ec479

@ -132,8 +132,8 @@ if (hesk_check_kb_only(false)) {
<section class="sidebar"> <section class="sidebar">
<!-- Sidebar user panel --> <!-- Sidebar user panel -->
<div class="user-panel"> <div class="user-panel">
<div class="pull-left info"> <div class="pull-left info" style="left: 0">
<p><?php echo hesk_SESSION('name'); ?></p> <p>Welcome, <?php echo hesk_SESSION('name'); ?></p>
</div> </div>
<div class="pull-left image"> <div class="pull-left image">
<!--<img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">--> <!--<img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">-->
@ -142,175 +142,83 @@ if (hesk_check_kb_only(false)) {
</div> </div>
<!-- sidebar menu: : style can be found in sidebar.less --> <!-- sidebar menu: : style can be found in sidebar.less -->
<ul class="sidebar-menu"> <ul class="sidebar-menu">
<li class="header">MAIN NAVIGATION</li> <li class="header"><?php echo $hesklang['main_navigation_uppercase']; ?></li>
<li class="active treeview"> <?php
<a href="#"> $active = '';
<i class="fa fa-dashboard"></i> <span>Dashboard</span> if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_HOME') {
<span class="pull-right-container"> $active = 'active';
<i class="fa fa-angle-left pull-right"></i> }
</span> ?>
</a> <li class="<?php echo $active; ?> treeview">
<ul class="treeview-menu"> <a href="admin_new_main.php">
<li><a href="index.html"><i class="fa fa-circle-o"></i> Dashboard v1</a></li> <i class="fa fa-home" <?php echo $iconDisplay; ?>></i> <span><?php echo $hesklang['main_page']; ?></span>
<li class="active"><a href="index2.html"><i class="fa fa-circle-o"></i> Dashboard v2</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-files-o"></i>
<span>Layout Options</span>
<span class="pull-right-container">
<span class="label label-primary pull-right">4</span>
</span>
</a>
<ul class="treeview-menu">
<li><a href="pages/layout/top-nav.html"><i class="fa fa-circle-o"></i> Top Navigation</a></li>
<li><a href="pages/layout/boxed.html"><i class="fa fa-circle-o"></i> Boxed</a></li>
<li><a href="pages/layout/fixed.html"><i class="fa fa-circle-o"></i> Fixed</a></li>
<li><a href="pages/layout/collapsed-sidebar.html"><i class="fa fa-circle-o"></i> Collapsed Sidebar</a></li>
</ul>
</li>
<li>
<a href="pages/widgets.html">
<i class="fa fa-th"></i> <span>Widgets</span>
<span class="pull-right-container">
<small class="label pull-right bg-green">new</small>
</span>
</a>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-pie-chart"></i>
<span>Charts</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li><a href="pages/charts/chartjs.html"><i class="fa fa-circle-o"></i> ChartJS</a></li>
<li><a href="pages/charts/morris.html"><i class="fa fa-circle-o"></i> Morris</a></li>
<li><a href="pages/charts/flot.html"><i class="fa fa-circle-o"></i> Flot</a></li>
<li><a href="pages/charts/inline.html"><i class="fa fa-circle-o"></i> Inline charts</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-laptop"></i>
<span>UI Elements</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a> </a>
<ul class="treeview-menu">
<li><a href="pages/UI/general.html"><i class="fa fa-circle-o"></i> General</a></li>
<li><a href="pages/UI/icons.html"><i class="fa fa-circle-o"></i> Icons</a></li>
<li><a href="pages/UI/buttons.html"><i class="fa fa-circle-o"></i> Buttons</a></li>
<li><a href="pages/UI/sliders.html"><i class="fa fa-circle-o"></i> Sliders</a></li>
<li><a href="pages/UI/timeline.html"><i class="fa fa-circle-o"></i> Timeline</a></li>
<li><a href="pages/UI/modals.html"><i class="fa fa-circle-o"></i> Modals</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-edit"></i> <span>Forms</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li><a href="pages/forms/general.html"><i class="fa fa-circle-o"></i> General Elements</a></li>
<li><a href="pages/forms/advanced.html"><i class="fa fa-circle-o"></i> Advanced Elements</a></li>
<li><a href="pages/forms/editors.html"><i class="fa fa-circle-o"></i> Editors</a></li>
</ul>
</li> </li>
<li class="treeview"> <?php if (hesk_checkPermission('can_man_users', 0) && hesk_checkPermission('can_man_permission_tpl', 0)) {
$active = '';
if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_USERS') {
$active = ' active';
}
?>
<li class="<?php echo $active; ?> treeview">
<a href="#"> <a href="#">
<i class="fa fa-table"></i> <span>Tables</span> <i class="fa fa-users" <?php echo $iconDisplay; ?>></i>
<span class="pull-right-container"> <span><?php echo $hesklang['menu_users']; ?></span>
<i class="fa fa-angle-left pull-right"></i> <span class="pull-right-container">
</span> <i class="fa fa-angle-left pull-right"></i>
</span>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="pages/tables/simple.html"><i class="fa fa-circle-o"></i> Simple tables</a></li> <li>
<li><a href="pages/tables/data.html"><i class="fa fa-circle-o"></i> Data tables</a></li> <a href="manage_users.php"><i class="fa fa-circle-o"></i> <?php echo $hesklang['manage_users']; ?></a>
</li>
<li>
<a href="manage_permission_templates.php"><i class="fa fa-circle-o"></i> <?php echo $hesklang['permission_tpl_man']; ?></a>
</li>
</ul> </ul>
</li> </li>
<li> <?php
<a href="pages/calendar.html"> } elseif (hesk_checkPermission('can_man_users', 0)) {
<i class="fa fa-calendar"></i> <span>Calendar</span> $active = '';
<span class="pull-right-container"> if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_USERS') {
<small class="label pull-right bg-red">3</small> $active = ' class="active"';
<small class="label pull-right bg-blue">17</small> }
</span> ?>
<li class="<?php echo $active; ?> treeview">
<a href="manage_users.php">
<i class="fa fa-users" <?php echo $iconDisplay; ?>></i>
<span><?php echo $hesklang['menu_users']; ?></span>
</a> </a>
</li> </li>
<li> <?php
<a href="pages/mailbox/mailbox.html"> } elseif (hesk_checkPermission('can_man_permission_tpl', 0)) {
<i class="fa fa-envelope"></i> <span>Mailbox</span> $active = '';
<span class="pull-right-container"> if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_USERS') {
<small class="label pull-right bg-yellow">12</small> $active = ' class="active"';
<small class="label pull-right bg-green">16</small> }
<small class="label pull-right bg-red">5</small> ?>
</span> <li class="<?php echo $active; ?> treeview">
<a href="manage_permission_templates.php">
<i class="fa fa-users" <?php echo $iconDisplay; ?>></i>
<span><?php echo $hesklang['permission_templates']; ?></span>
</a> </a>
</li> </li>
<?php } ?>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-folder"></i> <span>Examples</span> <i class="fa fa-files-o"></i>
<span class="pull-right-container"> <span>Layout Options</span>
<i class="fa fa-angle-left pull-right"></i> <span class="pull-right-container">
</span> <span class="label label-primary pull-right">4</span>
</a> </span>
<ul class="treeview-menu">
<li><a href="pages/examples/invoice.html"><i class="fa fa-circle-o"></i> Invoice</a></li>
<li><a href="pages/examples/profile.html"><i class="fa fa-circle-o"></i> Profile</a></li>
<li><a href="pages/examples/login.html"><i class="fa fa-circle-o"></i> Login</a></li>
<li><a href="pages/examples/register.html"><i class="fa fa-circle-o"></i> Register</a></li>
<li><a href="pages/examples/lockscreen.html"><i class="fa fa-circle-o"></i> Lockscreen</a></li>
<li><a href="pages/examples/404.html"><i class="fa fa-circle-o"></i> 404 Error</a></li>
<li><a href="pages/examples/500.html"><i class="fa fa-circle-o"></i> 500 Error</a></li>
<li><a href="pages/examples/blank.html"><i class="fa fa-circle-o"></i> Blank Page</a></li>
<li><a href="pages/examples/pace.html"><i class="fa fa-circle-o"></i> Pace Page</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-share"></i> <span>Multilevel</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="#"><i class="fa fa-circle-o"></i> Level One</a></li> <li><a href="pages/layout/top-nav.html"><i class="fa fa-circle-o"></i> Top Navigation</a></li>
<li> <li><a href="pages/layout/boxed.html"><i class="fa fa-circle-o"></i> Boxed</a></li>
<a href="#"><i class="fa fa-circle-o"></i> Level One <li><a href="pages/layout/fixed.html"><i class="fa fa-circle-o"></i> Fixed</a></li>
<span class="pull-right-container"> <li><a href="pages/layout/collapsed-sidebar.html"><i class="fa fa-circle-o"></i> Collapsed Sidebar</a></li>
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li><a href="#"><i class="fa fa-circle-o"></i> Level Two</a></li>
<li>
<a href="#"><i class="fa fa-circle-o"></i> Level Two
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li><a href="#"><i class="fa fa-circle-o"></i> Level Three</a></li>
<li><a href="#"><i class="fa fa-circle-o"></i> Level Three</a></li>
</ul>
</li>
</ul>
</li>
<li><a href="#"><i class="fa fa-circle-o"></i> Level One</a></li>
</ul> </ul>
</li> </li>
<li><a href="documentation/index.html"><i class="fa fa-book"></i> <span>Documentation</span></a></li>
<li class="header">LABELS</li>
<li><a href="#"><i class="fa fa-circle-o text-red"></i> <span>Important</span></a></li>
<li><a href="#"><i class="fa fa-circle-o text-yellow"></i> <span>Warning</span></a></li>
<li><a href="#"><i class="fa fa-circle-o text-aqua"></i> <span>Information</span></a></li>
</ul> </ul>
</section> </section>
<!-- /.sidebar --> <!-- /.sidebar -->

@ -65,14 +65,14 @@ if (defined('AUTOFOCUS'))
<?php <?php
} }
// Users online
if (defined('SHOW_ONLINE'))
{
hesk_printOnline();
}
?> ?>
<footer class="main-footer"> <footer class="main-footer">
<?php <?php
// Users online
if (defined('SHOW_ONLINE'))
{
hesk_printOnline();
}
/******************************************************************************* /*******************************************************************************
The code below handles HESK licensing. Removing or modifying this code without The code below handles HESK licensing. Removing or modifying this code without
purchasing a HESK license is strictly prohibited. purchasing a HESK license is strictly prohibited.
@ -100,7 +100,7 @@ T48L2Rpdj4nOw0KaW5jbHVkZShIRVNLX1BBVEggLiAnZm9vdGVyLnR4dCcpOw0KZWNobyAnPC9ib2R5P
jwvaHRtbD4nOw==',"\112"); jwvaHRtbD4nOw==',"\112");
?> ?>
</footer> </footer>
<?php <?php
echo '</div>'; echo '</div>';
exit(); exit();

@ -26,6 +26,7 @@ $hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new me
$hesklang['message_lower_case'] = 'message'; $hesklang['message_lower_case'] = 'message';
$hesklang['messages_lower_case'] = 'messages'; $hesklang['messages_lower_case'] = 'messages';
$hesklang['deleted_user_title_case'] = 'Deleted User'; $hesklang['deleted_user_title_case'] = 'Deleted User';
$hesklang['main_navigation_uppercase'] = 'MAIN NAVIGATION';
// ADDED OR MODIFIED IN Mods for HESK 2.6.0 // ADDED OR MODIFIED IN Mods for HESK 2.6.0
$hesklang['search_logs'] = 'Search Logs'; $hesklang['search_logs'] = 'Search Logs';

Loading…
Cancel
Save