You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cm...@apache.org on 2011/08/15 13:32:47 UTC
svn commit: r1157784 - in /karaf/sandbox/pieber/karaf-webconsole/trunk:
core/src/main/java/org/apache/karaf/webconsole/core/
core/src/main/resources/org/apache/karaf/webconsole/
core/src/main/resources/org/apache/karaf/webconsole/core/ core/src/main/re...
Author: cmoulliard
Date: Mon Aug 15 11:32:46 2011
New Revision: 1157784
URL: http://svn.apache.org/viewvc?rev=1157784&view=rev
Log:
Add Locale for FeaturesPage, french and english flags in BasePage
Added:
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage2.java
- copied, changed from r1157173, 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/resources/org/apache/karaf/webconsole/core/BasePage2.html
- copied unchanged from r1157173, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/BasePage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/english-flag.jpeg (with props)
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/french-flag.jpeg (with props)
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/french-flag.png (with props)
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.properties
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_fr.properties
Removed:
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/BasePage.html
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/resources/org/apache/karaf/webconsole/core/BasePage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesConsoleTab.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.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=1157784&r1=1157783&r2=1157784&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 Mon Aug 15 11:32:46 2011
@@ -1,15 +1,20 @@
package org.apache.karaf.webconsole.core;
-import java.util.Collections;
-import java.util.List;
-
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.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.link.PageLink;
import org.apache.wicket.model.util.ListModel;
import org.ops4j.pax.wicket.api.PaxWicketBean;
+import sun.awt.util.IdentityLinkedList;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
public class BasePage extends WebPage {
@@ -24,6 +29,27 @@ 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 NavigationPanel("navigationPanel", new ListModel<ConsoleTab>(tabs)));
List<Class> subPages = getSubPages();
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage2.java (from r1157173, 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/BasePage2.java?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage2.java&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java&r1=1157173&r2=1157784&rev=1157784&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/BasePage2.java Mon Aug 15 11:32:46 2011
@@ -1,41 +1,69 @@
package org.apache.karaf.webconsole.core;
-import java.util.Collections;
-import java.util.List;
-
import org.apache.wicket.ResourceReference;
+import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
+import org.apache.wicket.extensions.markup.html.tabs.TabbedPanel;
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.model.util.ListModel;
+import org.apache.wicket.markup.html.link.PageLink;
+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.Model;
import org.ops4j.pax.wicket.api.PaxWicketBean;
-public class BasePage extends WebPage {
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+public class BasePage2 extends WebPage {
@PaxWicketBean(name = "tabs")
private List<ConsoleTab> tabs;
- public BasePage() {
- add(CSSPackageResource.getHeaderContribution(BasePage.class, "style.css"));
- add(CSSPackageResource.getHeaderContribution(BasePage.class, "grid.css"));
+ public BasePage2() {
+ add(CSSPackageResource.getHeaderContribution(BasePage2.class, "style.css"));
+ add(CSSPackageResource.getHeaderContribution(BasePage2.class, "grid.css"));
add(new Label("footer", "Apache Karaf Console"));
- add(new Image("karafLogo", new ResourceReference(BasePage.class, "images/karaf-logo.png")));
+ add(new Image("karafLogo", new ResourceReference(BasePage2.class, "images/karaf-logo.png")));
- add(new NavigationPanel("navigationPanel", new ListModel<ConsoleTab>(tabs)));
+ add(new ListView<ConsoleTab>("tabs", tabs) {
+ @Override
+ protected void populateItem(ListItem<ConsoleTab> item) {
+ final ConsoleTab tab = item.getModelObject();
+ item.add(new PageLink("moduleLink", tab.getModuleHomePage()).add(new Label("moduleLabel", tab.getLabel())));
+
+ List<String> subItems = new LinkedList<String>(tab.getItems().keySet());
+ item.add(new ListView<String>("topLinks", subItems) {
+ @Override
+ protected void populateItem(ListItem<String> item) {
+ String subItem = item.getModelObject();
+ item.add(new PageLink("topLink", tab.getItems().get(subItem)).add(new Label("linkLabel", subItem)));
+ }
+ });
+ }
+ });
+
+ List tabPanels = new ArrayList();
+ tabPanels.add(new AbstractTab(new Model("first tab")) {
+ public Panel getPanel(String panelId) {
+ return new TabPanel1(panelId);
+ }
+ });
+
+ add(new TabbedPanel("tabPanels", tabPanels));
- 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();
+
+ class TabPanel1 extends Panel {
+ public TabPanel1(String id) {
+ super(id);
+ }
}
}
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=1157784&r1=1157783&r2=1157784&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 Mon Aug 15 11:32:46 2011
@@ -13,20 +13,30 @@
</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>
+
<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" wicket:id="content">
+
+ <div class="grid_9">
<wicket:child />
</div>
+
<div class="clear"></div>
<div class="grid_12">
Added: 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.jpeg?rev=1157784&view=auto
==============================================================================
Binary file - no diff available.
Propchange: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/english-flag.jpeg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/french-flag.jpeg
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/french-flag.jpeg?rev=1157784&view=auto
==============================================================================
Binary file - no diff available.
Propchange: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/french-flag.jpeg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/french-flag.png
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/french-flag.png?rev=1157784&view=auto
==============================================================================
Binary file - no diff available.
Propchange: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/french-flag.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesConsoleTab.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesConsoleTab.java?rev=1157784&r1=1157783&r2=1157784&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesConsoleTab.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesConsoleTab.java Mon Aug 15 11:32:46 2011
@@ -17,6 +17,7 @@ public class FeaturesConsoleTab implemen
return FeaturesPage.class;
}
+ //new ResourceModel("features.console.list").getObject().toString()
public Map<String, Class> getItems() {
Map<String, Class> features = new HashMap<String, Class>();
features.put("Features list", FeaturesPage.class);
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.java?rev=1157784&r1=1157783&r2=1157784&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.java Mon Aug 15 11:32:46 2011
@@ -10,6 +10,7 @@ import org.apache.wicket.extensions.mark
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.StringResourceModel;
import org.ops4j.pax.wicket.api.PaxWicketBean;
import java.util.*;
@@ -45,37 +46,18 @@ public class FeaturesPage extends BasePa
}
}
-/* add(new ListView<ExtendedFeature>("features", model) {
- @Override
- protected void populateItem(ListItem<ExtendedFeature> item) {
- final ExtendedFeature feature = item.getModelObject();
- item.add(new Label("state", feature.getState().toString()));
- item.add(new Label("version", feature.getVersion()));
- item.add(new Label("name", feature.getName()));
- item.add(new Label("repository", feature.getRepository()));
- item.add(new Label("description", feature.getDescription()));
-
- item.add(new Link("featuresDetailsPageLink") {
- @Override
- public void onClick() {
- PageParameters params = new PageParameters();
- params.put("featureId", feature.getId());
- }
- });
- }
- });*/
+ IModel state = Model.of("state");
+ IModel version = Model.of("version");
+ IModel name = Model.of("name");
+ IModel repository = Model.of("repository");
+ IModel description = Model.of("description");
List<IColumn<ExtendedFeature>> columns = new ArrayList<IColumn<ExtendedFeature>>();
- columns.add(new PropertyColumn<ExtendedFeature>(Model.of("state"), "state",
- "state"));
- columns.add(new PropertyColumn<ExtendedFeature>(Model.of("version"), "version",
- "version"));
- columns.add(new PropertyColumn<ExtendedFeature>(Model.of("name"), "name",
- "name"));
- columns.add(new PropertyColumn<ExtendedFeature>(Model.of("repository"), "repository",
- "repository"));
- columns.add(new PropertyColumn<ExtendedFeature>(Model.of("description"), "description",
- "description"));
+ columns.add(new PropertyColumn<ExtendedFeature>(new StringResourceModel("table.state",this,state),"state","state"));
+ columns.add(new PropertyColumn<ExtendedFeature>(new StringResourceModel("table.version",this,version),"version","version"));
+ columns.add(new PropertyColumn<ExtendedFeature>(new StringResourceModel("table.name",this,state),"name","name"));
+ columns.add(new PropertyColumn<ExtendedFeature>(new StringResourceModel("table.repository",this,repository),"repository","repository"));
+ columns.add(new PropertyColumn<ExtendedFeature>(new StringResourceModel("table.description",this,description),"description","description"));
add(new DefaultDataTable<ExtendedFeature>("features", columns,
new FeaturesProvider(model), 20));
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.properties
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.properties?rev=1157784&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.properties (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.properties Mon Aug 15 11:32:46 2011
@@ -0,0 +1,6 @@
+# Features properties
+table.state = state
+table.name = Name
+table.version = Version
+table.repository = Repository
+table.description = Description
\ No newline at end of file
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_fr.properties
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_fr.properties?rev=1157784&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_fr.properties (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_fr.properties Mon Aug 15 11:32:46 2011
@@ -0,0 +1,6 @@
+# Proprits des Features
+table.state = Etat
+table.name = Nom
+table.version = Version
+table.repository = Repertoire
+table.description = Description
\ No newline at end of file