Author: mattmann
Date: Tue Nov 8 18:53:40 2011
New Revision: 1199384
URL: http://svn.apache.org/viewvc?rev=1199384&view=rev
Log:
- clean up: OODT-157
Removed:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/SplashPage.java
Modified:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.html
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/OpsuiApp.java
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.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.html?rev=1199384&r1=1199383&r2=1199384&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.html
(original)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.html
Tue Nov 8 18:53:40 2011
@@ -80,7 +80,7 @@
Workflow Monitor
</span>
</a>
- <a href="#" id="rmonitor_link" >
+ <a href="#" wicket:id="ganglia_link" >
<span>
Resource Monitor
</span>
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=1199384&r1=1199383&r2=1199384&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
Tue Nov 8 18:53:40 2011
@@ -45,7 +45,7 @@ public class BasePage extends WebPage {
*/
@Override
public void onClick() {
- setResponsePage(StatusPage.class);
+ setResponsePage(HomePage.class);
}
});
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=1199384&r1=1199383&r2=1199384&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
Tue Nov 8 18:53:40 2011
@@ -162,9 +162,9 @@ public class OpsuiApp extends WebApplica
@Override
public Session newSession(Request request, Response response) {
FMBrowserSession session = new FMBrowserSession(request);
- session
- .setStyle(getServletContext().getInitParameter("opsui.skin") != null ?
getServletContext()
- .getInitParameter("opsui.skin") : "classic");
+ if (getServletContext().getInitParameter("opsui.skin") != null) {
+ session.setStyle(getServletContext().getInitParameter("opsui.skin"));
+ }
return session;
}
Modified:
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/SplashPage.html?rev=1199384&r1=1199383&r2=1199384&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/SplashPage.html
Tue Nov 8 18:53:40 2011
@@ -47,7 +47,8 @@
-<wicket:child/>
+<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>
