felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vvalc...@apache.org
Subject svn commit: r934388 - in /felix/trunk/webconsole/src/main/resources: res/ui/config.css res/ui/config.js templates/config.html
Date Thu, 15 Apr 2010 12:33:59 GMT
Author: vvalchev
Date: Thu Apr 15 12:33:58 2010
New Revision: 934388

URL: http://svn.apache.org/viewvc?rev=934388&view=rev
Log:
Partial fix for FELIX-2286 /Various rendering issues with IE/
https://issues.apache.org/jira/browse/FELIX-2286

fixes config plugin

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

Modified: felix/trunk/webconsole/src/main/resources/res/ui/config.css
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/res/ui/config.css?rev=934388&r1=934387&r2=934388&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/res/ui/config.css (original)
+++ felix/trunk/webconsole/src/main/resources/res/ui/config.css Thu Apr 15 12:33:58 2010
@@ -30,6 +30,6 @@ html>select { width: auto; min-width: 50
 .multiselect { display: block }
 .col_Actions { width: 7em !important }
 .pointer { cursor: pointer }
-.subpid   { display:inline-block; margin-left: 1em }
+.subpid   { margin-left: 1em; float: left }
 tr.fpid   td   { font-style:italic }
 #factoryTableCaption { margin-top: 1.5em }

Modified: felix/trunk/webconsole/src/main/resources/res/ui/config.js
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/res/ui/config.js?rev=934388&r1=934387&r2=934388&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/res/ui/config.js (original)
+++ felix/trunk/webconsole/src/main/resources/res/ui/config.js Thu Apr 15 12:33:58 2010
@@ -120,6 +120,11 @@ function displayConfigForm(obj) {
 	if ( obj.service_location && obj.bundle_location && obj.service_location
!= obj.bundle_location) {
 		editorMessage.removeClass('ui-helper-hidden').text(i18n.err_bind.msgFormat(obj.pid, obj.bundle_location,
obj.service_location));
 	} else editorMessage.addClass('ui-helper-hidden');
+
+	// ugly workaround for IE6 and IE7 - these browsers don't show correctly the dialog
+	var ua = navigator.userAgent;
+	if (ua.indexOf('MSIE 6') != -1 || ua.indexOf('MSIE 7') != -1) $(parent).html(parent.innerHTML);
+
 	initStaticWidgets(editor.attr('__pid', obj.pid).dialog('option', 'title', obj.title).dialog('open'));
 }
 
@@ -431,7 +436,7 @@ function addConfig(conf) {
 	var tr = configRow.clone().appendTo(configBody);
 
 	// rendering name - indented if factory pid is set
-	var nms = tr.find('td:eq(0) span')
+	var nms = tr.find('td:eq(0) div');
 	if (conf.fpid) { 
 		nms.after(conf.id); 
 		tr.attr('fpid', conf.name);

Modified: felix/trunk/webconsole/src/main/resources/templates/config.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/config.html?rev=934388&r1=934387&r2=934388&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/config.html [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/resources/templates/config.html [UTF-8] Thu Apr 15 12:33:58
2010
@@ -47,7 +47,7 @@ var i18n = { // i18n
 		</thead>
 		<tbody>
 			<tr>
-				<td class="pointer"><span class="ui-icon ui-icon-triangle-1-e subpid">&nbsp;</span></td>
+				<td class="pointer"><div class="ui-icon ui-icon-triangle-1-e subpid">&nbsp;</div></td>
 				<td>&nbsp;</td>
 				<td>
 					<ul class="icons">



Mime
View raw message