Netsyms
/
Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Calendar uses new sidebar

Browse Source
merge-requests/31/head
Mike Koch 8 years ago
parent 2d2d8379cf
commit 45b3f88783
4 changed files with 92 additions and 68 deletions
Show Stats Download Patch File Download Diff File

116
admin/calendar.php
Unescape Escape View File

@ -68,7 +68,7 @@ while ($row = hesk_dbFetchAssoc($rs)) {
continue; continue;
} }
$row['css_style'] = $row['color'] == null ? 'color: black; border: solid 1px #000;' : 'background: ' . $row['color']; $row['css_style'] = $row['color'] == null ? 'color: black; border: solid 1px #000;' : 'border: solid 1px ' . $row['color'] . '; background: ' . $row['color'];
$categories[] = $row; $categories[] = $row;
} }
@ -78,67 +78,69 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
/* Print main manage users page */ /* Print main manage users page */
require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
?> ?>
<div class="content-wrapper"> <aside class="main-sidebar">
<section class="content"> <section class="sidebar" style="height: auto">
<div class="row"> <ul class="sidebar-menu">
<div class="col-md-4"> <li class="header text-uppercase"><?php echo $hesklang['calendar_categories']; ?></li>
<div class="box"> <?php foreach ($categories as $category): ?>
<div class="box-header"> <!-- TODO Clean this up -->
<h1 class="box-title"> <li>
<?php echo $hesklang['calendar_categories']; ?> <div class="ticket-info">
</h1> <!--<div class="checkbox">
<div class="box-tools pull-right"> <input type="checkbox" data-select-target="category-toggle" name="category-toggle" value="<?php /*echo $category['id']; */?>" checked>
<button type="button" class="btn btn-box-tool" data-widget="collapse"> </div>-->
<i class="fa fa-minus"></i> <div class="hide-on-overflow no-wrap event-category background-volatile"
</button> data-select-toggle="category-toggle" data-name="category-toggle" data-category-value="<?php echo $category['id']; ?>"
data-checked="1"
style="<?php echo $category['css_style']; ?>">
<?php echo $category['name']; ?>
</div>
</div> </div>
</li>
<?php endforeach; ?>
<li>
<div class="ticket-info">
<button id="select-all" class="btn btn-default btn-sm" data-select-all="category-toggle">
<?php echo $hesklang['select_all_title_case']; ?>
</button>
<button id="deselect-all" class="btn btn-default btn-sm" data-deselect-all="category-toggle">
<?php echo $hesklang['deselect_all_title_case']; ?>
</button>
</div> </div>
<div class="box-body"> <script>
<div class="btn-group btn-group-sm"> $('#select-all').click(function() {
<button id="select-all" class="btn btn-default" data-select-all="category-toggle"><?php echo $hesklang['select_all_title_case']; ?></button> $('div[data-name="category-toggle"]').attr('data-checked', 1);
<button id="deselect-all" class="btn btn-default" data-deselect-all="category-toggle"><?php echo $hesklang['deselect_all_title_case']; ?></button> updateCategoryVisibility();
</div> });
<ul class="list-unstyled"> $('#deselect-all').click(function() {
<?php foreach ($categories as $category): ?> $('div[data-name="category-toggle"]').attr('data-checked', 0);
<li class="move-down-20 move-right-20"> updateCategoryVisibility();
<div class="checkbox"> });
<input type="checkbox" data-select-target="category-toggle" name="category-toggle" value="<?php echo $category['id']; ?>" checked> </script>
</div> </li>
<div class="hide-on-overflow no-wrap event-category background-volatile" style="<?php echo $category['css_style']; ?>"> <li class="header text-uppercase"><?php echo $hesklang['legend']; ?></li>
<?php echo $category['name']; ?> <li>
</div> <div class="ticket-info">
</li> <i class="fa fa-calendar"></i> <?php echo $hesklang['event']; ?>
<?php endforeach; ?>
</ul>
</div> </div>
</div> </li>
<div class="box"> <li>
<div class="box-header"> <div class="ticket-info">
<h1 class="box-title"> <i class="fa fa-ticket"></i> <?php echo $hesklang['ticket']; ?>
<?php echo $hesklang['legend']; ?>
</h1>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse">
<i class="fa fa-minus"></i>
</button>
</div>
</div> </div>
<div class="box-body"> </li>
<div class="row"> <li>
<div class="col-sm-6"> <div class="ticket-info">
<i class="fa fa-calendar"></i> <?php echo $hesklang['event']; ?> <i class="fa fa-exclamation-triangle"></i> <?php echo $hesklang['overdue_ticket_legend']; ?>
</div>
<div class="col-sm-6">
<i class="fa fa-ticket"></i> <?php echo $hesklang['ticket']; ?>
</div>
<div class="col-sm-6">
<i class="fa fa-exclamation-triangle"></i> <?php echo $hesklang['overdue_ticket_legend']; ?>
</div>
</div>
</div> </div>
</div> </li>
</div> </ul>
<div class="col-md-8"> </section>
</aside>
<div class="content-wrapper">
<section class="content">
<div class="row">
<div class="col-md-12">
<div class="box"> <div class="box">
<div class="box-header"> <div class="box-header">
<h1 class="box-title"> <h1 class="box-title">

