svn commit: r934329 - in /felix/trunk/webconsole/src/main/resources: res/ui/bundles.css res/ui/bundles.js templates/bundles.html

[vvalchev]

Author: vvalchev
Date: Thu Apr 15 08:45:47 2010
New Revision: 934329

URL: http://svn.apache.org/viewvc?rev=934329&view=rev
Log:
Fixed FELIX-2285 /Bundles Plugin doesn't render the bundles name in IE/
https://issues.apache.org/jira/browse/FELIX-2285

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

Modified: felix/trunk/webconsole/src/main/resources/res/ui/bundles.css
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/res/ui/bundles.css?rev=934329&r1=934328&r2=934329&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/res/ui/bundles.css (original)
+++ felix/trunk/webconsole/src/main/resources/res/ui/bundles.css Thu Apr 15 
08:45:47 2010
@@ -29,3 +29,5 @@ th.col_Actions { width: 121px }
 .symName:before { content: " (" }
 .symName:after   { content: ")"  }
 .filterClear        { display: inline-block; vertical-align: middle }
+.bIcon, .bName   { display: inline-block }
+.bIcon { float: left }
\ No newline at end of file

Modified: felix/trunk/webconsole/src/main/resources/res/ui/bundles.js
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/res/ui/bundles.js?rev=934329&r1=934328&r2=934329&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/res/ui/bundles.js (original)
+++ felix/trunk/webconsole/src/main/resources/res/ui/bundles.js Thu Apr 15 
08:45:47 2010
@@ -72,8 +72,8 @@ function entryInternal( /* Object */ bun
 
        tr.attr('id', 'entry'+id);
        tr.find('td:eq(0)').text(id);
-       tr.find('td:eq(1) span:eq(0)').attr('id', 'img'+id).click(function() 
{showDetails(id)});
-       tr.find('td:eq(1) span:eq(1)').html( drawDetails ? name : '<a href="' + 
pluginRoot + '/' + id + '">' + name + '</a>' );
+       tr.find('.bIcon').attr('id', 'img'+id).click(function() 
{showDetails(id)});
+       tr.find('.bName').html( drawDetails ? name : '<a href="' + pluginRoot + 
'/' + id + '">' + name + '</a>' );
        tr.find('td:eq(2)').text( bundle.version );
        tr.find('td:eq(3)').text( bundle.category );
        if (id == 0) { // system bundle has no actions
@@ -252,7 +252,7 @@ $(document).ready(function(){
                        0: { sorter:"digit" },
                        5: { sorter: false }
                },
-               textExtraction:mixedLinksExtraction,
+               textExtraction:mixedLinksExtraction
        }).bind("sortEnd", function() {
                var t = bundlesTable.eq(0).attr("config");
                if (t.sortList) $.cookies.set("webconsolebundlelist", 
t.sortList);

Modified: felix/trunk/webconsole/src/main/resources/templates/bundles.html
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/bundles.html?rev=934329&r1=934328&r2=934329&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/bundles.html [UTF-8] 
(original)
+++ felix/trunk/webconsole/src/main/resources/templates/bundles.html [UTF-8] 
Thu Apr 15 08:45:47 2010
@@ -80,8 +80,8 @@ var i18n = {
                <tr><!-- template -->
                        <td>&nbsp;</td><!-- ID -->
                        <td>
-                               <span class="ui-icon ui-icon-triangle-1-e" 
style="display: inline-block" title="Show Details">&nbsp;</span>
-                               <span>&nbsp;</span> <!-- here goest bundle 
name/link -->
+                               <div class="bIcon ui-icon ui-icon-triangle-1-e" 
title="Show Details">&nbsp;</div>
+                               <div class="bName">&nbsp;</div> <!-- here goest 
bundle name/link -->
                        </td>
                        <td>&nbsp;</td><!-- version -->
                        <td>&nbsp;</td><!-- symbolic name -->