You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ld...@apache.org on 2011/08/16 22:51:29 UTC
svn commit: r1158443 - in /karaf/sandbox/pieber/karaf-webconsole/trunk:
core/src/main/java/org/apache/karaf/webconsole/core/
core/src/main/java/org/apache/karaf/webconsole/core/internal/
core/src/main/resources/org/apache/karaf/webconsole/core/ core/sr...
Author: ldywicki
Date: Tue Aug 16 20:51:28 2011
New Revision: 1158443
URL: http://svn.apache.org/viewvc?rev=1158443&view=rev
Log:
Move Language selection links to LanuagePanel. Clean up of sidebar stuff - introduction of SidebarPage
Added:
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/SidebarPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/LanguagePanel.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SidebarPanel.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/SidebarPage.html
- copied, changed from r1158098, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/BasePage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/english-flag.png
- copied, changed from r1158098, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/english-flag.jpeg
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/LanguagePanel.html
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/SidebarPanel.html
- copied, changed from r1158098, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/SidebarPanel.html
Removed:
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/SidebarPanel.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/SidebarPanel.html
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/english-flag.jpeg
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/french-flag.jpeg
Modified:
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/BasePage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/style.css
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/HomePage.java
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java?rev=1158443&r1=1158442&r2=1158443&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java Tue Aug 16 20:51:28 2011
@@ -1,15 +1,16 @@
package org.apache.karaf.webconsole.core;
-import java.util.Collections;
+import java.util.Arrays;
import java.util.List;
import java.util.Locale;
+import org.apache.karaf.webconsole.core.internal.LanguagePanel;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.html.CSSPackageResource;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.image.Image;
-import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.util.ListModel;
import org.ops4j.pax.wicket.api.PaxWicketBean;
@@ -18,6 +19,9 @@ public class BasePage extends WebPage {
@PaxWicketBean(name = "tabs")
private List<ConsoleTab> tabs;
+ // list of supported Locales - should be replaced by resolver/detector or something similar
+ private IModel<List<Locale>> supportedLocales = new ListModel<Locale>(Arrays.asList(Locale.FRENCH, Locale.ENGLISH));
+
public BasePage() {
add(CSSPackageResource.getHeaderContribution(BasePage.class, "style.css"));
add(CSSPackageResource.getHeaderContribution(BasePage.class, "grid.css"));
@@ -26,39 +30,9 @@ public class BasePage extends WebPage {
add(new Image("karafLogo", new ResourceReference(BasePage.class, "images/karaf-logo.png")));
- Link linkFr = new Link("goFrench") {
- @Override
- public void onClick() {
- getSession().setLocale(Locale.FRANCE);
- }
- };
-
- Link linkEn = new Link("goEnglish") {
- @Override
- public void onClick() {
- getSession().setLocale(Locale.ENGLISH);
- }
- };
-
-
- add(linkFr);
- linkFr.add(new Image("frenchFlag", new ResourceReference(BasePage.class, "images/french-flag.jpeg")));
-
- add(linkEn);
- linkEn.add(new Image("englishFlag", new ResourceReference(BasePage.class, "images/english-flag.jpeg")));
+ add(new LanguagePanel("languagePanel", supportedLocales));
add(new NavigationPanel("navigationPanel", new ListModel<ConsoleTab>(tabs)));
-
- List<Class> subPages = getSubPages();
- if (subPages != null && subPages.size() > 0) {
- add(new SidebarPanel("sidebar", getClass(), subPages));
- } else {
- add(new Label("sidebar").setRenderBodyOnly(true));
- }
- }
-
- protected List<Class> getSubPages() {
- return Collections.emptyList();
}
}
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java?rev=1158443&r1=1158442&r2=1158443&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java Tue Aug 16 20:51:28 2011
@@ -1,5 +1,8 @@
package org.apache.karaf.webconsole.core;
+import java.util.LinkedList;
+import java.util.List;
+
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.list.ListItem;
@@ -8,9 +11,6 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.ResourceModel;
-import java.util.LinkedList;
-import java.util.List;
-
public class NavigationPanel extends Panel {
public NavigationPanel(String id, IModel<List<ConsoleTab>> model) {
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/SidebarPage.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/SidebarPage.java?rev=1158443&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/SidebarPage.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/SidebarPage.java Tue Aug 16 20:51:28 2011
@@ -0,0 +1,22 @@
+package org.apache.karaf.webconsole.core;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.karaf.webconsole.core.internal.SidebarPanel;
+import org.apache.wicket.Page;
+import org.apache.wicket.model.util.ListModel;
+
+public class SidebarPage extends BasePage {
+
+ public SidebarPage() {
+ ListModel<Class<? extends Page>> listModel = new ListModel<Class<? extends Page>>(getSubPages());
+
+ add(new SidebarPanel("sidebar", getClass(), listModel));
+ }
+
+ protected List<Class<? extends Page>> getSubPages() {
+ return Collections.emptyList();
+ }
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/LanguagePanel.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/LanguagePanel.java?rev=1158443&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/LanguagePanel.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/LanguagePanel.java Tue Aug 16 20:51:28 2011
@@ -0,0 +1,36 @@
+package org.apache.karaf.webconsole.core.internal;
+
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.karaf.webconsole.core.BasePage;
+import org.apache.wicket.ResourceReference;
+import org.apache.wicket.markup.html.image.Image;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+
+public class LanguagePanel extends Panel {
+
+ public LanguagePanel(String id, IModel<List<Locale>> locales) {
+ super(id);
+
+ add(new ListView<Locale>("languages", locales) {
+ @Override
+ protected void populateItem(final ListItem<Locale> item) {
+ final Locale model = item.getModelObject();
+ Image flagImage = new Image("flag", new ResourceReference(BasePage.class, "images/" + model.getDisplayName(Locale.ENGLISH).toLowerCase() + "-flag.png"));
+ Link<Void> link = new Link<Void>("languageLink") {
+ @Override
+ public void onClick() {
+ getSession().setLocale(model);
+ }
+ };
+ item.add(link.add(flagImage));
+ }
+ });
+ }
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SidebarPanel.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SidebarPanel.java?rev=1158443&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SidebarPanel.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SidebarPanel.java Tue Aug 16 20:51:28 2011
@@ -0,0 +1,28 @@
+package org.apache.karaf.webconsole.core.internal;
+
+import org.apache.wicket.Page;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.util.ListModel;
+
+public class SidebarPanel extends Panel {
+
+ public SidebarPanel(String id, Class<? extends Page> basePage, ListModel<Class<? extends Page>> listModel) {
+ super(id, listModel);
+
+ add(new BookmarkablePageLink<Page>("masterPageLink", basePage).add(new Label("masterPageLabel", basePage.getName())));
+
+ add(new ListView<Class<? extends Page>>("subPageLinks", listModel) {
+ @Override
+ protected void populateItem(ListItem<Class<? extends Page>> item) {
+ BookmarkablePageLink<Page> link = new BookmarkablePageLink<Page>("subPageLink", item.getModelObject());
+ link.add(new Label("subPageLabel", item.getModelObject().getName()));
+ item.add(link);
+ }
+ });
+ }
+
+}
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/BasePage.html
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/BasePage.html?rev=1158443&r1=1158442&r2=1158443&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/BasePage.html (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/BasePage.html Tue Aug 16 20:51:28 2011
@@ -13,30 +13,19 @@
</div>
<div class="grid_9">
<h3>Administration console</h3>
- <a href="#" wicket:id="goFrench">
- <img wicket:id="frenchFlag" alt="french flag" height="14" width="20" />
- </a>
- <a href="#" wicket:id="goEnglish">
- <img wicket:id="englishFlag" alt="english flag" height="14" width="20" />
- </a>
+
+ <div wicket:id="languagePanel" id="languages">Languages go here</div>
</div>
<div class="clear"></div>
-
<div class="grid_12">
<div wicket:id="navigationPanel">Navigation goes here</div>
</div>
<div class="clear"></div>
-
- <div class="grid_3">
- <div wicket:id="sidebar">Sidebar goes here</div>
- </div>
-
- <div class="grid_9">
+ <div class="grid_12">
<wicket:child />
</div>
-
<div class="clear"></div>
<div class="grid_12">
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/SidebarPage.html (from r1158098, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/BasePage.html)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/SidebarPage.html?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/SidebarPage.html&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/BasePage.html&r1=1158098&r2=1158443&rev=1158443&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/BasePage.html (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/SidebarPage.html Tue Aug 16 20:51:28 2011
@@ -13,12 +13,8 @@
</div>
<div class="grid_9">
<h3>Administration console</h3>
- <a href="#" wicket:id="goFrench">
- <img wicket:id="frenchFlag" alt="french flag" height="14" width="20" />
- </a>
- <a href="#" wicket:id="goEnglish">
- <img wicket:id="englishFlag" alt="english flag" height="14" width="20" />
- </a>
+
+ <div wicket:id="languagePanel" id="languages">Languages go here</div>
</div>
<div class="clear"></div>
@@ -28,15 +24,12 @@
</div>
<div class="clear"></div>
-
<div class="grid_3">
<div wicket:id="sidebar">Sidebar goes here</div>
</div>
-
<div class="grid_9">
<wicket:child />
</div>
-
<div class="clear"></div>
<div class="grid_12">
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/english-flag.png (from r1158098, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/english-flag.jpeg)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/english-flag.png?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/english-flag.png&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/english-flag.jpeg&r1=1158098&r2=1158443&rev=1158443&view=diff
==============================================================================
Binary files - no diff available.
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/LanguagePanel.html
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/LanguagePanel.html?rev=1158443&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/LanguagePanel.html (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/LanguagePanel.html Tue Aug 16 20:51:28 2011
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Karaf wicket console</title>
+</head>
+<body>
+
+ <wicket:panel>
+ <ul>
+ <li wicket:id="languages">
+ <a href="#" wicket:id="languageLink">
+ <img wicket:id="flag" alt="flag" height="14" width="20" />
+ </a>
+ </li>
+ </ul>
+ </wicket:panel>
+
+</body>
+</html>
\ No newline at end of file
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/SidebarPanel.html (from r1158098, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/SidebarPanel.html)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/SidebarPanel.html?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/SidebarPanel.html&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/SidebarPanel.html&r1=1158098&r2=1158443&rev=1158443&view=diff
==============================================================================
(empty)
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/style.css
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/style.css?rev=1158443&r1=1158442&r2=1158443&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/style.css (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/style.css Tue Aug 16 20:51:28 2011
@@ -30,10 +30,14 @@ div.widget {
width: 250px;
}
-#sidebar ul li {
+#sidebar ul li, #languages ul li {
list-style-type: none;
}
+#languages ul li {
+ display: inline;
+}
+
#topmenu ul li, #top-panel ul li {
display: inline;
}
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/HomePage.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/HomePage.java?rev=1158443&r1=1158442&r2=1158443&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/HomePage.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/HomePage.java Tue Aug 16 20:51:28 2011
@@ -5,12 +5,12 @@ import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
-import org.apache.karaf.webconsole.core.BasePage;
+import org.apache.karaf.webconsole.core.SidebarPage;
+import org.apache.wicket.Page;
import org.apache.wicket.PageParameters;
import org.apache.wicket.behavior.SimpleAttributeModifier;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.ops4j.pax.wicket.api.PaxWicketBean;
@@ -22,7 +22,7 @@ import org.osgi.service.startlevel.Start
/**
* Homepage
*/
-public class HomePage extends BasePage {
+public class HomePage extends SidebarPage {
@PaxWicketBean(name = "blueprintBundleContext")
private BundleContext context;
@@ -153,8 +153,8 @@ public class HomePage extends BasePage {
}
@Override
- protected List<Class> getSubPages() {
- List<Class> subpages = new LinkedList<Class>();
+ protected List<Class<? extends Page>> getSubPages() {
+ List<Class<? extends Page>> subpages = new LinkedList<Class<? extends Page>>();
subpages.add(ConfigurationsPage.class);
subpages.add(EventsPage.class);
return subpages;