Changeset 4220 for vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/BasePage.java

Timestamp:

01/07/14 11:05:14 (10 years ago)

Author:

twagoo

Message:

Merged twagoo branch of to-wicket-1.6 back to original, removed this branch

Location:

vlo/branches/to-wicket-1.6

Files:

• . (modified) (1 prop)
• vlo_web_app (modified) (1 prop)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/BasePage.java (modified) (2 diffs)

vlo/branches/to-wicket-1.6/vlo_web_app

@@ -1 +1 @@
 target
+vlo-importer.log*

@@ -1 +1 @@
 target
+vlo-importer.log*

vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/BasePage.java

@@ -4 +4 @@
 import eu.clarin.cmdi.vlo.VloSession;
 import eu.clarin.cmdi.vlo.VloPageParameters;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.markup.html.IHeaderContributor;
-import org.apache.wicket.markup.html.IHeaderResponse;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
@@ -100 +101 @@
      */
     public void renderHead(IHeaderResponse response) {
-
-        response.renderCSSReference(((VloSession) getSession()).getCurrentTheme().cssFile);
-    }
-    
+        response.render(CssHeaderItem.forUrl(((VloSession) getSession()).getCurrentTheme().cssFile));
+    }    
 }

@@ -1 +1 @@
 target
+vlo-importer.log*