You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@click.apache.org by sa...@apache.org on 2010/04/12 14:02:45 UTC
svn commit: r933204 - in /click/trunk/click/template:
WebContent/border-template.htm build.xml src/template/page/BorderPage.java
src/template/page/LogoutPage.java src/template/page/click/ErrorPage.java
Author: sabob
Date: Mon Apr 12 12:02:44 2010
New Revision: 933204
URL: http://svn.apache.org/viewvc?rev=933204&view=rev
Log:
updated quickproject
Modified:
click/trunk/click/template/WebContent/border-template.htm
click/trunk/click/template/build.xml
click/trunk/click/template/src/template/page/BorderPage.java
click/trunk/click/template/src/template/page/LogoutPage.java
click/trunk/click/template/src/template/page/click/ErrorPage.java
Modified: click/trunk/click/template/WebContent/border-template.htm
URL: http://svn.apache.org/viewvc/click/trunk/click/template/WebContent/border-template.htm?rev=933204&r1=933203&r2=933204&view=diff
==============================================================================
--- click/trunk/click/template/WebContent/border-template.htm (original)
+++ click/trunk/click/template/WebContent/border-template.htm Mon Apr 12 12:02:44 2010
@@ -2,7 +2,7 @@
<head>
<title>Click Quick Start - $title</title>
<link rel="stylesheet" type="text/css" href="$context/assets/style.css" title="Style"></link>
-$imports
+$headElements
</head>
<body>
@@ -18,6 +18,7 @@ $imports
<div id="container">
#parse($path)
</div>
-
+
+ $jsElements
</body>
</html>
\ No newline at end of file
Modified: click/trunk/click/template/build.xml
URL: http://svn.apache.org/viewvc/click/trunk/click/template/build.xml?rev=933204&r1=933203&r2=933204&view=diff
==============================================================================
--- click/trunk/click/template/build.xml (original)
+++ click/trunk/click/template/build.xml Mon Apr 12 12:02:44 2010
@@ -49,7 +49,7 @@
destdir="WebContent/WEB-INF/classes"
debug="true"
encoding="ISO-8859-1"
- source="1.4">
+ source="1.5">
<classpath refid="classpath"/>
</javac>
</target>
Modified: click/trunk/click/template/src/template/page/BorderPage.java
URL: http://svn.apache.org/viewvc/click/trunk/click/template/src/template/page/BorderPage.java?rev=933204&r1=933203&r2=933204&view=diff
==============================================================================
--- click/trunk/click/template/src/template/page/BorderPage.java (original)
+++ click/trunk/click/template/src/template/page/BorderPage.java Mon Apr 12 12:02:44 2010
@@ -7,11 +7,12 @@ public class BorderPage extends BasePage
private static final long serialVersionUID = 1L;
- public Menu rootMenu;
+ private Menu rootMenu;
public BorderPage() {
MenuFactory menuFactory = new MenuFactory();
rootMenu = menuFactory.getRootMenu();
+ addControl(rootMenu);
}
/**
Modified: click/trunk/click/template/src/template/page/LogoutPage.java
URL: http://svn.apache.org/viewvc/click/trunk/click/template/src/template/page/LogoutPage.java?rev=933204&r1=933203&r2=933204&view=diff
==============================================================================
--- click/trunk/click/template/src/template/page/LogoutPage.java (original)
+++ click/trunk/click/template/src/template/page/LogoutPage.java Mon Apr 12 12:02:44 2010
@@ -5,7 +5,9 @@ public class LogoutPage extends BorderPa
public String remoteUser;
public String title = "Logout";
+ @Override
public void onInit() {
+ super.onInit();
remoteUser = getContext().getRequest().getRemoteUser();
getContext().getSession().invalidate();
}
Modified: click/trunk/click/template/src/template/page/click/ErrorPage.java
URL: http://svn.apache.org/viewvc/click/trunk/click/template/src/template/page/click/ErrorPage.java?rev=933204&r1=933203&r2=933204&view=diff
==============================================================================
--- click/trunk/click/template/src/template/page/click/ErrorPage.java (original)
+++ click/trunk/click/template/src/template/page/click/ErrorPage.java Mon Apr 12 12:02:44 2010
@@ -1,14 +1,24 @@
package template.page.click;
import org.apache.click.extras.control.Menu;
+import org.apache.click.extras.control.MenuFactory;
public class ErrorPage extends org.apache.click.util.ErrorPage {
public String title = "Error Page";
- public Menu rootMenu = Menu.getRootMenu();
+ private Menu rootMenu;
+ public ErrorPage() {
+ MenuFactory menuFactory = new MenuFactory();
+ rootMenu = menuFactory.getRootMenu();
+ addControl(rootMenu);
+ }
+
+ @Override
public void onDestroy() {
+ super.onDestroy();
+
Throwable error = getError();
// TODO: Log error to Log4J or Commons Logger