[Archive-access-cvs] SF.net SVN: archive-access:[3202] trunk/archive-access/projects/wayback/ wayback-webapp/src/main/webapp/jsp

[<bra...@us...>]

Revision: 3202
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3202&view=rev
Author:   bradtofel
Date:     2010-08-03 00:31:10 +0000 (Tue, 03 Aug 2010)

Log Message:
-----------
renaming, plus minor edits.

Added Paths:
-----------
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/Interstitial.jsp

Removed Paths:
-------------
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/Interstitial-wrap.jsp

Deleted: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/Interstitial-wrap.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/Interstitial-wrap.jsp	2010-08-03 00:28:36 UTC (rev 3201)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/Interstitial-wrap.jsp	2010-08-03 00:31:10 UTC (rev 3202)
@@ -1,42 +0,0 @@
-<%@   page import="org.archive.wayback.webapp.AccessPoint"
-%><%@ page import="org.archive.wayback.util.StringFormatter"
-%><%
-String toUrl = request.getParameter(AccessPoint.INTERSTITIAL_TARGET);
-if(toUrl == null) {
-	response.setStatus(400);
-%>
-    Bad request. require argument <%= AccessPoint.INTERSTITIAL_TARGET %>
-<%
-} else {
-	String secsS = request.getParameter(AccessPoint.INTERSTITIAL_SECONDS);
-	int secs = 5;
-	try {
-		secs = Integer.parseInt(secsS);
-	} catch (NumberFormatException e) {
-		
-	}
-	if(secs < 1) {
-		secs = 5;
-	}
-	StringFormatter f = new StringFormatter(null,null);
-	String safeTargetUrl = f.escapeHtml(toUrl);
-	String safeTargetUrlJS = f.escapeJavaScript(toUrl);
-	%>
-	<script type="text/javascript">
-	function go() {
-		document.location.href = "<%= safeTargetUrlJS %>";
-	}
-	window.setTimeout("go()",<%= secs * 1000 %>);
-	</script>
-		<p>
-		  Thanks for visiting the Wayback Machine. We're about to redirect you
-		  to the page you requested:
-		</p>
-		<p><%= safeTargetUrl %></p>
-		<p>
-		  in <%= secs %> seconds.
-		  Click <a href="<%= safeTargetUrl %>">here</a> to go now.
-		</p>
-<%	
-}
-%>
\ No newline at end of file

Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/Interstitial.jsp (from rev 3153, trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/Interstitial-wrap.jsp)
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/Interstitial.jsp	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/Interstitial.jsp	2010-08-03 00:31:10 UTC (rev 3202)
@@ -0,0 +1,55 @@
+<%@   page import="org.archive.wayback.webapp.AccessPoint"
+%><%@ page import="org.archive.wayback.util.StringFormatter"
+%><%
+String toUrl = request.getParameter(AccessPoint.INTERSTITIAL_TARGET);
+if(toUrl == null) {
+	response.setStatus(400);
+%>
+    Bad request. require argument <%= AccessPoint.INTERSTITIAL_TARGET %>
+<%
+} else {
+	String secsS = request.getParameter(AccessPoint.INTERSTITIAL_SECONDS);
+	int secs = 5;
+	try {
+		secs = Integer.parseInt(secsS);
+	} catch (NumberFormatException e) {
+		
+	}
+	if(secs < 1) {
+		secs = 5;
+	}
+	StringFormatter f = new StringFormatter(null,null);
+	String safeTargetUrl = f.escapeHtml(toUrl);
+	String safeTargetUrlJS = f.escapeJavaScript(toUrl);
+	%>
+    <jsp:include page="/WEB-INF/global-template/UI-header.jsp" flush="true" />
+
+        <div id="positionHome">
+            <section>
+            <div id="logoHome">
+                <a href="/index.jsp"><h1><span>Internet Archive's Wayback Machine</span></h1></a>
+            </div>
+            </section>
+            <section>
+            <div id="error">
+	<script type="text/javascript">
+	function go() {
+		document.location.href = "<%= safeTargetUrlJS %>";
+	}
+	window.setTimeout("go()",<%= secs * 1000 %>);
+	</script>
+	    <h2 class="blue">Hello.</h2>
+		<p class="code">Loading...</p>
+		<p class="code shift">[Month 00, 0000]</p>
+		<p class="code">Loading...</p>
+		<p class="code shift"><%= safeTargetUrl %></p>
+		<p class="impatient"><a href="<%= safeTargetUrl %>">Impatient?</a></p>
+<%	
+}
+%>
+
+            </div>
+            </section>
+            <div id="errorBorder"></div>
+
+<jsp:include page="/WEB-INF/global-template/UI-footer.jsp" flush="true" />
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.