eric/hesk-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🚀 RELEASE: HESK v3.1.1

Browse Source 
Signed-off-by: Luke Tainton <Luke.Tainton@mail.bcu.ac.uk>
This commit is contained in:
Luke Tainton
2020-06-27 10:54:38 +01:00
committed by Luke Tainton
parent d7fc040b1e
commit e0d6aa511b
175 changed files with 6334 additions and 6073 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hesk/theme/hesk3/customer/util/alerts.php
View File

@@ -15,7 +15,7 @@ function hesk3_show_messages($messages) {
foreach ($messages as $message):
?>
<div class="main__content notice-flash">
<div class="notification <?php echo $style_to_class[$message['style']]; ?>">
<div class="notification <?php echo $style_to_class[$message['style']]; ?> browser-default">
<p><b><?php echo $message['title']; ?></b></p>
<?php echo $message['message']; ?>
</div>

41
hesk/theme/hesk3/customer/util/custom-fields.php
View File

@@ -13,7 +13,7 @@ function hesk3_output_custom_fields($customFields) {
?>
<div class="form-group <?php echo $customField['iserror'] ? 'isError' : '' ?>">
<label class="label <?php echo $customField['req'] ? 'required' : '' ?>">
<?php echo $customField['title']; ?>
<?php echo $customField['name:']; ?>
</label>
<?php
$i = 0;
@@ -37,9 +37,8 @@ function hesk3_output_custom_fields($customFields) {
case 'select':
?>
<section class="param blue-select">
<span class="label <?php echo $customField['req'] ? 'required' : '' ?>"><?php echo $customField['title']; ?></span>
<div class="dropdown-select center out-close">
<select name="<?php echo $customField['name']; ?>">
<span class="label <?php echo $customField['req'] ? 'required' : '' ?>"><?php echo $customField['name:']; ?></span>
<select name="<?php echo $customField['name']; ?>" id="<?php echo $customField['name']; ?>">
<?php if (!empty($customField['value']['show_select'])): ?>
<option value=""><?php echo $hesklang['select']; ?></option>
<?php
@@ -47,19 +46,18 @@ function hesk3_output_custom_fields($customFields) {
$i = 0;
foreach ($customField['value']['options'] as $option):
?>
<option value="<?php echo hesk_htmlentities($option['value']); ?>" <?php echo $option['selected'] ? 'selected' : '' ?>><?php echo $option['value']; ?></option>
<option <?php echo $option['selected'] ? 'selected' : '' ?>><?php echo $option['value']; ?></option>
<?php
$i++;
endforeach; ?>
</select>
</div>
</section>
<?php
break;
case 'checkbox':
?>
<section class="param checkboxs">
<label class="label <?php echo $customField['req'] ? 'required' : '' ?>"><?php echo $customField['title']; ?></label>
<label class="label <?php echo $customField['req'] ? 'required' : '' ?>"><?php echo $customField['name:']; ?></label>
<?php
$i = 0;
foreach ($customField['value']['options'] as $option):
@@ -81,7 +79,7 @@ function hesk3_output_custom_fields($customFields) {
case 'textarea':
?>
<div class="form-group">
<label class="label <?php echo $customField['req'] ? 'required' : '' ?>"><?php echo $customField['title']; ?></label>
<label class="label <?php echo $customField['req'] ? 'required' : '' ?>"><?php echo $customField['name:']; ?></label>
<textarea name="<?php echo $customField['name']; ?>"
rows="<?php echo intval($customField['value']['rows']); ?>"
cols="<?php echo intval($customField['value']['cols']); ?>"
@@ -92,8 +90,9 @@ function hesk3_output_custom_fields($customFields) {
break;
case 'date':
?>
<!--[if !IE]><!-->
<section class="param calendar">
<label class="label <?php echo $customField['req'] ? 'required' : '' ?>"><?php echo $customField['title']; ?></label>
<label class="label <?php echo $customField['req'] ? 'required' : '' ?>"><?php echo $customField['name:']; ?></label>
<div class="calendar--button">
<button type="button">
<svg class="icon icon-calendar">
@@ -114,6 +113,21 @@ function hesk3_output_custom_fields($customFields) {
</i>
</div>
</section>
<!--<![endif]-->
<!--[if IE]>
<div class="form-group">
<label class="label <?php echo $customField['req'] ? 'required' : '' ?>">
<?php echo $customField['name:']; ?>
</label>
<input type="text" class="form-control <?php if ($customField['iserror']) { ?>isError<?php } ?>"
value="<?php echo $customField['original_value']; ?>"
name="<?php echo $customField['name']; ?>"
<?php echo $customField['req'] ? 'required' : '' ?>>
<label class="label">
<?php echo $hesklang['d_format']; ?>: <?php echo date($customField['value']['date_format'], mktime(0, 0, 0, 12, 30, date('Y'))); ?>
</label>
</div>
<![endif]-->
<?php
break;
case 'email':
@@ -123,9 +137,9 @@ function hesk3_output_custom_fields($customFields) {
?>
<div class="form-group">
<label class="label <?php echo $customField['req'] ? 'required' : '' ?>">
<?php echo $customField['title']; ?>
<?php echo $customField['name:']; ?>
</label>
<input type="email"
<input type="<?php echo $customField['value']['multiple'] ? 'text' : 'email'; ?>"
id="<?php echo $customField['name']; ?>"
class="form-control"
value="<?php echo $customField['original_value']; ?>"
@@ -147,11 +161,12 @@ function hesk3_output_custom_fields($customFields) {
?>
<div class="form-group">
<label class="label <?php echo $customField['req'] ? 'required' : '' ?>">
<?php echo $customField['title']; ?>
<?php echo $customField['name:']; ?>
</label>
<input type="text" class="form-control <?php if ($customField['iserror']) { ?>isError<?php } ?>"
value="<?php echo $customField['value']['default_value']; ?>"
name="<?php echo $customField['name']; ?>"
maxlength="<?php echo intval($customField['value']['max_length']); ?>"
<?php echo $customField['req'] ? 'required' : '' ?>>
</div>
<?php
@@ -180,4 +195,4 @@ function hesk3_output_custom_fields_for_display($customFields) {
</div>
';
}
}
}

10
hesk/theme/hesk3/customer/util/kb-search.php
View File

@@ -25,10 +25,10 @@ function displayKbSearch() {
<div class="alert none">
<div class="alert__inner">
<div class="alert__head">
<h6 class="alert__title"><?php echo $hesklang['sc']; ?>:</h6>
<h6 class="alert__title" style="margin-bottom:10px"><?php echo $hesklang['sc']; ?>:</h6>
</div>
<ul id="kb-suggestion-list" class="type--list">
</ul>
<ol id="kb-suggestion-list" class="type--list" style="list-style-type: decimal; padding-left: 15px;">
</ol>
</div>
</div>
</div>
@@ -70,7 +70,7 @@ function outputSearchJavascript() {
$('.kb-suggestions').show();
var $suggestionList = $('#kb-suggestion-list');
$suggestionList.html('');
var format = '<li style="margin-bottom: 5px">' +
var format = '<li style="margin-bottom: 15px; padding-left: 0.5em;">' +
'<a class="link" href="knowledgebase.php?article={0}">{1}</a>' +
'<br>' +
'{2}' +
@@ -82,7 +82,7 @@ function outputSearchJavascript() {
});
if (!results) {
$suggestionList.append('<li>' + noArticlesFoundText + '</li>');
$suggestionList.append('<li style="list-style-type: none; margin-left: -15px;">' + noArticlesFoundText + '</li>');
}
});
});