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 2009/06/22 23:00:12 UTC

svn commit: r787399 - in /incubator/click/trunk/click/examples/webapp: ./ assets/css/ general/ jsp/ pageflow/ springsecurity/

Author: sabob
Date: Mon Jun 22 21:00:11 2009
New Revision: 787399

URL: http://svn.apache.org/viewvc?rev=787399&view=rev
Log:
switched examples to standards DOCTYPE

Modified:
    incubator/click/trunk/click/examples/webapp/assets/css/style.css
    incubator/click/trunk/click/examples/webapp/border-template.htm
    incubator/click/trunk/click/examples/webapp/border-template.jsp
    incubator/click/trunk/click/examples/webapp/general/broken-border.htm
    incubator/click/trunk/click/examples/webapp/general/page-imports-example.htm
    incubator/click/trunk/click/examples/webapp/jsp/dummy.jsp
    incubator/click/trunk/click/examples/webapp/jsp/hello-world.jsp
    incubator/click/trunk/click/examples/webapp/jsp/multi-path-demo.jsp
    incubator/click/trunk/click/examples/webapp/pageflow/invalid-submit.html
    incubator/click/trunk/click/examples/webapp/redirect.html
    incubator/click/trunk/click/examples/webapp/springsecurity/create-account.htm
    incubator/click/trunk/click/examples/webapp/springsecurity/login.htm
    incubator/click/trunk/click/examples/webapp/springsecurity/not-authorized.htm

Modified: incubator/click/trunk/click/examples/webapp/assets/css/style.css
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/assets/css/style.css?rev=787399&r1=787398&r2=787399&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/assets/css/style.css (original)
+++ incubator/click/trunk/click/examples/webapp/assets/css/style.css Mon Jun 22 21:00:11 2009
@@ -17,32 +17,47 @@
  * under the License.
  */
 
-/* 
- * Border template specific styles. 
- */
+html, body {
+  height: 95%;
+}
+
 body {
 	background: #585858;
 	color: #000000;
 	font-family: Arial, Helvetica, "Sans Serif";
-	margin: 12px 12px 12px 12px;
+	margin: 12px 0px;
+  padding: 0;
+}
+
+/** Use IE6 specific syntax to set 'div.page' height, since min-height is not recognized by IE6. */
+* html div.page {
+  height: 100%;
 }
 
