diff --git a/include/class.forms.php b/include/class.forms.php index 516c7db9fd684b8da23eff339af387abc82fd902..e71d132fea3b0d78e54892131797e37ef5ca03bc 100644 --- a/include/class.forms.php +++ b/include/class.forms.php @@ -2311,7 +2311,7 @@ class PriorityField extends ChoiceField { function display($prio) { if (!$prio instanceof Priority) return parent::display($prio); - return sprintf('<span style="padding: 2px; background-color: %s">%s</span>', + return sprintf('<span class="fill" style="padding: 2px; background-color: %s">%s</span>', $prio->getColor(), Format::htmlchars($prio->getDesc())); } diff --git a/include/class.queue.php b/include/class.queue.php index 07b4a1902522ffe24845101dffe949680f1062f2..7f3facb5d7ff8f401faef04de8e1aafa193ab37c 100644 --- a/include/class.queue.php +++ b/include/class.queue.php @@ -152,11 +152,11 @@ class CustomQueue extends SavedSearch { if (!$this->id) return; - $path = $this->id; + $path = ''; if ($this->parent) { - $path = sprintf('%s/%d', $this->parent->getPath(), $path); + $path = rtrim($this->parent->getPath(), '/'); } - return $path; + return $path . "/{$this->id}/"; } function getFullName() { @@ -553,7 +553,7 @@ class QueueColumnCondition { $V = current($V); $style[] = "{$css}:{$V}"; } - $text = sprintf('<span style="%s">%s</span>', + $text = sprintf('<span class="fill" style="%s">%s</span>', implode(';', $style), $text); } return $text; diff --git a/include/class.search.php b/include/class.search.php index 6626f1225cbef8a107c73caa38acd885c6a4fe7c..141f5a0fea7d3248534346a547364929dd0ea572 100644 --- a/include/class.search.php +++ b/include/class.search.php @@ -675,7 +675,8 @@ class SavedSearch extends VerySimpleModel { return static::objects()->filter(Q::any(array( 'staff_id' => $agent->getId(), 'flags__hasbit' => self::FLAG_PUBLIC, - ))); + ))) + ->exclude(array('flags__hasbit'=>self::FLAG_QUEUE)); } function getName() { diff --git a/include/staff/templates/queue-preview.tmpl.php b/include/staff/templates/queue-preview.tmpl.php index 645925fce257f34094b86e01995c0fdb80804962..18e231160c645d3be73c6a5a52ad03336777b3fd 100644 --- a/include/staff/templates/queue-preview.tmpl.php +++ b/include/staff/templates/queue-preview.tmpl.php @@ -29,7 +29,7 @@ foreach ($columns as $C) { foreach ($tickets as $T) { echo '<tr>'; foreach ($columns as $C) { - echo "<td>"; + echo '<td class="offset">'; echo $C->render($T); echo "</td>"; } diff --git a/include/staff/templates/queue-tickets.tmpl.php b/include/staff/templates/queue-tickets.tmpl.php index ad14667fea18da87b5f141dd6a5ca6a3eecb1264..373c0a1b5b9cb6698f8d5607e30fad18cdfe9965 100644 --- a/include/staff/templates/queue-tickets.tmpl.php +++ b/include/staff/templates/queue-tickets.tmpl.php @@ -104,7 +104,7 @@ foreach ($columns as $C) { foreach ($tickets as $T) { echo '<tr>'; foreach ($columns as $C) { - echo "<td>"; + echo '<td class="offset">'; echo $C->render($T); echo "</td>"; } diff --git a/scp/css/scp.css b/scp/css/scp.css index 41f2354426c7fe1e9922286d8ab4a3a474b825f4..bcb53c5b73acae51eb881523722734a8dd40436e 100644 --- a/scp/css/scp.css +++ b/scp/css/scp.css @@ -302,11 +302,17 @@ a time { } /* Custom queue fields with background color should fill cell */ -table.queue.list > tbody > tr > td > [style*=background] { +.offset { + position: relative; +} +.offset .fill { display: block; - padding: 4px !important; - margin: -4px; - height: 100%; + padding: 4px!important; + position: absolute; + left: 0; + top: 0; + right: 0; + bottom: 0; } /*********************************************************************** @@ -366,12 +372,12 @@ table.queue.list > tbody > tr > td > [style*=background] { text-decoration: none; } -#sub_nav a.active, #sub_nav li.active, +#sub_nav a.active, #sub_nav li.active > a, #customQ_nav .jb-overflowmenu-menu-primary li.item > a.active { font-weight:bold; } -#sub_nav li.child.active { +#sub_nav li.child.active > a { font-weight: 500; } @@ -414,6 +420,9 @@ table.queue.list > tbody > tr > td > [style*=background] { text-decoration:none; text-transform:capitalize; } +.customQ-dropdown a.truncate { + min-width: 140px; +} .customQ-dropdown ul li { list-style:none;