Repository: karaf Updated Branches: refs/heads/master 426ca061f -> 9396b2813
[KARAF-2931] Fix webconsole plugins and CSS Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9396b281 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9396b281 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9396b281 Branch: refs/heads/master Commit: 9396b2813de8482b35335f51cd97abc762f5e5f1 Parents: 426ca06 Author: Guillaume Nodet <gno...@gmail.com> Authored: Wed Apr 23 20:39:30 2014 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Wed Apr 23 20:40:34 2014 +0200 ---------------------------------------------------------------------- .../main/resources/res/karaf/ui/webconsole.css | 30 ++++++++++++++++---- .../webconsole/features/FeaturesPlugin.java | 5 +++- .../karaf/webconsole/gogo/GogoPlugin.java | 2 +- .../karaf/webconsole/http/HttpPlugin.java | 2 +- .../webconsole/instance/InstancePlugin.java | 2 +- 5 files changed, 31 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/9396b281/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css ---------------------------------------------------------------------- diff --git a/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css b/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css index a31e6bc..03fa9dd 100644 --- a/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css +++ b/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css @@ -66,6 +66,24 @@ white-space: nowrap; } +/* New Category Based Navigation Tree (FELIX-3769) */ +#navmenu { + width: auto; +} + +#navmenu li.ui-menu-item { + width: auto; +} + +#navmenu li.navMenuItem-0 { + display: inline-block; +} + +/* Don't display caret on top-level menu (FELIX-3841) */ +#navmenu li.navMenuItem-0 > a > span { + display: none; +} + /* CENTRAL CONTENT AREA STYLING */ #content, .ui-widget, .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-size: 8pt } @@ -119,16 +137,16 @@ table.nicetable th, table.nicetable td { /* tablesorter styling */ tr .header { - background-image: url(../lib/bg.gif); - background-repeat: no-repeat; - background-position: center right; - cursor: pointer; + background-image: url(../lib/bg.gif) !important; + background-repeat: no-repeat !important; + background-position: center right !important; + cursor: pointer !important; } tr .headerSortUp { - background-image: url(../lib/asc.gif); + background-image: url(../lib/asc.gif) !important; } tr .headerSortDown { - background-image: url(../lib/desc.gif); + background-image: url(../lib/desc.gif) !important; } /* status line */ http://git-wip-us.apache.org/repos/asf/karaf/blob/9396b281/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java ---------------------------------------------------------------------- diff --git a/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java b/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java index 8e0af3a..2a291f5 100644 --- a/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java +++ b/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java @@ -58,7 +58,7 @@ public class FeaturesPlugin extends AbstractWebConsolePlugin { @Override protected boolean isHtmlRequest(HttpServletRequest request) { - return false; + return true; } public void start() { @@ -272,6 +272,9 @@ public class FeaturesPlugin extends AbstractWebConsolePlugin { jw.array(); for (Repository r : repositories) { jw.object(); + jw.key("name"); + String name = r.getName(); + jw.value(name); jw.key("url"); String uri = r.getURI().toString(); jw.value(uri); http://git-wip-us.apache.org/repos/asf/karaf/blob/9396b281/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java ---------------------------------------------------------------------- diff --git a/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java b/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java index 393c13a..e6e826b 100644 --- a/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java +++ b/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java @@ -65,7 +65,7 @@ public class GogoPlugin extends AbstractWebConsolePlugin { @Override protected boolean isHtmlRequest(HttpServletRequest request) { - return false; + return true; } public void setBundleContext(BundleContext bundleContext) { http://git-wip-us.apache.org/repos/asf/karaf/blob/9396b281/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java ---------------------------------------------------------------------- diff --git a/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java b/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java index 1af7033..9dae1bd 100644 --- a/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java +++ b/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java @@ -60,7 +60,7 @@ public class HttpPlugin extends AbstractWebConsolePlugin { @Override protected boolean isHtmlRequest(HttpServletRequest request) { - return false; + return true; } public void start() { http://git-wip-us.apache.org/repos/asf/karaf/blob/9396b281/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java ---------------------------------------------------------------------- diff --git a/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java b/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java index fda63de..9752dcb 100644 --- a/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java +++ b/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java @@ -55,7 +55,7 @@ public class InstancePlugin extends AbstractWebConsolePlugin { @Override protected boolean isHtmlRequest(HttpServletRequest request) { - return false; + return true; } public void start() {
