Add description

master
Mike Koch 7 years ago
parent 29f1eb3503
commit 25fde2aa65
No known key found for this signature in database
GPG Key ID: 9BA5D7F8391455ED

@ -88,154 +88,6 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
?>
<div class="content-wrapper">
<section class="content">
<!-- OLD ADD CATEGORY -->
<!--<div class="box collapsed-box">
<div class="box-header with-border">
<h1 class="box-title">
<?php /*echo $hesklang['add_cat']; */?>
</h1>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse">
<i class="fa fa-plus"></i>
</button>
</div>
</div>
<div class="box-body">
<form action="manage_categories.php" method="post" role="form" class="form-horizontal" data-toggle="validator">
<div class="form-group">
<label for="name" class="col-sm-4 control-label"><?php /*echo $hesklang['cat_name']; */?></label>
<div class="col-sm-8">
<input class="form-control"
placeholder="<?php /*echo htmlspecialchars($hesklang['cat_name']); */?>" type="text"
name="name" size="40" maxlength="40"
<?php
/* if (isset($_SESSION['catname'])) {
echo ' value="' . hesk_input($_SESSION['catname']) . '" ';
}
*/?>
data-error="<?php /*echo htmlspecialchars($hesklang['enter_cat_name']); */?>"
required>
<div class="help-block"><?php /*echo $hesklang['max_chars']; */?></div>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="form-group">
<label for="priority" class="col-sm-4 control-label"><?php /*echo $hesklang['def_pri']; */?> <a href="#"
onclick="alert('<?php /*echo hesk_makeJsString($hesklang['cat_pri']); */?>')"><i
class="fa fa-question-circle settingsquestionmark"></i> </a> </label>
<div class="col-sm-8">
<select name="priority" class="form-control">
<?php
/* // Default priority: low
if (!isset($_SESSION['cat_priority'])) {
$_SESSION['cat_priority'] = 3;
}
// List possible priorities
foreach ($priorities as $value => $info) {
echo '<option value="' . $value . '"' . ($_SESSION['cat_priority'] == $value ? ' selected="selected"' : '') . '>' . $info['text'] . '</option>';
}
*/?>
</select>
</div>
</div>
<div class="form-group">
<label for="color" class="col-sm-4 control-label">
<?php /*echo $hesklang['category_background_color']; */?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
title="<?php /*echo htmlspecialchars($hesklang['category_background_color']); */?>"
data-content="<?php /*echo htmlspecialchars($hesklang['category_background_color_help']); */?>"></i>
</label>
<div class="col-sm-8">
<input class="form-control colorpicker-trigger"
placeholder="<?php /*echo htmlspecialchars($hesklang['category_background_color']); */?>" type="text"
name="background-color" maxlength="7" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="form-group">
<label for="color" class="col-sm-4 control-label">
<?php /*echo $hesklang['category_foreground_color']; */?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
title="<?php /*echo htmlspecialchars($hesklang['category_foreground_color']); */?>"
data-content="<?php /*echo htmlspecialchars($hesklang['category_foreground_color_help']); */?>"></i>
</label>
<div class="col-sm-8">
<input class="form-control colorpicker-trigger"
placeholder="<?php /*echo htmlspecialchars($hesklang['category_foreground_color']); */?>" type="text"
name="foreground-color" maxlength="7">
</div>
</div>
<div class="form-group">
<label for="display-border" class="col-sm-4 control-label">
<?php /*echo $hesklang['category_display_border']; */?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
title="<?php /*echo htmlspecialchars($hesklang['category_display_border']); */?>"
data-content="<?php /*echo htmlspecialchars($hesklang['category_display_border_help']); */?>"></i>
</label>
<div class="col-sm-8 form-inline">
<div class="radio">
<label>
<input type="radio" name="display-border" value="1">
<?php /*echo $hesklang['yes']; */?>
</label>
</div>&nbsp;&nbsp;&nbsp;
<div class="radio">
<label>
<input type="radio" name="display-border" value="0" checked>
<?php /*echo $hesklang['no']; */?>
</label>
</div>
</div>
</div>
<div class="form-group">
<label for="usage" class="col-sm-4 control-label"><?php /*echo $hesklang['usage']; */?></label>
<div class="col-sm-8">
<select name="usage" class="form-control">
<option value="0"><?php /*echo $hesklang['tickets_and_events']; */?></option>
<option value="1"><?php /*echo $hesklang['tickets_only']; */?></option>
<option value="2"><?php /*echo $hesklang['events_only']; */?></option>
</select>
</div>
</div>
<div class="form-group">
<label for="options" class="col-sm-4 control-label"><?php /*echo $hesklang['opt']; */?></label>
<div class="col-sm-8">
<?php
/* if ($hesk_settings['autoassign']) {
*/?>
<div class="checkbox">
<label><input type="checkbox" name="autoassign"
value="Y" <?php /*if (!isset($_SESSION['cat_autoassign']) || $_SESSION['cat_autoassign'] == 1) {
echo 'checked="checked"';
} */?> /> <?php /*echo $hesklang['cat_aa']; */?></label><br/>
</div>
<?php
/* }
*/?>
<div class="checkbox">
<label><input type="checkbox" name="type"
value="Y" <?php /*if (isset($_SESSION['cat_type']) && $_SESSION['cat_type'] == 1) {
echo 'checked="checked"';
} */?> /> <?php /*echo $hesklang['cat_type']; */?></label>
</div>
</div>
</div>
<div class="form-group">
<div class="col-sm-9 col-sm-offset-4">
<input type="hidden" name="a" value="new"/>
<input type="hidden" name="token" value="<?php /*hesk_token_echo(); */?>"/>
<input type="submit" value="<?php /*echo $hesklang['create_cat']; */?>" class="btn btn-default"/>
</div>
</div>
</form>
</div>
</div>-->
<!-- END OLD ADD CATEGORY -->
<div class="box">
<div class="box-header with-border">
<h1 class="box-title">
@ -520,6 +372,7 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
<td>
<span class="label category-label" data-property="category-name">
</span>
<i class="fa fa-info-circle" data-toggle="popover" title="<?php echo $hesklang['description']; ?>"></i>
</td>
<td>
<i style="display: none" class="fa fa-fw fa-lock icon-link gray"></i>

@ -51,6 +51,12 @@ function loadTable() {
$nameField.css('border', 'solid 1px ' + this.foregroundColor);
}
$nameField.html(this.name);
if (this.description === '' || this.description === null) {
$template.find('.fa-info-circle').hide();
} else {
$template.find('.fa-info-circle').attr('data-content', this.description);
}
var $priority = $template.find('span[data-property="priority"]');
if (this.priority === 0) {
// Critical
@ -136,6 +142,10 @@ function loadTable() {
},
complete: function() {
refreshBackgroundVolatileItems();
$('[data-toggle="popover"]').popover({
trigger: 'hover',
container: 'body'
});
$('#overlay').hide();
}
});

Loading…
Cancel
Save