more work on category colors
This commit is contained in:
Mike Koch
parent
2fa0858fab
commit
0743f63982
@ -119,10 +119,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
|
||||
title="Category for the event"></i>
|
||||
</label>
|
||||
<div class="col-sm-9">
|
||||
<select name="category" class="form-control">
|
||||
<select name="category" class="form-control"
|
||||
pattern="[0-9]+"
|
||||
data-error="<?php echo htmlspecialchars($hesklang['sel_app_cat']); ?>" required>
|
||||
<?php
|
||||
if ($hesk_settings['select_cat']) {
|
||||
echo '<option value="-1">'.$hesklang['select'].'</option>';
|
||||
echo '<option value="">'.$hesklang['select'].'</option>';
|
||||
}
|
||||
foreach ($categories as $category): ?>
|
||||
<option value="<?php echo $category['id']; ?>">
|
||||
@ -130,6 +132,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
|
||||
</option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
<div class="help-block with-errors"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -253,10 +256,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
|
||||
title="Category for the event"></i>
|
||||
</label>
|
||||
<div class="col-sm-9">
|
||||
<select name="category" class="form-control">
|
||||
<select name="category" class="form-control"
|
||||
pattern="[0-9]+"
|
||||
data-error="<?php echo htmlspecialchars($hesklang['sel_app_cat']); ?>" required>
|
||||
<?php
|
||||
if ($hesk_settings['select_cat']) {
|
||||
echo '<option value="-1">'.$hesklang['select'].'</option>';
|
||||
echo '<option value="">'.$hesklang['select'].'</option>';
|
||||
}
|
||||
foreach ($categories as $category): ?>
|
||||
<option value="<?php echo $category['id']; ?>">
|
||||
@ -264,6 +269,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
|
||||
</option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
<div class="help-block with-errors"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -165,6 +165,19 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="color" class="col-sm-4 control-label">
|
||||
<?php echo $hesklang['category_color']; ?>:
|
||||
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
|
||||
title="<?php echo htmlspecialchars($hesklang['category_color']); ?>"
|
||||
data-content="<?php echo htmlspecialchars($hesklang['category_color_help']); ?>"></i>
|
||||
</label>
|
||||
<div class="col-sm-8">
|
||||
<input class="form-control"
|
||||
placeholder="<?php echo htmlspecialchars($hesklang['category_color']); ?>" type="text"
|
||||
name="color" maxlength="7">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="options" class="col-sm-4 control-label"><?php echo $hesklang['opt']; ?>:</label>
|
||||
|
||||
@ -299,6 +312,7 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
|
||||
<th><?php echo $hesklang['priority']; ?></th>
|
||||
<th><?php echo $hesklang['not']; ?></th>
|
||||
<th><?php echo $hesklang['graph']; ?></th>
|
||||
<th><?php echo $hesklang['category_color']; ?></th>
|
||||
<th><?php echo $hesklang['manager'] ?></th>
|
||||
<th><?php echo $hesklang['opt']; ?></th>
|
||||
</tr>
|
||||
@ -337,7 +351,12 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
|
||||
}
|
||||
|
||||
$tmp = $i ? 'White' : 'Blue';
|
||||
$style = 'class="option' . $tmp . 'OFF" onmouseover="this.className=\'option' . $tmp . 'ON\'" onmouseout="this.className=\'option' . $tmp . 'OFF\'"';
|
||||
$style = 'font-weight:normal;font-size:1em';
|
||||
if ($mycat['color'] == null) {
|
||||
$style .= ';color: black';
|
||||
} else {
|
||||
$style .= ';background: ' . $mycat['color'];
|
||||
}
|
||||
$i = $i ? 0 : 1;
|
||||
|
||||
/* Number of tickets and graph width */
|
||||
@ -375,7 +394,7 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
|
||||
echo '
|
||||
<tr>
|
||||
<td>' . $mycat['id'] . '</td>
|
||||
<td>' . $mycat['name'] . '</td>
|
||||
<td><span class="label" style="'.$style.'">' . $mycat['name'] . '</span></td>
|
||||
<td width="1" style="white-space: nowrap;">' . $priorities[$mycat['priority']]['formatted'] . '</td>
|
||||
<td><a href="show_tickets.php?category=' . $mycat['id'] . '&s_all=1&s_my=1&s_ot=1&s_un=1" alt="' . $hesklang['list_tickets_cat'] . '" title="' . $hesklang['list_tickets_cat'] . '">' . $all . '</a></td>
|
||||
<td>
|
||||
@ -535,6 +554,10 @@ function new_cat()
|
||||
/* Category name */
|
||||
$catname = hesk_input(hesk_POST('name'), $hesklang['enter_cat_name'], 'manage_categories.php');
|
||||
|
||||
$color = hesk_POST('color', null);
|
||||
$color = str_replace('#', '', $color);
|
||||
$color = $color != null ? "'#" . hesk_dbEscape($color) . "'" : 'NULL';
|
||||
|
||||
/* Do we already have a category with this name? */
|
||||
$res = hesk_dbQuery("SELECT `id` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `name` LIKE '" . hesk_dbEscape(hesk_dbLike($catname)) . "' LIMIT 1");
|
||||
if (hesk_dbNumRows($res) != 0) {
|
||||
@ -547,7 +570,7 @@ function new_cat()
|
||||
$row = hesk_dbFetchRow($res);
|
||||
$my_order = $row[0] + 10;
|
||||
|
||||
hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` (`name`,`cat_order`,`autoassign`,`type`, `priority`) VALUES ('" . hesk_dbEscape($catname) . "','" . intval($my_order) . "','" . intval($_SESSION['cat_autoassign']) . "','" . intval($_SESSION['cat_type']) . "','{$_SESSION['cat_priority']}')");
|
||||
hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` (`name`,`cat_order`,`autoassign`,`type`, `priority`, `color`) VALUES ('" . hesk_dbEscape($catname) . "','" . intval($my_order) . "','" . intval($_SESSION['cat_autoassign']) . "','" . intval($_SESSION['cat_type']) . "','{$_SESSION['cat_priority']}', {$color})");
|
||||
|
||||
hesk_cleanSessionVars('catname');
|
||||
hesk_cleanSessionVars('cat_autoassign');
|
||||
|
||||
@ -730,5 +730,6 @@ function execute260Scripts()
|
||||
`comments` MEDIUMTEXT,
|
||||
`category` INT) ENGINE = MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci");
|
||||
executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` ADD COLUMN `due_date` DATETIME");
|
||||
executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ADD COLUMN `color` VARCHAR(7)");
|
||||
executeQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` SET `Value` = '2.6.0' WHERE `Key` = 'modsForHeskVersion'");
|
||||
}
|
||||
@ -40,6 +40,8 @@ $hesklang['attachment_cancel'] = 'Cancel';
|
||||
$hesklang['attachment_confirm_cancel'] = 'Are you sure you want to cancel this upload?';
|
||||
$hesklang['attachment_remove'] = 'Remove attachment';
|
||||
$hesklang['due_date'] = 'Due Date';
|
||||
$hesklang['category_color'] = 'Color';
|
||||
$hesklang['category_color_help'] = 'The hex code for the color to be used on the view ticket screen and calendar. Leave blank for no color';
|
||||
|
||||
// ADDED OR MODIFIED IN Mods for HESK 2.5.2
|
||||
$hesklang['manage_statuses'] = 'Manage Statuses';
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user