[Archive-access-cvs] SF.net SVN: archive-access:[3140] trunk/archive-access/projects/wayback/ wayback-webapp/src/main/webapp/WEB-INF

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

Revision: 3140
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3140&view=rev
Author:   bradtofel
Date:     2010-06-01 19:54:00 +0000 (Tue, 01 Jun 2010)

Log Message:
-----------
New template system uses a single wrapper, which includes content from a delegate .jsp

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/CalendarResults.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/CalendarResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/CalendarResults.jsp	2010-06-01 19:43:08 UTC (rev 3139)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/CalendarResults.jsp	2010-06-01 19:54:00 UTC (rev 3140)
@@ -1,22 +1,21 @@
-<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.util.Date" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="java.text.ParseException" %>
-<%@ page import="org.archive.wayback.WaybackConstants" %>
-<%@ page import="org.archive.wayback.core.CaptureSearchResult" %>
-<%@ page import="org.archive.wayback.core.CaptureSearchResults" %>
-<%@ page import="org.archive.wayback.core.UIResults" %>
-<%@ page import="org.archive.wayback.core.WaybackRequest" %>
-<%@ page import="org.archive.wayback.partition.CaptureSearchResultPartitionMap" %>
-<%@ page import="org.archive.wayback.util.partition.Partition" %>
-<%@ page import="org.archive.wayback.util.partition.Partitioner" %>
-<%@ page import="org.archive.wayback.util.partition.PartitionSize" %>
-<%@ page import="org.archive.wayback.util.StringFormatter" %>
-<jsp:include page="/WEB-INF/template/UI-header.jsp" flush="true" />
-<jsp:include page="/WEB-INF/template/CookieJS.jsp" flush="true" />
-<%
+<%@   page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"
+%><%@ page import="java.util.List"
+%><%@ page import="java.util.ArrayList"
+%><%@ page import="java.util.Date"
+%><%@ page import="java.util.Iterator"
+%><%@ page import="java.text.ParseException"
+%><%@ page import="org.archive.wayback.WaybackConstants"
+%><%@ page import="org.archive.wayback.core.CaptureSearchResult"
+%><%@ page import="org.archive.wayback.core.CaptureSearchResults"
+%><%@ page import="org.archive.wayback.core.UIResults"
+%><%@ page import="org.archive.wayback.core.WaybackRequest"
+%><%@ page import="org.archive.wayback.partition.CaptureSearchResultPartitionMap"
+%><%@ page import="org.archive.wayback.util.partition.Partition"
+%><%@ page import="org.archive.wayback.util.partition.Partitioner"
+%><%@ page import="org.archive.wayback.util.partition.PartitionSize"
+%><%@ page import="org.archive.wayback.util.StringFormatter"
+%><jsp:include page="/WEB-INF/template/CookieJS.jsp" flush="true" /><%
+
 UIResults results = UIResults.extractCaptureQuery(request);
 
 WaybackRequest wbRequest = results.getWbRequest();
@@ -203,5 +202,4 @@
     }
   }
 }
-%>
-<jsp:include page="/WEB-INF/template/UI-footer.jsp" flush="true" />
+%>
\ No newline at end of file

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp	2010-06-01 19:43:08 UTC (rev 3139)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp	2010-06-01 19:54:00 UTC (rev 3140)
@@ -1,15 +1,14 @@
-<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.util.Date" %>
-<%@ page import="org.archive.wayback.WaybackConstants" %>
-<%@ page import="org.archive.wayback.core.CaptureSearchResult" %>
-<%@ page import="org.archive.wayback.core.CaptureSearchResults" %>
-<%@ page import="org.archive.wayback.core.UIResults" %>
-<%@ page import="org.archive.wayback.core.WaybackRequest" %>
-<%@ page import="org.archive.wayback.util.StringFormatter" %>
-<jsp:include page="/WEB-INF/template/UI-header.jsp" flush="true" />
-<%
+<%@   page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"
+%><%@ page import="java.util.Iterator"
+%><%@ page import="java.util.ArrayList"
+%><%@ page import="java.util.Date"
+%><%@ page import="org.archive.wayback.WaybackConstants"
+%><%@ page import="org.archive.wayback.core.CaptureSearchResult"
+%><%@ page import="org.archive.wayback.core.CaptureSearchResults"
+%><%@ page import="org.archive.wayback.core.UIResults"
+%><%@ page import="org.archive.wayback.core.WaybackRequest"
+%><%@ page import="org.archive.wayback.util.StringFormatter"
+%><%
 
 UIResults results = UIResults.extractCaptureQuery(request);
 WaybackRequest wbRequest = results.getWbRequest();
