diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 816c3c22..4b148211 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -1599,7 +1599,7 @@ function mfh_print_message() {

-
+
@@ -1608,51 +1608,12 @@ function mfh_print_message() {
- $v) { - if ($v['use'] && $v['place'] == 0 && hesk_is_custom_field_in_category($k, $ticket['category'])) { - if ($modsForHesk_settings['custom_field_setting']) { - $v['name'] = $hesklang[$v['name']]; - } - echo '
'; - echo '
' . $v['name'] . ':
'; - if ($v['type'] == 'date' && !empty($ticket[$k])) { - $dt = hesk_date($ticket[$k], false, false); - echo '
' . hesk_dateToString($dt, 0) . '
'; - } elseif ($v['type'] == 'email') { - echo '
'.$ticket[$k].'
'; - } else { - echo '
' . $ticket[$k] . '
'; - } - echo '
'; - } - } - if ($ticket['message'] != '') { - ?> -
-
- -
-
- -
-
$v) { - if ($v['use'] && $v['place'] && hesk_is_custom_field_in_category($k, $ticket['category'])) { - if ($modsForHesk_settings['custom_field_setting']) { - $v['name'] = $hesklang[$v['name']]; - } + if ($v['use'] && $v['place'] == 0 && hesk_is_custom_field_in_category($k, $ticket['category'])) { echo '
'; echo '
' . $v['name'] . ':
'; - if ($v['type'] == 'date' && !empty($ticket[$k])) { - $dt = hesk_date($ticket[$k], false, false); - echo '
' . hesk_dateToString($dt, 0) . '
'; - } elseif ($v['type'] == 'email') { + if ($v['type'] == 'email') { echo '
'.$ticket[$k].'
'; } else { echo '
' . $ticket[$k] . '
'; @@ -1662,6 +1623,39 @@ function mfh_print_message() { } ?>
+
+ +
+ $v) { + if ($v['use'] && $v['place'] && hesk_is_custom_field_in_category($k, $ticket['category'])) { + if ($first) { + echo '
'; + $first = false; + } + echo '
'; + echo '
' . $v['name'] . ':
'; + if ($v['type'] == 'email') { + echo '
'.$ticket[$k].'
'; + } else { + echo '
' . $ticket[$k] . '
'; + } + echo '
'; + } + } + if (!$first) { + echo '
'; + } + ?>
diff --git a/admin/edit_post.php b/admin/edit_post.php index 354f2a34..a3b7b202 100644 --- a/admin/edit_post.php +++ b/admin/edit_post.php @@ -37,6 +37,7 @@ require(HESK_PATH . 'hesk_settings.inc.php'); require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/admin_functions.inc.php'); require(HESK_PATH . 'inc/mail_functions.inc.php'); +require(HESK_PATH . 'inc/custom_fields.inc.php'); hesk_load_database_functions(); hesk_session_start(); @@ -240,7 +241,7 @@ if (isset($_POST['save'])) { `message`='" . hesk_dbEscape($tmpvar['message']) . "', `language`='" . hesk_dbEscape($tmpvar['language']) . "', `html`='" . hesk_dbEscape($tmpvar['html']) . "', - $custom_sql + $custom_SQL WHERE `id`='" . intval($ticket['id']) . "' LIMIT 1"); } @@ -286,8 +287,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); if ($hesk_settings['can_sel_lang']) { ?>
- +
'; } ?>
- +
- +
- +
',$k_value); + $k_value = explode('
',$k_value); } - $v['req'] = $v['req']==2 ? '*' : ''; + $v['req'] = $v['req']==2 ? '*' : ''; switch ($v['type']) { /* Radio box */ case 'radio': + $cls = in_array($k,$_SESSION['iserror']) ? ' isError' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - '; +
+ +
'; + foreach ($v['value']['radio_options'] as $option) { + if (strlen($k_value) == 0) { + $k_value = $option; + $checked = empty($v['value']['no_default']) ? 'checked="checked"' : ''; + } elseif ($k_value == $option) { + $k_value = $option; + $checked = 'checked="checked"'; + } else { + $checked = ''; + } - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + echo '
'; + } + echo '
+
'; - foreach ($v['value']['radio_options'] as $option) { - if (strlen($k_value) == 0) { - $k_value = $option; - $checked = empty($v['value']['no_default']) ? 'checked="checked"' : ''; - } elseif ($k_value == $option) { - $k_value = $option; - $checked = 'checked="checked"'; - } else { - $checked = ''; - } - - echo '
'; - } - - echo ' - - '; break; /* Select drop-down box */ case 'select': - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + $cls = in_array($k,$_SESSION['iserror']) ? ' isError' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - '; + // Show "Click to select"? + if ( ! empty($v['value']['show_select'])) { + echo ''; + } - // Show "Click to select"? - if ( ! empty($v['value']['show_select'])) { - echo ''; + foreach ($v['value']['select_options'] as $option) { + if ($k_value == $option) { + $k_value = $option; + $selected = 'selected'; + } else { + $selected = ''; } - foreach ($v['value']['select_options'] as $option) { - if ($k_value == $option) { - $k_value = $option; - $selected = 'selected="selected"'; - } else { - $selected = ''; - } + echo ''; + } - echo ''; - } - - echo ' - - '; + echo ' +
+
'; break; /* Checkbox */ case 'checkbox': + $cls = in_array($k,$_SESSION['iserror']) ? ' isError' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - '; +
+ +
'; + foreach ($v['value']['checkbox_options'] as $option) { + if (in_array($option,$k_value)) { + $checked = 'checked'; + } else { + $checked = ''; + } - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; - - foreach ($v['value']['checkbox_options'] as $option) { - if (in_array($option,$k_value)) { - $checked = 'checked="checked"'; - } else { - $checked = ''; - } - - echo '
'; - } - - echo ' - - '; + echo '
'; + } + echo '
+
'; break; /* Large text box */ case 'textarea': - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + $cls = in_array($k,$_SESSION['iserror']) ? ' isError' : ''; $k_value = hesk_msgToPlain($k_value,0,0); echo ' - - '.$v['name:'].' '.$v['req'].' - - - '; +
+ +
+ +
+
'; break; // Date case 'date': - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + $cls = in_array($k,$_SESSION['iserror']) ? ' isError' : ''; - $k_value = hesk_custom_date_display_format($k_value, 'm/d/Y'); + $k_value = hesk_custom_date_display_format($k_value, 'Y-m-d'); echo ' - - '.$v['name:'].' '.$v['req'].' - - - '; +
+ +
+ +
+
'; break; // Email @@ -454,29 +449,33 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); $suggest = $hesk_settings['detect_typos'] ? 'onblur="Javascript:hesk_suggestEmail(\''.$k.'\', \''.$k.'_suggestions\', 0, 1'.($v['value']['multiple'] ? ',1' : '').')"' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - +
+ +
+ +
- - +
'; break; // Hidden (same as text for staff) case 'hidden': + case 'readonly': default: if (strlen($k_value) != 0) { $v['value']['default_value'] = $k_value; } - $cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : ''; + $cls = in_array($k,$_SESSION['iserror']) ? ' isError' : ''; echo ' - - '.$v['name:'].' '.$v['req'].' - - +
+ +
+ +
+
'; } } @@ -485,7 +484,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
- +
- + value=""> + - + @@ -513,7 +512,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); $html = $ticket['html'] ? 1 : 0; ?> - + diff --git a/css/mods-for-hesk-new.css b/css/mods-for-hesk-new.css index b60c6f72..ed39b438 100644 --- a/css/mods-for-hesk-new.css +++ b/css/mods-for-hesk-new.css @@ -168,4 +168,8 @@ button.dropdown-submit { .button-link .panel-body:hover { background-color: #EEE; +} + +.timeline-header.header-info { + font-size: 14px !important; } \ No newline at end of file