svn commit: r1649514 - in /felix/trunk/webconsole/src/main/resources: res/ui/services.js templates/services.html

[cz...@apache.org]

Author: cziegeler
Date: Mon Jan  5 12:26:20 2015
New Revision: 1649514

URL: http://svn.apache.org/r1649514
Log:
FELIX-4704 : Show ranking in web console services plugin

Modified:
    felix/trunk/webconsole/src/main/resources/res/ui/services.js
    felix/trunk/webconsole/src/main/resources/templates/services.html

Modified: felix/trunk/webconsole/src/main/resources/res/ui/services.js
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/res/ui/services.js?rev=1649514&r1=1649513&r2=1649514&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/res/ui/services.js (original)
+++ felix/trunk/webconsole/src/main/resources/res/ui/services.js Mon Jan  5 12:26:20 2015
@@ -37,9 +37,9 @@ function entry( /* Object */dataEntry) {
 		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 hideDetails(id) {
 
 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 @@ $(document).ready(function() {
 	$('#plugin_table').tablesorter( {
 		headers : {
 			0 : { sorter : 'digit' },
-			1 : { sorter : 'digit' }
+			3 : { sorter : 'digit' }
 		},
 		sortList : [ [ 1, 0 ] ],
 		textExtraction : mixedLinksExtraction

Modified: felix/trunk/webconsole/src/main/resources/templates/services.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/services.html?rev=1649514&r1=1649513&r2=1649514&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/services.html [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/resources/templates/services.html [UTF-8] Mon Jan  5 12:26:20 2015
@@ -36,9 +36,9 @@ var data = ${__data__};
 	<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 @@ var data = ${__data__};
 			<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>