Author: mattmann
Date: Mon Aug 24 05:09:51 2015
New Revision: 1697315
URL: http://svn.apache.org/r1697315
Log:
- OODT-842 WIP
- make skinnable
- add breadcrumbs and HomePage link logic.
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.java
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/WorkbenchPage.java
oodt/trunk/curator/webapp/src/main/webapp/META-INF/context.xml
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java?rev=1697315&r1=1697314&r2=1697315&view=diff
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
(original)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
Mon Aug 24 05:09:51 2015
@@ -42,6 +42,8 @@ public class CurationApp extends WebAppl
public static final String SSO_IMPL_CLASS =
"org.apache.oodt.security.sso.implClass";
public static final String CURATOR_HOMEPAGE = "curator.homepage";
+
+ public static final String CURATOR_SKIN = "org.apache.oodt.cas.curator.skin";
/*
* (non-Javadoc)
@@ -91,6 +93,10 @@ public class CurationApp extends WebAppl
public String getSSOImplClass() {
return getServletContext().getInitParameter(SSO_IMPL_CLASS);
}
+
+ public String getSkin(){
+ return getServletContext().getInitParameter(CURATOR_SKIN);
+ }
/*
* (non-Javadoc)
@@ -101,7 +107,11 @@ public class CurationApp extends WebAppl
*/
@Override
public Session newSession(Request request, Response response) {
- System.out.println("CALLED!");
+ CurationSession session = new CurationSession(request);
+ String skin = getSkin();
+ if (skin != null && !skin.equals("")){
+ session.setStyle(skin);
+ }
return new CurationSession(request);
}
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html?rev=1697315&r1=1697314&r2=1697315&view=diff
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
(original)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
Mon Aug 24 05:09:51 2015
@@ -45,7 +45,7 @@
<!-- Breadcrumbs Area -->
<div id="breadcrumbs">
<div style="margin-left: 10px;padding-left: 10px;">
- <a href="#" style="color:black;">Home</a> > Main
+ <a href="#" style="color:black;" wicket:id="home_link">Home</a> >
<span style="color:black;" wicket:id="crumb_name">Main</span>
</div>
</div>
</div>
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java?rev=1697315&r1=1697314&r2=1697315&view=diff
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java
(original)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java
Mon Aug 24 05:09:51 2015
@@ -18,6 +18,7 @@
package org.apache.oodt.cas.curation;
import org.apache.oodt.cas.curation.login.LoginPage;
+import org.apache.oodt.cas.curation.workbench.WorkbenchPage;
import org.apache.wicket.Application;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
@@ -77,6 +78,13 @@ public class HomePage extends WebPage {
String projectName = app.getProjectName() + " CAS Curation";
add(new Label("project_name", projectName));
+ add(new Label("crumb_name", "Main"));
+ add(new Link<String>("home_link"){
+ @Override
+ public void onClick() {
+ setResponsePage(WorkbenchPage.class);
+ }
+ });
}
}
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.java?rev=1697315&r1=1697314&r2=1697315&view=diff
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.java
(original)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.java
Mon Aug 24 05:09:51 2015
@@ -52,6 +52,7 @@ public class LoginPage extends HomePage
String action = parameters.getString("action");
String appNameString = app.getProjectName()+" CAS Curation Interface";
add(new Label("login_project_name", appNameString));
+ replace(new Label("crumb_name", "Login"));
final WebMarkupContainer creds = new WebMarkupContainer("invalid_creds");
final WebMarkupContainer connect = new WebMarkupContainer("connect_error");
creds.setVisible(false);
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/WorkbenchPage.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/WorkbenchPage.java?rev=1697315&r1=1697314&r2=1697315&view=diff
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/WorkbenchPage.java
(original)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/WorkbenchPage.java
Mon Aug 24 05:09:51 2015
@@ -22,6 +22,7 @@ import org.apache.oodt.cas.curation.Home
import org.apache.oodt.cas.curation.login.LoginPage;
import org.apache.oodt.cas.webcomponents.curation.workbench.Workbench;
import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.basic.Label;
public class WorkbenchPage extends HomePage {
@@ -38,6 +39,7 @@ public class WorkbenchPage extends HomeP
add(new Workbench(
"curator_workbench"));
+ replace(new Label("crumb_name", "Workbench"));
}
Modified: oodt/trunk/curator/webapp/src/main/webapp/META-INF/context.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/webapp/META-INF/context.xml?rev=1697315&r1=1697314&r2=1697315&view=diff
==============================================================================
--- oodt/trunk/curator/webapp/src/main/webapp/META-INF/context.xml (original)
+++ oodt/trunk/curator/webapp/src/main/webapp/META-INF/context.xml Mon Aug 24
05:09:51 2015
@@ -45,6 +45,9 @@ the License.
<Parameter name="org.apache.oodt.cas.curator.metExtension"
value=".met"/>
+ <Parameter name="org.apache.oodt.cas.curator.skin"
+ value=""/>
+
<Parameter name="org.apache.oodt.cas.fm.url"
value="[FILEMGR_URL]"/>
<Parameter name="org.apache.oodt.cas.curator.catalogFactoryClass"
