Download as
Browse Code »

Commit c7f1e941ef43b11a4fa6b967d15c9c05032dbb80

Authored by Rodrigo Gonçalves
1 parent e66ff111
Exists in master

Correcao de bugs e ajustes de layout

Showing 4 changed files with 19 additions and 9 deletions   Show diff stats
Kernel/Modules/QueuesPanel.pm
  Diff comments   View file @c7f1e94
@@ -90,14 +90,16 @@ sub BuildQueuesJS { @@ -90,14 +90,16 @@ sub BuildQueuesJS {
90 return $result; 90 return $result;
91 } 91 }
92 92
  93 +use Data::Dumper;
  94 +
93 sub BuildTopQueuesJS { 95 sub BuildTopQueuesJS {
94 my ( $Self, %Param ) = @_; 96 my ( $Self, %Param ) = @_;
95 my %Queues = %{ $Param{"Queues"} }; 97 my %Queues = %{ $Param{"Queues"} };
96 98
97 my @topQueues = grep { index( $Queues{$_}, '::' ) == -1 } keys %Queues; 99 my @topQueues = grep { index( $Queues{$_}, '::' ) == -1 } keys %Queues;
98 - 100 +
99 my $result = "\t\tif (node_id === null) { \n\t\t\treturn callback(null, [\n"; 101 my $result = "\t\tif (node_id === null) { \n\t\t\treturn callback(null, [\n";
100 - for my $queue (@topQueues) { 102 + for my $queue (sort {$Queues{$a} cmp $Queues{$b}} @topQueues) {
101 103
102 if ( grep { index( $Queues{$_}, $Queues{$queue} . "::" ) >= 0 } keys %Queues ) { 104 if ( grep { index( $Queues{$_}, $Queues{$queue} . "::" ) >= 0 } keys %Queues ) {
103 $result = $result 105 $result = $result
Kernel/Modules/QueuesPanelPublic.pm
  Diff comments   View file @c7f1e94
@@ -117,7 +117,7 @@ sub BuildTopQueuesJS { @@ -117,7 +117,7 @@ sub BuildTopQueuesJS {
117 my @topQueues = grep { index( $Queues{$_}, '::' ) == -1 } keys %Queues; 117 my @topQueues = grep { index( $Queues{$_}, '::' ) == -1 } keys %Queues;
118 118
119 my $result = "\t\tif (node_id === null) { \n\t\t\treturn callback(null, [\n"; 119 my $result = "\t\tif (node_id === null) { \n\t\t\treturn callback(null, [\n";
120 - for my $queue (@topQueues) { 120 + for my $queue (sort {$Queues{$a} cmp $Queues{$b}} @topQueues) {
121 121
122 if ( grep { index( $Queues{$_}, $Queues{$queue} . "::" ) >= 0 } keys %Queues ) { 122 if ( grep { index( $Queues{$_}, $Queues{$queue} . "::" ) >= 0 } keys %Queues ) {
123 $result = $result 123 $result = $result
@@ -162,12 +162,12 @@ sub BuildQueueJS { @@ -162,12 +162,12 @@ sub BuildQueueJS {
162 162
163 # When there are no subqueues, there is no need to create a JS 163 # When there are no subqueues, there is no need to create a JS
164 if ( !@subqueues ) { 164 if ( !@subqueues ) {
165 - return; 165 + return "";
166 } 166 }
167 167
168 my $result = "\t\tif (node_id === " . $BaseQueueID . ") { \n\t\t\treturn callback(null, [\n"; 168 my $result = "\t\tif (node_id === " . $BaseQueueID . ") { \n\t\t\treturn callback(null, [\n";
169 169
170 - for my $queue (@subqueues) { 170 + for my $queue (sort {$Self->LastQueue($Queues{$a}) cmp $Self->LastQueue($Queues{$b})} @subqueues) {
171 if ( grep { index( $Queues{$_}, $Queues{$queue} . "::" ) >= 0 } keys %Queues ) { 171 if ( grep { index( $Queues{$_}, $Queues{$queue} . "::" ) >= 0 } keys %Queues ) {
172 $result = $result 172 $result = $result
173 . "\t\t\t\t" 173 . "\t\t\t\t"
@@ -195,6 +195,13 @@ sub BuildQueueJS { @@ -195,6 +195,13 @@ sub BuildQueueJS {
195 return $result; 195 return $result;
196 } 196 }
197 197
  198 +sub FirstQueue {
  199 + my $Self = shift;
  200 + my $queue = shift;
  201 + my @parts = split( "::", $queue );
  202 + return $parts[0];
  203 +}
  204 +
198 sub LastQueue { 205 sub LastQueue {
199 my $Self = shift; 206 my $Self = shift;
200 my $queue = shift; 207 my $queue = shift;
var/httpd/htdocs/skins/Customer/default/css/hColumns/hcolumns.css
  Diff comments   View file @c7f1e94
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 } 31 }
32 32
33 .column:last-child { 33 .column:last-child {
34 - border-right: 0; 34 +/* border-right: 0;*/
35 } 35 }
36 36
37 .column:only-child { 37 .column:only-child {
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 margin: 0; 49 margin: 0;
50 padding: 0; 50 padding: 0;
51 height: 400px; 51 height: 400px;
52 - width: 250px; 52 + /*width: 300px;*/
53 overflow-y: auto; 53 overflow-y: auto;
54 list-style: none; 54 list-style: none;
55 } 55 }
@@ -102,7 +102,7 @@ @@ -102,7 +102,7 @@
102 *margin-right: .3em; 102 *margin-right: .3em;
103 line-height: 14px; 103 line-height: 14px;
104 vertical-align: text-top; 104 vertical-align: text-top;
105 - background-image: url("../img/glyphicons-halflings.png"); 105 + background-image: url("/otrs-web/skins/Customer/default/images/hColumns/glyphicons-halflings.png");
106 background-position: 14px 14px; 106 background-position: 14px 14px;
107 background-repeat: no-repeat; 107 background-repeat: no-repeat;
108 } 108 }
@@ -112,7 +112,8 @@ @@ -112,7 +112,8 @@
112 } 112 }
113 113
114 .icon-globe { 114 .icon-globe {
115 - background-position: -336px -144px; 115 + #background-position: -336px -144px;
  116 + background-position: -800px -800px;
116 } 117 }
117 118
118 .icon-file { 119 .icon-file {
var/httpd/htdocs/skins/Customer/default/images/hColumns/demo.png
View file @e66ff11

27.4 KB