mirror of https://github.com/itflow-org/itflow
Minor UI cleanups add angle rights to menus that open new nav menus margin cleanups etc
This commit is contained in:
parent
ff5f08a052
commit
bf34a2403a
|
|
@ -5,15 +5,14 @@
|
|||
<div class="sidebar">
|
||||
|
||||
<!-- Sidebar Menu -->
|
||||
<nav class="mt-3">
|
||||
<nav class="mt-2">
|
||||
|
||||
<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" data-accordion="false">
|
||||
|
||||
<li class="nav-item mb-2">
|
||||
<a href="dashboard_financial.php" class="nav-link">
|
||||
<i class="nav-icon fas fa-arrow-left"></i>
|
||||
<p>Back</p> |
|
||||
<p><strong>Settings</strong></p>
|
||||
<i class="nav-icon fas fa-angle-left"></i>
|
||||
<p><strong>Admin</strong></p>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
|
@ -30,6 +29,16 @@
|
|||
<p>Companies</p>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-api.php") { echo "active"; } ?>"
|
||||
href="settings-api.php">
|
||||
<i class="nav-icon fas fa-key"></i>
|
||||
<p>API Keys</p>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li class="nav-header mt-2">SETTINGS</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<a href="settings-general.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-general.php") { echo "active"; } ?>">
|
||||
|
|
@ -136,14 +145,6 @@
|
|||
</a>
|
||||
</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-api.php") { echo "active"; } ?>"
|
||||
href="settings-api.php">
|
||||
<i class="nav-icon fas fa-key"></i>
|
||||
<p>API</p>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-modules.php") { echo "active"; } ?>"
|
||||
href="settings-modules.php">
|
||||
|
|
|
|||
|
|
@ -9,8 +9,7 @@
|
|||
<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
|
||||
<li class="nav-item">
|
||||
<a href="clients.php" class="nav-link">
|
||||
<i class="nav-icon fas fa-arrow-left"></i>
|
||||
<p>Back</p> |
|
||||
<i class="nav-icon fas fa-angle-left"></i>
|
||||
<p><strong><?php echo $client_name; ?></strong></p>
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
|||
10
post.php
10
post.php
|
|
@ -39,10 +39,10 @@ if(isset($_GET['switch_company'])){
|
|||
|
||||
}else{
|
||||
$_SESSION['alert_type'] = "error";
|
||||
$_SESSION['alert_message'] = "What are you trying to DO! WHy did you do this? WHYYY??";
|
||||
$_SESSION['alert_message'] = "You do not have permission to switch to this company";
|
||||
|
||||
//Logging
|
||||
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Company', log_action = 'Switch', log_description = '$session_name tried to switch to company $company_name but does not have permission', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id");
|
||||
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Company', log_action = 'Switch', log_description = '$session_name attempted to switch to company $company_name but did not have permission', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id");
|
||||
}
|
||||
|
||||
header("Location: dashboard_financial.php");
|
||||
|
|
@ -123,7 +123,7 @@ if(isset($_POST['add_user'])){
|
|||
//Logging
|
||||
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'User', log_action = 'Create', log_description = '$session_name created user $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id");
|
||||
|
||||
$_SESSION['alert_message'] = "User <strong>$user_name</strong> created!";
|
||||
$_SESSION['alert_message'] = "User <strong>$user_name</strong> created";
|
||||
|
||||
header("Location: users.php");
|
||||
|
||||
|
|
@ -2501,7 +2501,7 @@ if(isset($_GET['dismiss_notification'])){
|
|||
mysqli_query($mysqli,"UPDATE notifications SET notification_dismissed_at = CURDATE(), notification_dismissed_by = $session_user_id WHERE notification_id = $notification_id AND company_id = $session_company_id");
|
||||
|
||||
//Logging
|
||||
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Notifications', log_action = 'Modify', log_description = '$Notification Dismissed', company_id = $session_company_id, log_user_id = $session_user_id");
|
||||
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Notification', log_action = 'Dismiss', log_description = '$session_name dismissed notification', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id");
|
||||
|
||||
$_SESSION['alert_message'] = "Notification Dismissed";
|
||||
|
||||
|
|
@ -2524,7 +2524,7 @@ if(isset($_GET['dismiss_all_notifications'])){
|
|||
}
|
||||
|
||||
//Logging
|
||||
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Notifications', log_action = 'Modifed', log_description = 'Dismissed all notifications', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id");
|
||||
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Notification', log_action = 'Dismiss', log_description = '$session_name dismissed $num_notifications notifications', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id");
|
||||
|
||||
$_SESSION['alert_message'] = "$num_notifications Notifications Dismissed";
|
||||
|
||||
|
|
|
|||
|
|
@ -5,19 +5,18 @@
|
|||
<div class="sidebar">
|
||||
|
||||
<!-- Sidebar Menu -->
|
||||
<nav class="mt-3">
|
||||
<nav class="mt-2">
|
||||
|
||||
<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" data-accordion="false">
|
||||
|
||||
<li class="nav-item mb-2">
|
||||
<a href="dashboard_financial.php" class="nav-link">
|
||||
<i class="nav-icon fas fa-arrow-left"></i>
|
||||
<p>Back</p> |
|
||||
<p><strong>Reports Nav</strong></p>
|
||||
<i class="nav-icon fas fa-angle-left"></i>
|
||||
<p><strong>Reports</strong></p>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li class="nav-header mt-3">REPORTS</li>
|
||||
<li class="nav-header mt-2">FINANCIAL</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<a href="report_income_summary.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "report_income_summary.php") { echo "active"; } ?>">
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
|
||||
<?php }else{ ?>
|
||||
|
||||
<h3 class="brand-text text-light"><?php echo $session_company_name; ?></h3>
|
||||
<h3 class="brand-text text-light my-2"><?php echo $session_company_name; ?></h3>
|
||||
|
||||
<?php } ?>
|
||||
|
||||
|
|
@ -180,6 +180,7 @@
|
|||
<a href="report_income_summary.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "report_income_summary.php") { echo "active"; } ?>">
|
||||
<i class="fas fa-chart-bar nav-icon"></i>
|
||||
<p>Reports</p>
|
||||
<i class="fas fa-angle-right nav-icon float-right"></i>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
|
@ -190,7 +191,8 @@
|
|||
<li class="nav-item mt-2">
|
||||
<a href="users.php" class="nav-link">
|
||||
<i class="nav-icon fas fa-cog"></i>
|
||||
<p>Settings</p>
|
||||
<p>Admin</p>
|
||||
<i class="fas fa-angle-right nav-icon float-right"></i>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue