commit 3b17bbf0e2b61da594257a5f34bbab66f2ff7846
author Carsten Ziegeler <cziegeler@apache.org> Mon Jan 05 12:26:20 2015 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Mon Jan 05 12:26:20 2015 +0000
tree 774feb4c963d3b5a23d9c8b445475870fed96964
parent 434525aed996c4e0cee7bfe454c2446ec62be69a

FELIX-4704 : Show ranking in web console services plugin

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1649514 13f79535-47bb-0310-9956-ffa450edef68

webconsole/src/main/resources/res/ui/services.js

diff --git a/webconsole/src/main/resources/res/ui/services.js b/webconsole/src/main/resources/res/ui/services.js
index 4d61baa..feb513d 100644
--- a/webconsole/src/main/resources/res/ui/services.js
+++ b/webconsole/src/main/resources/res/ui/services.js
@@ -37,9 +37,9 @@
 		showDetails(id);
 	}).after(drawDetails ? name : ('<a href="' + window.location.pathname + '/' + id + '">' + name + '</a>'));
 	  
-	_.find('td:eq(1)').text(dataEntry.ranking);
-	_.find('td:eq(2)').text(dataEntry.types);
-	_.find('td:eq(3)').html('<a href="' + bundlePath + dataEntry.bundleId + '">' + dataEntry.bundleSymbolicName + ' (' + dataEntry.bundleId + ')</a>' );
+	_.find('td:eq(1)').text(dataEntry.types);
+	_.find('td:eq(2)').html('<a href="' + bundlePath + dataEntry.bundleId + '">' + dataEntry.bundleSymbolicName + ' (' + dataEntry.bundleId + ')</a>' );
+	_.find('td:eq(3)').text(dataEntry.ranking);
 }
 
 function showDetails(id) {
@@ -61,7 +61,7 @@
 
 function renderDetails(data) {
 	data = data.data[0];
-	$('#entry' + data.id + ' > td').eq(2).append('<div id="pluginInlineDetails' + data.id + '"/>');
+	$('#entry' + data.id + ' > td').eq(1).append('<div id="pluginInlineDetails' + data.id + '"/>');
 	$('#img' + data.id).each(function() {
 		if (drawDetails) {
 			var ref = window.location.pathname;
@@ -158,7 +158,7 @@
 	$('#plugin_table').tablesorter( {
 		headers : {
 			0 : { sorter : 'digit' },
-			1 : { sorter : 'digit' }
+			3 : { sorter : 'digit' }
 		},
 		sortList : [ [ 1, 0 ] ],
 		textExtraction : mixedLinksExtraction

webconsole/src/main/resources/templates/services.html

diff --git a/webconsole/src/main/resources/templates/services.html b/webconsole/src/main/resources/templates/services.html
index a090e04..8ce441d 100644
--- a/webconsole/src/main/resources/templates/services.html
+++ b/webconsole/src/main/resources/templates/services.html
@@ -36,9 +36,9 @@
 	<thead>
 		<tr>
 			<th class="col_Id">${id}</th>
-			<th class="col_Ranking">${ranking}</th>
 			<th class="col_Types">${type_s}</th>
 			<th class="col_Bundle">${bundle}</th>
+            <th class="col_Ranking">${ranking}</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -46,9 +46,9 @@
 			<td>
 				<div class="bIcon ui-icon ui-icon-triangle-1-e" style="float:left" title="${services.details.tip}">&nbsp;</div>
 			</td>
-			<td>&nbsp;</td><!-- ranking -->
 			<td>&nbsp;</td><!-- type -->
 			<td>&nbsp;</td><!-- bundle -->
+            <td>&nbsp;</td><!-- ranking -->
 		</tr>
 	</tbody>
 </table>