Merge from otrs-5.0.x

Rodrigo Goncalves
2 parents 3446e6a0 6b3bdfa7
Showing 16 changed files with 2 additions and 2 deletions Show diff stats
.includepath
.project
Kernel/Config/Files/QueuesPanel.xml
Kernel/Language/pt_BR_QueuesPanel.pm
Kernel/Language/pt_BR_QueuesPanelPublic.pm
Kernel/Modules/QueuesPanel.pm
Kernel/Modules/QueuesPanelPublic.pm
Kernel/Output/HTML/Templates/Standard/QueuesPanel.tt
Kernel/System/QueuesPanel.pm
var/httpd/htdocs/skins/Customer/default/css/hColumns/hcolumns.css
var/httpd/htdocs/skins/Customer/default/css/hColumns/reset.css
var/httpd/htdocs/skins/Customer/default/images/hColumns/glyphicons-halflings.png
var/httpd/htdocs/skins/Customer/default/images/queues-panel/cabecalhoUFSC.jpg
var/httpd/htdocs/skins/Customer/default/images/queues-panel/separador.gif
var/httpd/htdocs/skins/Customer/default/images/queues-panel/separador.gif.1
var/httpd/htdocs/skins/Customer/default/images/queues-panel/setic.png
@@ -168,7 +168,7 @@ sub BuildQueueJS {
  
 	my $result = "\t\tif (node_id === " . $BaseQueueID . ") { \n\t\t\treturn callback(null, [\n";
  
-	for my $queue (@subqueues) {
+	for my $queue (sort {$Queues{$a} cmp $Queues{$b}} @subqueues) {
 		if ( grep { index( $Queues{$_}, $Queues{$queue} . "::" ) >= 0 } keys %Queues ) {
 			$result = $result
 			  . "\t\t\t\t"
@@ -91,7 +91,7 @@ vertical-align: middle;
 .column ul {
 	margin: 0;
 	padding: 0;
-	/*width: 300px;*/
+	width: 250px;
 	overflow-y: auto;
 	list-style: none;
 }
...	...	@@ -168,7 +168,7 @@ sub BuildQueueJS {
168	168
169	169	my $result = "\t\tif (node_id === " . $BaseQueueID . ") { \n\t\t\treturn callback(null, [\n";
170	170
171		- for my $queue (@subqueues) {
	171	+ for my $queue (sort {$Queues{$a} cmp $Queues{$b}} @subqueues) {
172	172	if ( grep { index( $Queues{$_}, $Queues{$queue} . "::" ) >= 0 } keys %Queues ) {
173	173	$result = $result
174	174	. "\t\t\t\t"
...	...
...	...	@@ -91,7 +91,7 @@ vertical-align: middle;
91	91	.column ul {
92	92	margin: 0;
93	93	padding: 0;
94		- /width: 300px;/
	94	+ width: 250px;
95	95	overflow-y: auto;
96	96	list-style: none;
97	97	}
...	...