FELIX-1988 Apply 19.assorted1.patch by Valentin Valchev (thanks)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@912157 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ConfigurationRender.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ConfigurationRender.java
index de37af0..caec864 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ConfigurationRender.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ConfigurationRender.java
@@ -19,6 +19,7 @@
import java.io.*;
import java.net.URL;
+import java.net.URLDecoder;
import java.text.*;
import java.util.*;
import java.util.zip.ZipEntry;
@@ -122,6 +123,7 @@
String name = request.getPathInfo();
name = name.substring( name.lastIndexOf('/') + 1);
name = name.substring(0, name.length() - 4);
+ name = URLDecoder.decode( name );
ConfigurationWriter pw = new HtmlConfigurationWriter( response.getWriter() );
pw.println ( "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"" );
diff --git a/webconsole/src/main/resources/res/lib/support.js b/webconsole/src/main/resources/res/lib/support.js
index 0cf2ac2..8b161c8 100644
--- a/webconsole/src/main/resources/res/lib/support.js
+++ b/webconsole/src/main/resources/res/lib/support.js
@@ -74,7 +74,7 @@
var pre = '<br/><pre>';
for (i in event) pre += i + '=' + event[i] + '\n'
pre += '</pre>';
- XAlert('The request failed: ' + thrownError + pre, 'AJAX Error');
+ Xalert('The request failed: ' + thrownError + pre, 'AJAX Error');
});
initStaticWidgets();
@@ -122,7 +122,6 @@
return false;
}
function Xalert(/* String */text, /* String */title) {
- if (!$.isFunction(action)) return alert(text);
if (title === undefined) title = "";
Xdialog(text).dialog({
diff --git a/webconsole/src/main/resources/res/ui/bundles.css b/webconsole/src/main/resources/res/ui/bundles.css
index 5824bd6..f6adee8 100644
--- a/webconsole/src/main/resources/res/ui/bundles.css
+++ b/webconsole/src/main/resources/res/ui/bundles.css
@@ -20,9 +20,5 @@
padding: 0;
}
-ul.icons {margin: 0; padding: 0;}
-ul.icons li {margin: 1px; position: relative; padding: 1px 0; cursor: pointer; float: left; list-style: none;}
-ul.icons span.ui-icon {float: left; margin: 0 1px;}
-
.col_Status { width: 50px; }
.col_Actions { width: 121px; }
diff --git a/webconsole/src/main/resources/res/ui/license.css b/webconsole/src/main/resources/res/ui/license.css
index b2bcba4..c94e84a 100644
--- a/webconsole/src/main/resources/res/ui/license.css
+++ b/webconsole/src/main/resources/res/ui/license.css
@@ -36,5 +36,5 @@
}
#licenseDetails {
width: 100%;
- height: 100%;
+ height: 50em;
}
diff --git a/webconsole/src/main/resources/res/ui/webconsole.css b/webconsole/src/main/resources/res/ui/webconsole.css
index 4f7d2b6..9a1fae9 100644
--- a/webconsole/src/main/resources/res/ui/webconsole.css
+++ b/webconsole/src/main/resources/res/ui/webconsole.css
@@ -145,3 +145,26 @@
/* overwrite background from JQuery UI Theme */
background: none !important;
}
+
+/*
+ * Common UI style to define button icons like in bundles plugin. The HTML markup is:
+ * <ul class="icons ui-widget">
+ * <li class="dynhover" title="tooltip comes here"><span class="ui-icon ui-icon-refresh"> </span></li>
+ * </ul>
+ */
+ul.icons {
+ margin: 0;
+ padding: 0
+}
+ul.icons span.ui-icon {
+ float: left;
+ margin: 0 1px
+}
+ul.icons li {
+ margin: 1px;
+ position: relative;
+ padding: 1px 0;
+ cursor: pointer;
+ float: left;
+ list-style: none
+}