-table.page {
-	border: 1px solid #202020;
-	border-collapse: collapse;
+div.page {
+  border: 1px solid #202020;
+  margin: 0 auto; /* Center align for other browsers,  */
+  text-align: left;
 	background: #ffffff;
 	width: 990px;
+  min-height: 100%; /* IE6 doesn't recognize min-height. */
+}
+
+div.header {
+  position: relative;
+  height: 95px;
 }
 
-td.title-icon {
-	vertical-align: bottom;
-	padding-left: 14px;
-	padding-right: 12px;
-	padding-top: 10px;
-	padding-bottom: 6px;
+div.title-icon {
+  position:absolute;
+  top: 12px;
+  left: 15px;
 }
 
-td.title-left {
+div.title-left {
+  position: absolute;
+  top: 6px;
+  left: 56px;
 	color: navy;
 	font-size: 24pt;
 	font-weight: bolder;
@@ -50,27 +65,45 @@
 	white-space: nowrap;
 }
 
-td.title-hosted p, td.title-hosted a {
+div.title-hosted {
+  position: absolute;
+  right: 0px;
+}
+
+div.title-hosted p, div.title-hosted a {
 	color: navy;
 	font-size: 8pt;
-	margin: 1em;
+	margin: 0.8em;
 	text-align:right;
 	text-decoration: none;
 	vertical-align: middle;
 	white-space: nowrap;
 }
 
-td.header-color {
+div.header-color {
+  position: absolute;
+  top: 50px;
 	background-color: #334ECF;
 	font-size: 9pt;
+  height: 15px;
+  width: 100%;
+}
+
+#menuTable {
+    position: absolute;
+    bottom: 0px;
 }
 
-td.content {
+div.content {
 	font-size: 10pt;
 	padding: 15px;
 	border-collapse: separate;
 }
 
+div.content h2 {
+  margin: 0;
+}
+
 #msgDiv {
 	background-color: #f0f0f0;
 	border: thin solid navy;
@@ -156,7 +189,7 @@
 	white-space: pre;
 }
 
-.codeHtml 
+.codeHtml
 {
 	border: 1px solid #97A9FF;
 	background-color: white;
@@ -201,11 +234,13 @@
 
 /*
  * Spring Security (Acegi) example style.
- */ 
+ */
 div.dialogForm {
 	background-color: #f0f0f0;
 	width: 305px;
 	margin-top: 100px;
+  margin-right: auto;
+  margin-left: auto;
 	padding: 20px 20px 20px 20px;
 	border-top: 1px solid #e0e0e0;
 	border-left: 1px solid #e0e0e0;

Modified: incubator/click/trunk/click/examples/webapp/border-template.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/border-template.htm?rev=787399&r1=787398&r2=787399&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/border-template.htm (original)
+++ incubator/click/trunk/click/examples/webapp/border-template.htm Mon Jun 22 21:00:11 2009
@@ -1,3 +1,5 @@
+<!doctype html>
+
 <!--
    Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
@@ -27,52 +29,38 @@
 <link rel="Click icon" href="$context/favicon.ico" type="image/ico"/>
 </head>
 <body>
-<center>
-<table height="100%" border="0" cellpadding="0" cellspacing="4" class="page">
-## Title Header
-<tr>
-	<td width="100%">			
-		<table cellpadding="0" cellspacing="0" width="100%" border="0" style="border-collapse:collapse;">
-			<tr>
-				<td class="title-icon">
-					<a target="blank" href="http://incubator.apache.org/click/"><img src="${context}/assets/images/click-icon-blue-32.png" border="0" alt="Click"/></a>
-				</td>
-				<td class="title-left" width="100%">
-					Click Examples
-				</td>
-				<td class="title-hosted">
-					<p>Version ${messages.version}</p>
-					<a target="blank" href="http://www.avoka.com">Hosted by Avoka Technologies</a>
-				</td>
-			</tr>
-			<tr>
-				<td class="header-color" colspan="3">&nbsp;</td>
-			</tr>
-		</table>
-	</td>
-</tr>
-## Menu
-<tr>		
-	<td>
-#if (${rootMenu})
-#writeMenu(${rootMenu})
-#end
-	</td>
-</tr>
-## Page Content
-<tr>		
-	<td class="content">
-		<h2>$title</h2>
-		
-#parse(${path})
-	</td>
-</tr>
-## Vertical Spacer
-<tr>		
-	<td height="100%">&nbsp;</td>
-</tr>
-</table>
-</center>
+
+<div class="page">
+  <div class="header">
+    ## Title Header
+
+    <div class="title-icon">
+      <a target="blank" href="http://incubator.apache.org/click/"><img src="${context}/assets/images/click-icon-blue-32.png" border="0" alt="Click"/></a>
+    </div>
+		<div class="title-left">
+      Click Examples
+    </div>
+    <div class="title-hosted">
+      <p>Version ${messages.version}</p>
+      <a target="blank" href="http://www.avoka.com">Hosted by Avoka Technologies</a>
+    </div>
+    <div class="header-color">
+    </div>
+
+    ## Menu
+    #if (${rootMenu})
+      #writeMenu(${rootMenu})
+    #end
+  </div>
+
+  <div class="content">
+    ## Page Content
+    <h2>$title</h2>
+    <p/>
+    #parse(${path})
+
+  </div>
+</div>
 
 ${jsElements}
 

Modified: incubator/click/trunk/click/examples/webapp/border-template.jsp
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/border-template.jsp?rev=787399&r1=787398&r2=787399&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/border-template.jsp (original)
+++ incubator/click/trunk/click/examples/webapp/border-template.jsp Mon Jun 22 21:00:11 2009
@@ -1,3 +1,5 @@
+<!doctype html>
+
 <!--
    Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
@@ -16,86 +18,42 @@
    specific language governing permissions and limitations
    under the License.
 -->
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 
-<html>
-<head>
-<title>${title} : Click Examples</title>
-<link type="text/css" rel="stylesheet" href="${context}/assets/css/style.css" title="Style"/>
-${headElements}
-<link rel="Click icon" href="$context/favicon.ico" type="image/ico"/>
-</head>
-<body>
-
-<center>
-<table height="100%" border="0" cellpadding="0" cellspacing="4" class="page">
-<%-- Title Header --%>
-<tr>
-	<td width="100%">			
-		<table cellpadding="0" cellspacing="0" width="100%" border="0" style="border-collapse:collapse;">
-			<tr>
-				<td class="title-icon">
-					<a target="blank" href="http://incubator.apache.org/click/"><img src="${context}/assets/images/click-icon-blue-32.png" border="0" alt="Click"/></a>
-				</td>
-				<td class="title-left" width="100%">
-					Click Examples
-				</td>
-				<td class="title-hosted">
-					<p>${messages.version}</p>
-					<a target="blank" href="http://www.avoka.com">Hosted by Avoka Technologies</a>
-				</td>
-			</tr>
-			<tr>
-				<td class="header-color" colspan="3">&nbsp;</td>
-			</tr>
-		</table>
-	</td>
-</tr>
-<%-- Menu --%>
-<tr>		
-	<td>
-	
-<table id="menuTable" border="0" width="100%" cellspacing="0" cellpadding="0" style="margin-top: 2px;">
- <tr>
-  <td>
- <div class="menustyle" id="menu">
-  <ul class="menubar" id="dmenu">
-    <c:forEach items="${rootMenu.children}" var="topMenu">
-        <li class="topitem">${topMenu}
-          <ul class="submenu"
-          <c:forEach items="${topMenu.children}" var="subMenu">
-            ><li>${subMenu}</li
-          </c:forEach>
-          ></ul>
-        </li>
-    </c:forEach>
-        <li class="topitem"><a target="_blank" href="${context}/source-viewer.htm?filename=WEB-INF/classes/${srcPath}" title="Page Java source"><img border="0" class="link" alt="" src="${context}/assets/images/lightbulb1.png"/> Page Java</a>
-        </li>
-        <li class="topitem"><a target="_blank" href="${context}/source-viewer.htm?filename=${path}" title="Page Content source"><img border="0" class="link" alt="" src="${context}/assets/images/lightbulb2.png"/> Page HTML</a>
-        </li>
-  </ul>  
- </div>
-  </td>
- </tr>
-</table>
-
-	</td>
-</tr>
-<%-- Page Content --%>
-<tr>		
-	<td class="content">
-	   <h2>${title}</h2>
-				
+
+    <%-- Menu --%>
+    <table id="menuTable" border="0" width="100%" cellspacing="0" cellpadding="0" style="margin-top: 2px;">
+    <tr>
+      <td>
+        <div class="menustyle" id="menu">
+          <ul class="menubar" id="dmenu">
+            <c:forEach items="${rootMenu.children}" var="topMenu">
+              <li class="topitem">${topMenu}
+                <ul class="submenu"
+                  <c:forEach items="${topMenu.children}" var="subMenu">
+                    ><li>${subMenu}</li
+                  </c:forEach>
+                ></ul>
+              </li>
+            </c:forEach>
+            <li class="topitem"><a target="_blank" href="${context}/source-viewer.htm?filename=WEB-INF/classes/${srcPath}" title="Page Java source"><img border="0" class="link" alt="" src="${context}/assets/images/lightbulb1.png"/> Page Java</a>
+            </li>
+            <li class="topitem"><a target="_blank" href="${context}/source-viewer.htm?filename=${path}" title="Page Content source"><img border="0" class="link" alt="" src="${context}/assets/images/lightbulb2.png"/> Page HTML</a>
+            </li>
+          </ul>
+        </div>
+      </td>
+    </tr>
+    </table>
+  </div>
+
+  <%-- Page Content --%>
+  <div class="content">
+	  <h2>${title}</h2>
+    <p/>
     <jsp:include page='${forward}' flush="true"/>
-	</td>
-</tr>
-<%-- Vertical Spacer --%>
-<tr>		
-	<td height="100%">&nbsp;</td>
-</tr>
-</table>
-</center>
+	</div>
+
+</div>
 
 ${jsElements}
 

Modified: incubator/click/trunk/click/examples/webapp/general/broken-border.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/general/broken-border.htm?rev=787399&r1=787398&r2=787399&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/general/broken-border.htm (original)
+++ incubator/click/trunk/click/examples/webapp/general/broken-border.htm Mon Jun 22 21:00:11 2009
@@ -1,3 +1,5 @@
+<!doctype html>
+
 <!--
 #* Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file

Modified: incubator/click/trunk/click/examples/webapp/general/page-imports-example.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/general/page-imports-example.htm?rev=787399&r1=787398&r2=787399&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/general/page-imports-example.htm (original)
+++ incubator/click/trunk/click/examples/webapp/general/page-imports-example.htm Mon Jun 22 21:00:11 2009
@@ -17,8 +17,6 @@
    under the License.*#
 -->
 
-<p/>
-
 This page provides an example of how to programatically optimize your PageImports for
 high traffic pages. By optimizing your PageImports you can combine CSS and JavaScript
 import files and reduce the number of HTTP requests required to serve the page.

Modified: incubator/click/trunk/click/examples/webapp/jsp/dummy.jsp
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/jsp/dummy.jsp?rev=787399&r1=787398&r2=787399&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/jsp/dummy.jsp (original)
+++ incubator/click/trunk/click/examples/webapp/jsp/dummy.jsp Mon Jun 22 21:00:11 2009
@@ -1,3 +1,5 @@
+<!doctype html>
+
 <!--
    Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
@@ -26,9 +28,10 @@
 </head>
 <body>
 
-<h2>Dummy.jsp</h2>.
-   
+<b>${path}</b>
+<p>
 Click <a href=${defaultPath.href}>here</a> to go back.
+</p>
 
 </body>
 </html>
\ No newline at end of file

Modified: incubator/click/trunk/click/examples/webapp/jsp/hello-world.jsp
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/jsp/hello-world.jsp?rev=787399&r1=787398&r2=787399&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/jsp/hello-world.jsp (original)
+++ incubator/click/trunk/click/examples/webapp/jsp/hello-world.jsp Mon Jun 22 21:00:11 2009
@@ -1,3 +1,5 @@
+<!doctype html>
+
 <!--
    Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file

Modified: incubator/click/trunk/click/examples/webapp/jsp/multi-path-demo.jsp
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/jsp/multi-path-demo.jsp?rev=787399&r1=787398&r2=787399&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/jsp/multi-path-demo.jsp (original)
+++ incubator/click/trunk/click/examples/webapp/jsp/multi-path-demo.jsp Mon Jun 22 21:00:11 2009
@@ -1,3 +1,5 @@
+<!doctype html>
+
 <!--
    Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file

Modified: incubator/click/trunk/click/examples/webapp/pageflow/invalid-submit.html
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/pageflow/invalid-submit.html?rev=787399&r1=787398&r2=787399&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/pageflow/invalid-submit.html (original)
+++ incubator/click/trunk/click/examples/webapp/pageflow/invalid-submit.html Mon Jun 22 21:00:11 2009
@@ -1,3 +1,5 @@
+<!doctype html>
+
 <!--
 #* Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
@@ -24,39 +26,26 @@
 </head>
 <body>
 
-<center>
-<table height="100%" border="0" cellpadding="0" cellspacing="4" class="page">
-<tr>
-	<td width="100%">			
-		<table cellpadding="0" cellspacing="0" width="100%" border="0" style="border-collapse:collapse;">
-			<tr>
-				<td class="title-icon">
-					<a target="blank" href="http://incubator.apache.org/click/"><img src="/click-examples/assets/images/click-icon-blue-32.png" border="0" alt="Click"/></a>
-				</td>
-				<td class="title-left" width="100%">
-					Invalid Submit
-				</td>
-				<td class="title-hosted">
-					<a target="blank" href="http://www.avoka.com">Hosted by Avoka Technologies</a>
-				</td>
-			</tr>
-			<tr>
-				<td class="header-color" colspan="3">&nbsp;</td>
-			</tr>
-		</table>
-	</td>
-</tr>
-<tr>		
-  <td class="content">
-	You have made an invalid form submission to continue click 
-	<a href="/click-examples/pageflow/start-page.htm">here</a>.
-  </td>
-</tr>
-<tr>		
-	<td height="100%">&nbsp;</td>
-</tr>
-</table>
-</center>
+<div class="page">
+  <div class="header" style="height:64px">
+    <div class="title-icon">
+      <a target="blank" href="http://incubator.apache.org/click/"><img src="/click-examples/assets/images/click-icon-blue-32.png" border="0" alt="Click"/></a>
+    </div>
+		<div class="title-left">
+      Invalid Submit
+    </div>
+    <div class="title-hosted">
+      <a target="blank" href="http://www.avoka.com">Hosted by Avoka Technologies</a>
+    </div>
+    <div class="header-color">
+    </div>
+  </div>
+
+  <div class="content">
+  	You have made an invalid form submission to continue click
+	  <a href="/click-examples/pageflow/start-page.htm">here</a>.
+  </div>
+</div>
 
 </body>
 </html>

Modified: incubator/click/trunk/click/examples/webapp/redirect.html
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/redirect.html?rev=787399&r1=787398&r2=787399&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/redirect.html (original)
+++ incubator/click/trunk/click/examples/webapp/redirect.html Mon Jun 22 21:00:11 2009
@@ -1,3 +1,5 @@
+<!doctype html>
+
 <!--
 #* Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file

Modified: incubator/click/trunk/click/examples/webapp/springsecurity/create-account.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/springsecurity/create-account.htm?rev=787399&r1=787398&r2=787399&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/springsecurity/create-account.htm (original)
+++ incubator/click/trunk/click/examples/webapp/springsecurity/create-account.htm Mon Jun 22 21:00:11 2009
@@ -1,3 +1,5 @@
+<!doctype html>
+
 <!--
 #* Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
@@ -17,8 +19,6 @@
    under the License.*#
 -->
 
-<center>
-
 <div class="dialogForm" style="width:300px;">
 
 <div style="font-weight:bold;font-size:10pt;text-align:left;">Create Account</div>
@@ -26,5 +26,3 @@
 $form
 
 </div>
-
-</center>

Modified: incubator/click/trunk/click/examples/webapp/springsecurity/login.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/springsecurity/login.htm?rev=787399&r1=787398&r2=787399&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/springsecurity/login.htm (original)
+++ incubator/click/trunk/click/examples/webapp/springsecurity/login.htm Mon Jun 22 21:00:11 2009
@@ -17,8 +17,6 @@
    under the License.*#
 -->
 
-<center>
-
 <div class="dialogForm" style="width:315px;">
 
 <form method="post" action="$context/j_spring_security_check" name="form">
@@ -78,6 +76,3 @@
 </table>
 
 </div>
-
-
-</center>

Modified: incubator/click/trunk/click/examples/webapp/springsecurity/not-authorized.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/webapp/springsecurity/not-authorized.htm?rev=787399&r1=787398&r2=787399&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/webapp/springsecurity/not-authorized.htm (original)
+++ incubator/click/trunk/click/examples/webapp/springsecurity/not-authorized.htm Mon Jun 22 21:00:11 2009
@@ -1,3 +1,5 @@
+<!doctype html>
+
 <!--
 #* Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
@@ -17,8 +19,6 @@
    under the License.*#
 -->
 
-<center>
-
 <div class="dialogForm" style="width:300px;">
 
 <div style="font-weight:bold;font-size:10pt;text-align:left;color:red;">
@@ -26,5 +26,3 @@
 </div>
 
 </div>
-
-</center>