@@ -113,6 +112,4 @@
     }
   }
 }
-%>
-
-<jsp:include page="/WEB-INF/template/UI-footer.jsp" flush="true" />
+%>
\ No newline at end of file

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp	2010-06-01 19:43:08 UTC (rev 3139)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp	2010-06-01 19:54:00 UTC (rev 3140)
@@ -1,17 +1,15 @@
-<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.util.Date" %>
-<%@ page import="org.archive.wayback.ResultURIConverter" %>
-<%@ page import="org.archive.wayback.WaybackConstants" %>
-<%@ page import="org.archive.wayback.core.UIResults" %>
-<%@ page import="org.archive.wayback.core.UrlSearchResult" %>
-<%@ page import="org.archive.wayback.core.UrlSearchResults" %>
-<%@ page import="org.archive.wayback.core.WaybackRequest" %>
-<%@ page import="org.archive.wayback.util.StringFormatter" %>
-<jsp:include page="/WEB-INF/template/UI-header.jsp" flush="true" />
-<%
-
+<%@   page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"
+%><%@ page import="java.util.Iterator"
+%><%@ page import="java.util.ArrayList"
+%><%@ page import="java.util.Date"
+%><%@ page import="org.archive.wayback.ResultURIConverter"
+%><%@ page import="org.archive.wayback.WaybackConstants"
+%><%@ page import="org.archive.wayback.core.UIResults"
+%><%@ page import="org.archive.wayback.core.UrlSearchResult"
+%><%@ page import="org.archive.wayback.core.UrlSearchResults"
+%><%@ page import="org.archive.wayback.core.WaybackRequest"
+%><%@ page import="org.archive.wayback.util.StringFormatter"
+%><%
 UIResults results = UIResults.extractUrlQuery(request);
 WaybackRequest wbRequest = results.getWbRequest();
 UrlSearchResults uResults = results.getUrlResults();
@@ -111,6 +109,4 @@
     }
   }
 }
-%>
-
-<jsp:include page="/WEB-INF/template/UI-footer.jsp" flush="true" />
+%>
\ No newline at end of file

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp	2010-06-01 19:43:08 UTC (rev 3139)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp	2010-06-01 19:54:00 UTC (rev 3140)
@@ -1,13 +1,13 @@
-<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
-<%@ page import="java.util.Date" %>
-<%@ page import="java.lang.StringBuffer" %>
-<%@ page import="org.archive.wayback.archivalurl.ArchivalUrlDateRedirectReplayRenderer" %>
-<%@ page import="org.archive.wayback.ResultURIConverter" %>
-<%@ page import="org.archive.wayback.core.UIResults" %>
-<%@ page import="org.archive.wayback.core.WaybackRequest" %>
-<%@ page import="org.archive.wayback.core.CaptureSearchResult" %>
-<%@ page import="org.archive.wayback.util.StringFormatter" %>
-<%
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"
+%><%@ page import="java.util.Date"
+%><%@ page import="java.lang.StringBuffer"
+%><%@ page import="org.archive.wayback.archivalurl.ArchivalUrlDateRedirectReplayRenderer"
+%><%@ page import="org.archive.wayback.ResultURIConverter"
+%><%@ page import="org.archive.wayback.core.UIResults"
+%><%@ page import="org.archive.wayback.core.WaybackRequest"
+%><%@ page import="org.archive.wayback.core.CaptureSearchResult"
+%><%@ page import="org.archive.wayback.util.StringFormatter"
+%><%
 UIResults results = UIResults.extractReplay(request);
 
 WaybackRequest wbr = results.getWbRequest();
@@ -35,7 +35,6 @@
 int secs = 5;
 
 %>
-<jsp:include page="/WEB-INF/template/UI-header.jsp" flush="true" />
 	<script type="text/javascript">
 	function go() {
 		document.location.href = "<%= safeTargetReplayUrlJS %>";
@@ -52,5 +51,4 @@
 		to that target in <%= secs %> seconds.
 		Click <a href="<%= safeTargetReplayUrl %>">here</a> to go now.
 		</p>
-<jsp:include page="/WEB-INF/template/UI-footer.jsp" flush="true" />
-		
\ No newline at end of file
+	
\ No newline at end of file


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