Browse Source

#310 Add tooltips to statuses page and fix create status issue

merge-requests/2/head
Mike Koch 7 years ago
parent
commit
b5576e9b4c
  1. 67
      admin/manage_statuses.php
  2. 5
      language/en/text.php

67
admin/manage_statuses.php

@ -153,7 +153,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
$delete = canStatusBeDeleted($row['ID']);
$cursor = 'cursor: pointer';
$iconStyle = 'color: red';
$dataTarget = 'data-target="#modal-status-delete-'.$row['ID'];
$dataTarget = 'data-target="#modal-status-delete-'.$row['ID'].'"';
$tooltip = $hesklang['delete'];
if ($delete == 'no-default' || $delete == 'no-tickets') {
$cursor = '';
@ -424,7 +424,11 @@ function buildCreateModal() {
<div class="modal-body">
<div class="row">
<div class="col-md-6">
<h4><?php echo $hesklang['status_name_title']; ?></h4>
<h4><?php echo $hesklang['status_name_title']; ?>
<i class="fa fa-question-circle settingsquestionmark"
data-toggle="popover"
title="<?php echo $hesklang['status_name_title']; ?>"
data-content="<?php echo $hesklang['status_name_title_help']; ?>"></i></h4>
<div class="footerWithBorder blankSpace"></div>
<?php foreach ($languages as $language => $languageCode): ?>
<div class="form-group">
@ -442,14 +446,26 @@ function buildCreateModal() {
<h4><?php echo $hesklang['properties']; ?></h4>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
<label for="text-color" class="col-sm-4 control-label"><?php echo $hesklang['textColor']; ?></label>
<label for="text-color" class="col-sm-4 control-label">
<?php echo $hesklang['textColor']; ?>
<i class="fa fa-question-circle settingsquestionmark"
data-toggle="popover"
title="<?php echo $hesklang['textColor']; ?>"
data-content="<?php echo $hesklang['textColorDescr']; ?>"></i>
</label>
<div class="col-sm-8">
<input type="text" name="text-color" class="form-control"
placeholder="<?php echo htmlspecialchars($hesklang['textColor']); ?>">
</div>
</div>
<div class="form-group">
<label for="closable" class="col-sm-4 control-label"><?php echo $hesklang['closable']; ?></label>
<label for="closable" class="col-sm-4 control-label">
<?php echo $hesklang['closable']; ?>
<i class="fa fa-question-circle settingsquestionmark"
data-toggle="htmlpopover"
title="<?php echo $hesklang['closable']; ?>"
data-content="<?php echo $hesklang['closable_description']; ?>"></i>
</label>
<div class="col-sm-8">
<select name="closable" class="form-control">
<option value="yes"><?php echo $hesklang['yes_title_case']; ?></option>
@ -460,7 +476,13 @@ function buildCreateModal() {
</div>
</div>
<div class="form-group">
<label for="closed" class="col-sm-4 control-label"><?php echo $hesklang['closed_title']; ?></label>
<label for="closed" class="col-sm-4 control-label">
<?php echo $hesklang['closed_title']; ?>
<i class="fa fa-question-circle settingsquestionmark"
data-toggle="htmlpopover"
title="<?php echo $hesklang['closed_title']; ?>"
data-content="<?php echo $hesklang['closedQuestionMarkDescr']; ?>"></i>
</label>
<div class="col-sm-8">
<select name="closed" class="form-control">
<option value="1"><?php echo $hesklang['yes_title_case']; ?></option>
@ -515,7 +537,13 @@ function buildEditModal($statusId) {
<div class="modal-body">
<div class="row">
<div class="col-md-6">
<h4><?php echo $hesklang['status_name_title']; ?></h4>
<h4>
<?php echo $hesklang['status_name_title']; ?>
<i class="fa fa-question-circle settingsquestionmark"
data-toggle="popover"
title="<?php echo $hesklang['status_name_title']; ?>"
data-content="<?php echo $hesklang['status_name_title_help']; ?>"></i>
</h4>
<div class="footerWithBorder blankSpace"></div>
<?php foreach ($languages as $language => $languageCode):
$warning = '';
@ -549,7 +577,13 @@ function buildEditModal($statusId) {
<h4><?php echo $hesklang['properties']; ?></h4>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
<label for="text-color" class="col-sm-4 control-label"><?php echo $hesklang['textColor']; ?></label>
<label for="text-color" class="col-sm-4 control-label">
<?php echo $hesklang['textColor']; ?>
<i class="fa fa-question-circle settingsquestionmark"
data-toggle="popover"
title="<?php echo $hesklang['textColor']; ?>"
data-content="<?php echo $hesklang['textColorDescr']; ?>"></i>
</label>
<div class="col-sm-8">
<input type="text" name="text-color" class="form-control"
value="<?php echo $status['TextColor']; ?>"
@ -557,7 +591,13 @@ function buildEditModal($statusId) {
</div>
</div>
<div class="form-group">
<label for="closable" class="col-sm-4 control-label"><?php echo $hesklang['closable']; ?></label>
<label for="closable" class="col-sm-4 control-label">
<?php echo $hesklang['closable']; ?>
<i class="fa fa-question-circle settingsquestionmark"
data-toggle="htmlpopover"
title="<?php echo $hesklang['closable']; ?>"
data-content="<?php echo $hesklang['closable_description']; ?>"></i>
</label>
<div class="col-sm-8">
<?php
$yesSelected = $status['Closable'] == 'yes' ? 'selected' : '';
@ -574,7 +614,13 @@ function buildEditModal($statusId) {
</div>
</div>
<div class="form-group">
<label for="closed" class="col-sm-4 control-label"><?php echo $hesklang['closed_title']; ?></label>
<label for="closed" class="col-sm-4 control-label">
<?php echo $hesklang['closed_title']; ?>
<i class="fa fa-question-circle settingsquestionmark"
data-toggle="htmlpopover"
title="<?php echo $hesklang['closed_title']; ?>"
data-content="<?php echo $hesklang['closedQuestionMarkDescr']; ?>"></i>
</label>
<div class="col-sm-8">
<?php
$yes = $status['IsClosed'] == 1 ? 'selected' : '';
@ -653,12 +699,11 @@ function createStatus() {
VALUES (".intval($nextId).", 'STORED IN XREF TABLE', '".hesk_dbEscape($textColor)."', ".intval($isClosed).", '".hesk_dbEscape($closable)."', ".intval($my_order).")";
hesk_dbQuery($insert);
$newStatusId = hesk_dbInsertID();
// For each language, create a value in the xref table
foreach (hesk_POST_array('name') as $language => $translation) {
hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."text_to_status_xref` (`language`, `text`, `status_id`)
VALUES ('".hesk_dbEscape($language)."', '".hesk_dbEscape($translation)."', ".intval($newStatusId).")");
VALUES ('".hesk_dbEscape($language)."', '".hesk_dbEscape($translation)."', ".intval($nextId).")");
}
hesk_process_messages($hesklang['new_status_created'],'manage_statuses.php','SUCCESS');

5
language/en/text.php

@ -39,6 +39,7 @@ $hesklang['click_to_edit_name'] = 'Click to edit name';
$hesklang['new_status'] = 'New Status';
$hesklang['create_new_status_title'] = 'Create New Status';
$hesklang['status_name_title'] = 'Status Name';
$hesklang['status_name_title_help'] = 'The name of the status that should appear when viewing the ticket, for each language you have installed.';
$hesklang['properties'] = 'Properties';
$hesklang['closable'] = 'Closable'; // Same as $hesklang['closable_question'], but without punctuation
$hesklang['new_status_created'] = 'New status successfully created';
@ -176,8 +177,8 @@ $hesklang['error_saving_template'] = 'An error occurred when trying to save the
$hesklang['can_man_email_tpl'] = 'Edit email templates';
$hesklang['email_template_directory_not_writable'] = 'The email template <b>%s</b> is not writable by HESK. Please CHMOD it to 0666.'; // %s: template file name
$hesklang['closable_question'] = 'Closable?';
$hesklang['closable_description'] = '<b><i>This setting is ignored if the &quot;Closed?&quot; checkbox is checked for this status</i></b>.
<br><br>Determines if the customer staff is able to close a ticket in this status.
$hesklang['closable_description'] = '<b><i>This setting is ignored if the &quot;Closed?&quot; setting is set to &quot;Yes&quot; for this status</i></b>.
<br><br>Determines if the customer and/or staff is able to close a ticket in this status.
<br><br><b>Yes:</b> Both customers and staff can close a ticket in this status.
<br><b>Customers only:</b> Customers can close a ticket in this status, but staff cannot.
<br><b>Staff only:</b> Staff can close a ticket in this status, but customers cannot.

Loading…
Cancel
Save