svn commit: r1239538 - in /karaf/webconsole/trunk/core/src/main: java/org/apache/karaf/webconsole/core/ java/org/apache/karaf/webconsole/core/behavior/ java/org/apache/karaf/webconsole/core/brand/ resources/org/apache/karaf/webconsole/core/behavior/for...

[ldywicki]

Author: ldywicki
Date: Thu Feb  2 11:13:33 2012
New Revision: 1239538

URL: http://svn.apache.org/viewvc?rev=1239538&view=rev
Log:
Remove formalize behavior, remove all styling stuff from BasePage and move it 
to brand provider.

Removed:
    
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/behavior/FormalizeBehavior.java
    
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/formalize/formalize.css
    
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/formalize/jquery.formalize-b9528e8.min.js
Modified:
    
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
    
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java?rev=1239538&r1=1239537&r2=1239538&view=diff
==============================================================================
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 Thu Feb  2 11:13:33 2012
@@ -24,7 +24,6 @@ import org.apache.karaf.webconsole.core.
 import org.apache.karaf.webconsole.core.dashboard.DashboardPage;
 import org.apache.karaf.webconsole.core.internal.LanguagePanel;
 import org.apache.wicket.behavior.IBehavior;
-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.link.BookmarkablePageLink;
@@ -47,12 +46,8 @@ public class BasePage extends WebPage {
     // 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));
 
-    @SuppressWarnings("serial")
     public BasePage() {
-        add(CSSPackageResource.getHeaderContribution(BasePage.class, 
"style.css"));
-        add(CSSPackageResource.getHeaderContribution(BasePage.class, 
"grid.css"));
-
-        Link homeLink = new BookmarkablePageLink("homeLink", 
DashboardPage.class);
+        Link<DashboardPage> homeLink = new 
BookmarkablePageLink<DashboardPage>("homeLink", DashboardPage.class);
         homeLink.add(brandProvider.getHeaderImage("logo"));
         add(homeLink);
 

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java?rev=1239538&r1=1239537&r2=1239538&view=diff
==============================================================================
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
 Thu Feb  2 11:13:33 2012
@@ -21,11 +21,11 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.karaf.webconsole.core.BasePage;
-import org.apache.karaf.webconsole.core.behavior.FormalizeBehavior;
 import org.apache.wicket.Page;
 import org.apache.wicket.ResourceReference;
 import org.apache.wicket.behavior.IBehavior;
 import org.apache.wicket.behavior.SimpleAttributeModifier;
+import org.apache.wicket.markup.html.CSSPackageResource;
 import org.apache.wicket.markup.html.image.Image;
 
 public class DefaultBrandProvider implements BrandProvider, Serializable /* 
for tests mainly */ {
@@ -44,7 +44,8 @@ public class DefaultBrandProvider implem
     }
 
     public void modify(Page page) {
-        page.add(new FormalizeBehavior());
+        page.add(CSSPackageResource.getHeaderContribution(BasePage.class, 
"style.css"));
+        page.add(CSSPackageResource.getHeaderContribution(BasePage.class, 
"grid.css"));
     }
 
 }