You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2011/11/09 06:56:00 UTC
svn commit: r1199621 - in /oodt/trunk/pcs/opsui/src/main:
java/org/apache/oodt/pcs/opsui/ webapp/META-INF/
Author: mattmann
Date: Wed Nov 9 05:56:00 2011
New Revision: 1199621
URL: http://svn.apache.org/viewvc?rev=1199621&view=rev
Log:
- OODT-157: make the OPSUI totally skinnable, controlled by 2 parameters:
opsui.skin, currently can be "" blank, the default skin, or "classic", a throwback to the OCO OPSUI skin
opsui.homepage, should be set to a fully qualified class name of the Wicket Page class to use as the Home page link. In classic mode,
this should be set to org.apache.oodt.pcs.opsui.StatusPage
Added:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.js
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.css
- copied unchanged from r1199375, oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/SplashPage.css
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.html
- copied, changed from r1199384, oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/SplashPage.html
Removed:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/Home.html
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/SplashPage.css
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/SplashPage.html
Modified:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
oodt/trunk/pcs/opsui/src/main/webapp/META-INF/context.xml
Modified: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.java?rev=1199621&r1=1199620&r2=1199621&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.java (original)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.java Wed Nov 9 05:56:00 2011
@@ -45,7 +45,7 @@ public class BasePage extends WebPage {
*/
@Override
public void onClick() {
- setResponsePage(HomePage.class);
+ setResponsePage(app.getHomePage());
}
});
Added: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.js
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.js?rev=1199621&view=auto
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.js (added)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.js Wed Nov 9 05:56:00 2011
@@ -0,0 +1 @@
+// Apache OODT OPSUI JS
\ No newline at end of file
Copied: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.html (from r1199384, oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/SplashPage.html)
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.html?p2=oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.html&p1=oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/SplashPage.html&r1=1199384&r2=1199621&rev=1199621&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/SplashPage.html (original)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.html Wed Nov 9 05:56:00 2011
@@ -3,7 +3,7 @@
<head>
<title>Apache OODT PCS Operator Interface</title>
<wicket:link>
- <link type="text/css" rel="stylesheet" href="SplashPage.css"/>
+ <link type="text/css" rel="stylesheet" href="HomePage.css"/>
</wicket:link>
</head>
<body>
@@ -29,7 +29,7 @@
Resource Monitor
</span>
</a>
- <a href="#" id="config_link">
+ <a href="#" id="ganglia_link" wicket:id="ganglia_link">
<span>
Configuration
</span>
@@ -46,17 +46,11 @@
-
-<h3>Welcome to the Apache OODT PCS Operator Interface!</h3>
-
-
<div id="footer">
<p id="powered">Powered by <a href="http://oodt.apache.org/">Apache OODT</a></p>
</div>
-
-
</body>
</html>
Modified: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.java?rev=1199621&r1=1199620&r2=1199621&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.java (original)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.java Wed Nov 9 05:56:00 2011
@@ -19,7 +19,11 @@
package org.apache.oodt.pcs.opsui;
//Wicket imports
+import org.apache.oodt.pcs.opsui.status.StatusPage;
import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.link.ExternalLink;
+import org.apache.wicket.markup.html.link.Link;
/**
*
@@ -29,9 +33,49 @@ import org.apache.wicket.PageParameters;
* @version $Revision$
*
*/
-public class HomePage extends SplashPage {
+public class HomePage extends WebPage {
+ protected OpsuiApp app;
+
public HomePage(PageParameters parameters){
- super(parameters);
+ this.app = (OpsuiApp)getApplication();
+
+ add(new Link("fmbrowser_link"){
+ /* (non-Javadoc)
+ * @see org.apache.wicket.markup.html.link.Link#onClick()
+ */
+ @Override
+ public void onClick() {
+ setResponsePage(TypesPage.class);
+ }
+ });
+
+ add(new Link("pcsstatus_link"){
+
+ /* (non-Javadoc)
+ * @see org.apache.wicket.markup.html.link.Link#onClick()
+ */
+ @Override
+ public void onClick() {
+ setResponsePage(StatusPage.class);
+
+ }
+ });
+
+ add(new Link("wmonitor_link"){
+ /* (non-Javadoc)
+ * @see org.apache.wicket.markup.html.link.Link#onClick()
+ */
+ @Override
+ public void onClick() {
+ PageParameters params = new PageParameters();
+ params.add("status", "ALL");
+ params.add("pageNum", "1");
+ setResponsePage(WorkflowInstanceViewerPage.class, params);
+
+ }
+ });
+
+ add(new ExternalLink("ganglia_link", app.getGangliaUrl()));
}
}
Modified: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java?rev=1199621&r1=1199620&r2=1199621&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java (original)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java Wed Nov 9 05:56:00 2011
@@ -94,7 +94,12 @@ public class OpsuiApp extends WebApplica
*/
@Override
public Class<? extends Page> getHomePage() {
- return StatusPage.class;
+ try {
+ return (Class<? extends Page>) Class.forName(getHomePageClass());
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ return HomePage.class;
+ }
}
public String getFmUrlStr() {
@@ -135,6 +140,14 @@ public class OpsuiApp extends WebApplica
return PathUtils.replaceEnvVariables(getServletContext().getInitParameter(
"ganglia.url"));
}
+
+ public String getSkin(){
+ return getServletContext().getInitParameter("opsui.skin");
+ }
+
+ public String getHomePageClass(){
+ return getServletContext().getInitParameter("opsui.homepage");
+ }
public List<String> getWorkflowInstStatues() {
String[] statuses = getServletContext().getInitParameter(
@@ -162,8 +175,8 @@ public class OpsuiApp extends WebApplica
@Override
public Session newSession(Request request, Response response) {
FMBrowserSession session = new FMBrowserSession(request);
- if (getServletContext().getInitParameter("opsui.skin") != null) {
- session.setStyle(getServletContext().getInitParameter("opsui.skin"));
+ if (getSkin() != null) {
+ session.setStyle(getSkin());
}
return session;
}
Modified: oodt/trunk/pcs/opsui/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/webapp/META-INF/context.xml?rev=1199621&r1=1199620&r2=1199621&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/webapp/META-INF/context.xml (original)
+++ oodt/trunk/pcs/opsui/src/main/webapp/META-INF/context.xml Wed Nov 9 05:56:00 2011
@@ -44,6 +44,7 @@ the License.
<Parameter name="ganglia.url" value="[GANGLIA_URL]"/>
<Parameter name="contact.email" value="user@oodt.apache.org"/>
- <Parameter name="opsui_skin" value="classic"/>
+ <!-- <Parameter name="opsui.skin" value="classic"/>-->
+ <Parameter name="opsui.homepage" value="org.apache.oodt.pcs.opsui.HomePage"/>
</Context>