diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 7f0b7398..d0e2eb6e 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -413,8 +413,9 @@ $result = hesk_dbQuery("SELECT `id`,`name` FROM `".hesk_dbEscape($hesk_settings[ $categories_options=''; while ($row=hesk_dbFetchAssoc($result)) { - if ($row['id'] == $ticket['category']) {continue;} - $categories_options.=''; + $selected = ''; + if ($row['id'] == $ticket['category']) {$selected='selected';} + $categories_options.=''; } /* List of users */ @@ -674,12 +675,17 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
'', - 1 => '', - 2 => '', - 3 => '' + $priorityLanguages = array( + 0 => $hesklang['critical'], + 1 => $hesklang['high'], + 2 => $hesklang['medium'], + 3 => $hesklang['low'] ); + $options = array(); + for ($i = 0; $i < 4; $i++) { + $selected = $ticket['priority'] == $i ? 'selected' : ''; + array_push($options, ''); + } echo '
';} @@ -688,17 +694,10 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); echo '

'.$hesklang['priority'].'

'; - if ($ticket['priority']==0) {echo '

'.$hesklang['critical'].'

';} - elseif ($ticket['priority']==1) {echo '

'.$hesklang['high'].'

';} - elseif ($ticket['priority']==2) {echo '

'.$hesklang['medium'].'

';} - else {echo '

'.$hesklang['low'].'

';} - echo '
-
+ echo ' - '; echo implode('',$options); echo ' @@ -716,17 +715,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); $results = hesk_dbQuery("SELECT `ID`, `ShortNameContentKey` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses`"); while ($row = $results->fetch_assoc()) { - $status_options[$row['ID']] = ''; + $selected = $ticket['status'] == $row['ID'] ? 'selected' : ''; + $status_options[$row['ID']] = ''; } - $ticketStatus = hesk_dbFetchAssoc(hesk_dbQuery("SELECT `TicketViewContentKey` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE ID = " .$ticket['status'])); - echo '

'.$hesklang[$ticketStatus['TicketViewContentKey']].'

'; - echo '
- + echo ' @@ -735,53 +731,47 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
'; - echo '

'.$hesklang['owner'].'

-

'; - - echo isset($admins[$ticket['owner']]) ? $admins[$ticket['owner']] : - ($can_assign_self ? $hesklang['unas'].' ['.$hesklang['asss'].']' : $hesklang['unas']); - - echo '


'; + echo '

'.$hesklang['owner'].'

'; if (hesk_checkPermission('can_assign_others',0)) { echo'
- '; + $selectedForUnassign = 'selected'; foreach ($admins as $k=>$v) { - if ($k != $ticket['owner']) - { - echo ''; + $selected = ''; + if ($k == $ticket['owner']) { + $selectedForUnassign = ''; + $selected = 'selected'; } + echo ''; } + echo ''; echo ' '; + } else + { + echo '

'; + echo isset($admins[$ticket['owner']]) ? $admins[$ticket['owner']] : + ($can_assign_self ? $hesklang['unas'].' ['.$hesklang['asss'].']' : $hesklang['unas']); + echo '

'; } echo '
'; - echo '

'.$hesklang['category'].'

-

'.$category['name'].'

'; - + echo '

'.$hesklang['category'].'

'; if ($can_change_cat) { echo ' -
@@ -789,8 +779,11 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); -
'; } - + '; + } else + { + echo '

'.$category['name'].'

'; + } echo '
'; ?>
diff --git a/css/hesk_newStyle.php b/css/hesk_newStyle.php index c7b2ac21..ff1d07ac 100644 --- a/css/hesk_newStyle.php +++ b/css/hesk_newStyle.php @@ -56,7 +56,7 @@ border-bottom: solid 1px #ddd; border-right: 0; padding-top: 5px; - height: 125px; + height: 100px; } } @@ -75,7 +75,7 @@ border-bottom: 0; border-right: solid 1px #ddd; margin-top: 1px; - height: 125px; + height: 100px; padding-top: 10px; } } diff --git a/css/hesk_newStyleRTL.php b/css/hesk_newStyleRTL.php index add02908..de5b17db 100644 --- a/css/hesk_newStyleRTL.php +++ b/css/hesk_newStyleRTL.php @@ -56,7 +56,7 @@ border-bottom: solid 1px #ddd; border-left: 0; padding-top: 5px; - height: 125px; + height: 100px; } } @@ -75,7 +75,7 @@ border-bottom: 0; border-left: solid 1px #ddd; margin-top: 1px; - height: 125px; + height: 100px; padding-top: 10px; } }