Fixed FELIX-3848 : Differentiate between unbound and new configuration
https://issues.apache.org/jira/browse/FELIX-3848
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1643105 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 21e543d..2946b18 100644
--- a/webconsole/src/main/resources/res/ui/config.css
+++ b/webconsole/src/main/resources/res/ui/config.css
@@ -35,4 +35,5 @@
#factoryTableCaption { margin-top: 1.5em }
span.default_value {
float: left; margin-right: .3em;
-}
\ No newline at end of file
+}
+td.col_Exists_body div.ui-icon { margin-left:auto; margin-right: auto }
diff --git a/webconsole/src/main/resources/res/ui/config.js b/webconsole/src/main/resources/res/ui/config.js
index af2f43b..db7a1ed 100644
--- a/webconsole/src/main/resources/res/ui/config.js
+++ b/webconsole/src/main/resources/res/ui/config.js
@@ -460,9 +460,13 @@
function addConfig(conf) {
var tr = configRow.clone().appendTo(configBody);
+
+ if (!conf.has_config) {
+ tr.find('td:eq(0)').empty();
+ }
// rendering name - indented if factory pid is set
- var nms = tr.find('td:eq(0) div');
+ var nms = tr.find('td:eq(1) div');
if (conf.fpid) {
nms.after(conf.id);
tr.attr('fpid', conf.name);
@@ -470,10 +474,10 @@
nms.addClass('ui-helper-hidden').parent().text(conf.name);
}
- tr.find('td:eq(0)').click(function() { // name & edit
+ tr.find('td:eq(1)').click(function() { // name & edit
configure(conf.id);
});
- tr.find('td:eq(1)').html(conf.bundle ? '<a href="' + pluginRoot + '/../bundles/' + conf.bundle + '">' + conf.bundle_name + '</a>' : '-'); // binding
+ tr.find('td:eq(2)').html(conf.bundle ? '<a href="' + pluginRoot + '/../bundles/' + conf.bundle + '">' + conf.bundle_name + '</a>' : '-'); // binding
// buttons
tr.find('li:eq(0)').click(function() { // edit
@@ -492,11 +496,11 @@
function addFactoryConfig(conf) {
var tr = factoryRow.clone().appendTo(configTable).attr('fpid', conf.name);
//tr.find('td:eq(1)').text(conf.id); // fpid
- tr.find('td:eq(0)').text(conf.name).click(function() { // name & edit
+ tr.find('td:eq(1)').text(conf.name).click(function() { // name & edit
configure(conf.id, true);
});
// buttons
- tr.find('li:eq(0)').click(function() { // edit
+ tr.find('li:eq(1)').click(function() { // edit
configure(conf.id, true);
});
}
@@ -513,7 +517,7 @@
var fpid = row.attr('fpid');
// factory row
- if ( row.hasClass('fpid') && fpid) return fpid + (desc==0?1:0) + text;
+ if ( row.hasClass('fpid') && fpid) return fpid + (desc==1?1:0) + text;
// bundle or name row
if ( fpid ) return fpid + desc + text;
@@ -615,12 +619,15 @@
// init tablesorte
configTable.tablesorter({
- headers: { 2: { sorter: false } },
- sortList: [[0,1]],
+ headers: {
+ 0: { sorter: false },
+ 3: { sorter: false }
+ },
+ sortList: [[1,1]],
textExtraction: treetableExtraction
- }).bind('sortStart', function() { // clear cache, otherwse extraction will not work
+ }).bind('sortStart', function() { // clear cache, otherwise extraction will not work
var table = $(this).trigger('update');
- }).find('th:eq(0)').click();
+ }).find('th:eq(1)').click();
} else {
configContent.addClass('ui-helper-hidden');
}