Author: hadrian
Date: Tue Jan 10 02:26:01 2012
New Revision: 1229453
URL: http://svn.apache.org/viewvc?rev=1229453&view=rev
Log:
Add page inheritance for Index
Modified:
labs/magnet/flux/src/main/java/org/apache/labs/magnet/flux/Index.java
labs/magnet/flux/src/main/resources/org/apache/labs/magnet/flux/FluxPage.html
labs/magnet/flux/src/main/resources/org/apache/labs/magnet/flux/Index.html
Modified: labs/magnet/flux/src/main/java/org/apache/labs/magnet/flux/Index.java
URL:
http://svn.apache.org/viewvc/labs/magnet/flux/src/main/java/org/apache/labs/magnet/flux/Index.java?rev=1229453&r1=1229452&r2=1229453&view=diff
==============================================================================
--- labs/magnet/flux/src/main/java/org/apache/labs/magnet/flux/Index.java
(original)
+++ labs/magnet/flux/src/main/java/org/apache/labs/magnet/flux/Index.java Tue
Jan 10 02:26:01 2012
@@ -16,9 +16,8 @@
*/
package org.apache.labs.magnet.flux;
-import org.apache.wicket.markup.html.WebPage;
-public class Index extends WebPage {
+public class Index extends FluxPage {
private static final long serialVersionUID = 1L;
public Index() {
Modified:
labs/magnet/flux/src/main/resources/org/apache/labs/magnet/flux/FluxPage.html
URL:
http://svn.apache.org/viewvc/labs/magnet/flux/src/main/resources/org/apache/labs/magnet/flux/FluxPage.html?rev=1229453&r1=1229452&r2=1229453&view=diff
==============================================================================
---
labs/magnet/flux/src/main/resources/org/apache/labs/magnet/flux/FluxPage.html
(original)
+++
labs/magnet/flux/src/main/resources/org/apache/labs/magnet/flux/FluxPage.html
Tue Jan 10 02:26:01 2012
@@ -1,32 +1,28 @@
<!DOCTYPE html>
-<html xmlns:wicket="http://wicket.apache.org";>
- <head>
- <meta charset="utf-8" />
- <title>Apache Magnet</title>
- <link href="css/jira.css" rel="stylesheet" type="text/css" />
- <link href="css/magnet.css" rel="stylesheet" type="text/css" />
- </head>
-
- <body id="jira" class="aui-layout aui-theme-default page-type-issuenav
">
- <div id="wrapper">
- <div id="header">
- <div id="logo">
- <img src="img/logo.png" height="63px"
border="0" align="" alt="logo" title="Apache Magnet">
- </div>
- <div class="top-right">
- <span class="user">[email protected]</span>
- <span class="top-menu"><a
href="#">Logout</a></span>
- </div>
- </div>
-
- <!-- wicket mandatory element for base_class -->
- <wicket:child />
-
- <div id="footer">
- <div id="copyright">© 2011 The Apache Software
Foundation.</div>
- </div>
-
- </div> <!-- wrapper -->
- </body>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <title>Apache Magnet</title>
+ <!-- css -->
+ <link href="css/jira.css" rel="stylesheet" type="text/css" />
+ <link href="css/magnet.css" rel="stylesheet" type="text/css" />
+ </head>
+ <body id="jira" class="aui-layout aui-theme-default page-type-issuenav ">
+ <div id="header">
+ <div id="logo">
+ <img src="img/logo.png" height="63px" border="0" align="" alt="logo"
title="Apache Magnet">
+ </div>
+ <div class="top-right">
+ <span class="user">[email protected]</span>
+ <span class="top-menu"><a href="#">Sign In</a></span>
+ </div>
+ </div>
+ <div id="page" class="">
+ <!-- wicket mandatory element for base_class -->
+ <wicket:child />
+ </div><!-- end page -->
+ <!--div id="footer">
+ <div id="copyright">© 2011 The Apache Software Foundation.</div>
+ </div -->
+ </body>
</html>
-
\ No newline at end of file
Modified:
labs/magnet/flux/src/main/resources/org/apache/labs/magnet/flux/Index.html
URL:
http://svn.apache.org/viewvc/labs/magnet/flux/src/main/resources/org/apache/labs/magnet/flux/Index.html?rev=1229453&r1=1229452&r2=1229453&view=diff
==============================================================================
--- labs/magnet/flux/src/main/resources/org/apache/labs/magnet/flux/Index.html
(original)
+++ labs/magnet/flux/src/main/resources/org/apache/labs/magnet/flux/Index.html
Tue Jan 10 02:26:01 2012
@@ -1,27 +1,4 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml";>
- <head>
- <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1" />
- <title>Apache Magnet</title>
- <!-- css -->
- <!-- link href="css/login-box.css" rel="stylesheet"
type="text/css" />
- <link href="css/batch.css" rel="stylesheet" type="text/css" />
- <link href="css/batch2.css" rel="stylesheet" type="text/css" />
- <link href="css/global.css" rel="stylesheet" type="text/css" /
-->
- <link href="css/jira.css" rel="stylesheet" type="text/css" />
- <link href="css/magnet.css" rel="stylesheet" type="text/css" />
- </head>
- <body id="jira" class="aui-layout aui-theme-default page-type-issuenav
">
- <div id="header">
- <div id="logo">
- <img src="img/logo.png" height="63px"
border="0" align="" alt="logo" title="Apache Magnet">
- </div>
- <div class="top-right">
- <span class="user">[email protected]</span>
- <span class="top-menu"><a
href="#">Logout</a></span>
- </div>
- </div>
- <div id="page" class="">
+<wicket:extend>
<div class="wrapper">
<div class="content-left">
<section id="content" role="main"
class="left-pane">
@@ -175,6 +152,4 @@
<!-- end section -->
</div>
</div>
- </div><!-- end page -->
- </body>
-</html>
+</wicket:extend>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