10
css/mods-for-hesk-new.css
Unescape Escape View File

@ -236,4 +236,14 @@ div.ticket-info {
color: #b8c7ce; color: #b8c7ce;
padding: 12px 5px 12px 15px; padding: 12px 5px 12px 15px;
display: block; display: block;
}
.event-category:hover {
border: solid 1px #fff !important;
cursor: pointer;
}
.event-category[data-checked="0"] {
background: #777 !important;
color: #aaa !important;
} }

18
js/calendar/mods-for-hesk-calendar-admin-readonly.js
Unescape Escape View File

@ -100,7 +100,7 @@ $(document).ready(function() {
} }
}); });
$('input[name="category-toggle"]').change(updateCategoryVisibility); $('div[data-name="category-toggle"]').click(updateCategoryVisibility);
}); });
function buildEvent(id, dbObject) { function buildEvent(id, dbObject) {
@ -186,13 +186,19 @@ function calculateTextColor(color) {
} }
function updateCategoryVisibility() { function updateCategoryVisibility() {
$('input[name="category-toggle"]').each(function() { if ($(this).attr('data-checked') == '1') {
$this = $(this); $(this).attr('data-checked', 0);
} else {
$(this).attr('data-checked', 1);
}
$('div[data-name="category-toggle"]').each(function() {
var $this = $(this);
if ($this.is(':checked')) { if ($this.attr('data-checked') == '1') {
$('.category-' + $this.val()).show(); $('.category-' + $this.attr('data-category-value')).show();
} else { } else {
$('.category-' + $this.val()).hide(); $('.category-' + $this.attr('data-category-value')).hide();
} }
}); });
} }

16
js/calendar/mods-for-hesk-calendar.js
Unescape Escape View File

@ -253,7 +253,7 @@ $(document).ready(function() {
}); });
}); });
$('input[name="category-toggle"]').change(updateCategoryVisibility); $('div[data-name="category-toggle"]').click(updateCategoryVisibility);
}); });
function addToCalendar(id, event, successMessage) { function addToCalendar(id, event, successMessage) {
@ -431,13 +431,19 @@ function displayEditModal(date) {
} }
function updateCategoryVisibility() { function updateCategoryVisibility() {
$('input[name="category-toggle"]').each(function() { if ($(this).attr('data-checked') == '1') {
$(this).attr('data-checked', 0);
} else {
$(this).attr('data-checked', 1);
}
$('div[data-name="category-toggle"]').each(function() {
var $this = $(this); var $this = $(this);
if ($this.is(':checked')) { if ($this.attr('data-checked') == '1') {
$('.category-' + $this.val()).show(); $('.category-' + $this.attr('data-category-value')).show();
} else { } else {
$('.category-' + $this.val()).hide(); $('.category-' + $this.attr('data-category-value')).hide();
} }
}); });
} }

Write Preview
Loading…
Cancel
Save