Partial fix for FELIX-2286 /Various rendering issues with IE/
https://issues.apache.org/jira/browse/FELIX-2286
fixes config plugin
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@934388 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/resources/res/ui/config.css b/webconsole/src/main/resources/res/ui/config.css
index 0a898ff..5f69d84 100644
--- a/webconsole/src/main/resources/res/ui/config.css
+++ b/webconsole/src/main/resources/res/ui/config.css
@@ -30,6 +30,6 @@
.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 }
diff --git a/webconsole/src/main/resources/res/ui/config.js b/webconsole/src/main/resources/res/ui/config.js
index 11061ce..8ef06bd 100644
--- a/webconsole/src/main/resources/res/ui/config.js
+++ b/webconsole/src/main/resources/res/ui/config.js
@@ -120,6 +120,11 @@
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 @@
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);
diff --git a/webconsole/src/main/resources/templates/config.html b/webconsole/src/main/resources/templates/config.html
index 1e60387..385bd72 100644
--- a/webconsole/src/main/resources/templates/config.html
+++ b/webconsole/src/main/resources/templates/config.html
@@ -47,7 +47,7 @@
</thead>
<tbody>
<tr>
- <td class="pointer"><span class="ui-icon ui-icon-triangle-1-e subpid"> </span></td>
+ <td class="pointer"><div class="ui-icon ui-icon-triangle-1-e subpid"> </div></td>
<td> </td>
<td>
<ul class="icons">