Menu
▾
▴
archive-access-cvs
|
From: <bra...@us...> - 2008-07-29 02:18:01
|
Revision: 2519
http://archive-access.svn.sourceforge.net/archive-access/?rev=2519&view=rev
Author: bradtofel
Date: 2008-07-29 02:18:10 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
TWEAK: now uses WaybackRequest.getContextPrefix() instead of assembling it from HttpServletRequest fields.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/ClientSideJSInsert.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Disclaimer.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/ClientSideJSInsert.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/ClientSideJSInsert.jsp 2008-07-29 02:16:35 UTC (rev 2518)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/ClientSideJSInsert.jsp 2008-07-29 02:18:10 UTC (rev 2519)
@@ -8,12 +8,9 @@
UIResults results = UIResults.extractReplay(request);
String requestDate = results.getResult().getCaptureTimestamp();
String contextPath = results.getURIConverter().makeReplayURI(requestDate,"");
-String contextRoot = request.getScheme() + "://" + request.getServerName() + ":"
- + request.getServerPort() + request.getContextPath();
-
-String jsUrl = contextRoot + "/replay/client-rewrite.js";
+String contextRoot = results.getWbRequest().getContextPrefix();
%>
<script type="text/javascript">
var sWayBackCGI = "<%= contextPath %>";
</script>
-<script type="text/javascript" src="<%= jsUrl %>" ></script>
+<script type="text/javascript" src="<%= contextRoot %>js/client-rewrite.js" ></script>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Disclaimer.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Disclaimer.jsp 2008-07-29 02:16:35 UTC (rev 2518)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Disclaimer.jsp 2008-07-29 02:18:10 UTC (rev 2519)
@@ -30,13 +30,10 @@
String wmNotice = fmt.format("ReplayView.banner", resultUrl, resultDate);
String wmHideNotice = fmt.format("ReplayView.bannerHideLink");
-
-String contextRoot = request.getScheme() + "://" + request.getServerName() + ":"
-+ request.getServerPort() + request.getContextPath();
-String jsUrl = contextRoot + "/replay/disclaim.js";
+String contextRoot = results.getWbRequest().getContextPrefix();
%>
<script type="text/javascript">
var wmNotice = "<%= wmNotice %><%= dupeMsg %>";
var wmHideNotice = "<%= wmHideNotice %>";
</script>
-<script type="text/javascript" src="<%= jsUrl %>"></script>
+<script type="text/javascript" src="<%= contextRoot %>js/disclaim.js"></script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-12-05 22:34:18
|
Revision: 2648
http://archive-access.svn.sourceforge.net/archive-access/?rev=2648&view=rev
Author: bradtofel
Date: 2008-12-05 22:34:13 +0000 (Fri, 05 Dec 2008)
Log Message:
-----------
ACC-55: added explicit style="display:inline;" to all <img> tags, so they can't inherit a containing page's img style display:block declaration.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/JSLessTimeline.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/JSLessTimeline.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/JSLessTimeline.jsp 2008-12-05 22:24:43 UTC (rev 2647)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/JSLessTimeline.jsp 2008-12-05 22:34:13 UTC (rev 2648)
@@ -149,7 +149,7 @@
<table cellspacing="0" border="0" cellpadding="0" width="100%">
<tr>
<td width="48%" nowrap><span><%= firstDate %></span></td>
- <td align="center" valign="bottom" nowrap><img wmSpecial="1" src="<%= contextRoot %>/images/mark.jpg"></td>
+ <td align="center" valign="bottom" nowrap><img style="display: inline;" wmSpecial="1" src="<%= contextRoot %>/images/mark.jpg"></td>
<td width="48%" nowrap align="right"><span><%= lastDate %></span></td>
</tr>
</table>
@@ -165,7 +165,7 @@
first.getCaptureDate()) + "\"";
%><a wmSpecial="1" href="<%= results.resultToReplayUrl(first) %>"><%
}
- %><img <%= titleString %> wmSpecial="1" border=0 width=19 height=20 src="<%= contextRoot %>/images/first.jpg"><%
+ %><img style="display: inline;" <%= titleString %> wmSpecial="1" border=0 width=19 height=20 src="<%= contextRoot %>/images/first.jpg"><%
if(first != null) {
%></a><%
}
@@ -176,7 +176,7 @@
prev.getCaptureDate()) + "\"";
%><a wmSpecial="1" href="<%= results.resultToReplayUrl(prev) %>"><%
}
- %><img <%= titleString %> wmSpecial="1" border=0 width=13 height=20 src="<%= contextRoot %>/images/prev.jpg"><%
+ %><img style="display: inline;" <%= titleString %> wmSpecial="1" border=0 width=13 height=20 src="<%= contextRoot %>/images/prev.jpg"><%
if(first != null) {
%></a><%
}
@@ -205,17 +205,17 @@
}
if((i > 0) && (i < numPartitions)) {
-%><img wmSpecial="1" border=0 width=1 height=16 src="<%= contextRoot %>/images/linemark.jpg"><%
+%><img style="display: inline;" wmSpecial="1" border=0 width=1 height=16 src="<%= contextRoot %>/images/linemark.jpg"><%
}
if(replayUrl == null) {
-%><img wmSpecial="1" border=0 width=7 height=16 src="<%= imageUrl %>"><%
+%><img style="display: inline;" wmSpecial="1" border=0 width=7 height=16 src="<%= imageUrl %>"><%
} else {
-%><a wmSpecial="1" href="<%= replayUrl %>"><img wmSpecial="1" border=0 width=7 height=16 title="<%= prettyDateTime %>" src="<%= imageUrl %>"></a><%
+%><a wmSpecial="1" href="<%= replayUrl %>"><img style="display: inline;" wmSpecial="1" border=0 width=7 height=16 title="<%= prettyDateTime %>" src="<%= imageUrl %>"></a><%
}
}
@@ -229,7 +229,7 @@
next.getCaptureDate()) + "\"";
%><a wmSpecial="1" href="<%= results.resultToReplayUrl(next) %>"><%
}
- %><img wmSpecial="1" <%= titleString %> border=0 width=13 height=20 src="<%= contextRoot %>/images/next.jpg"><%
+ %><img style="display: inline;" wmSpecial="1" <%= titleString %> border=0 width=13 height=20 src="<%= contextRoot %>/images/next.jpg"><%
if(first != null) {
%></a><%
}
@@ -240,7 +240,7 @@
last.getCaptureDate()) + "\"";
%><a wmSpecial="1" href="<%= results.resultToReplayUrl(last) %>"><%
}
- %><img wmSpecial="1" <%= titleString %> border=0 width=19 height=20 src="<%= contextRoot %>/images/last.jpg"><%
+ %><img style="display: inline;" wmSpecial="1" <%= titleString %> border=0 width=19 height=20 src="<%= contextRoot %>/images/last.jpg"><%
if(first != null) {
%></a><%
}
@@ -283,7 +283,7 @@
%></a>
</td>
<td>
- <img wmSpecial="1" alt='' height='1' src='<%= contextRoot %>/images/1px.gif' width='5'>
+ <img style="display: inline;" wmSpecial="1" alt='' height='1' src='<%= contextRoot %>/images/1px.gif' width='5'>
</td>
</tr>
</table>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp 2008-12-05 22:24:43 UTC (rev 2647)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp 2008-12-05 22:34:13 UTC (rev 2648)
@@ -171,7 +171,7 @@
<table cellspacing="0" border="0" cellpadding="0" width="100%">
<tr>
<td width="48%" nowrap><span><%= firstDate %></span></td>
- <td align="center" valign="bottom" nowrap><img wmSpecial="1" src="<%= contextRoot %>/images/mark.jpg"></td>
+ <td align="center" valign="bottom" nowrap><img style="display: inline;" wmSpecial="1" src="<%= contextRoot %>/images/mark.jpg"></td>
<td width="48%" nowrap align="right"><span><%= lastDate %></span></td>
</tr>
</table>
@@ -187,7 +187,7 @@
first.getCaptureDate()) + "\"";
%><a wmSpecial="1" onclick="SetAnchorDate('<%= first.getCaptureTimestamp() %>');" href="<%= results.resultToReplayUrl(first) %>"><%
}
- %><img <%= titleString %> wmSpecial="1" border=0 width=19 height=20 src="<%= contextRoot %>/images/first.jpg"><%
+ %><img style="display: inline;" <%= titleString %> wmSpecial="1" border=0 width=19 height=20 src="<%= contextRoot %>/images/first.jpg"><%
if(first != null) {
%></a><%
}
@@ -198,7 +198,7 @@
prev.getCaptureDate()) + "\"";
%><a wmSpecial="1" onclick="SetAnchorDate('<%= prev.getCaptureTimestamp() %>');" href="<%= results.resultToReplayUrl(prev) %>"><%
}
- %><img <%= titleString %> wmSpecial="1" border=0 width=13 height=20 src="<%= contextRoot %>/images/prev.jpg"><%
+ %><img style="display: inline;" <%= titleString %> wmSpecial="1" border=0 width=13 height=20 src="<%= contextRoot %>/images/prev.jpg"><%
if(first != null) {
%></a><%
}
@@ -230,17 +230,17 @@
}
if((i > 0) && (i < numPartitions)) {
-%><img wmSpecial="1" border=0 width=1 height=16 src="<%= contextRoot %>/images/linemark.jpg"><%
+%><img style="display: inline;" wmSpecial="1" border=0 width=1 height=16 src="<%= contextRoot %>/images/linemark.jpg"><%
}
if(replayUrl == null) {
-%><img wmSpecial="1" border=0 width=7 height=16 src="<%= imageUrl %>"><%
+%><img style="display: inline;" wmSpecial="1" border=0 width=7 height=16 src="<%= imageUrl %>"><%
} else {
-%><a wmSpecial="1" onclick="SetAnchorDate('<%= ts %>');" href="<%= replayUrl %>"><img wmSpecial="1" border=0 width=7 height=16 title="<%= prettyDateTime %>" src="<%= imageUrl %>"></a><%
+%><a wmSpecial="1" onclick="SetAnchorDate('<%= ts %>');" href="<%= replayUrl %>"><img style="display: inline;" wmSpecial="1" border=0 width=7 height=16 title="<%= prettyDateTime %>" src="<%= imageUrl %>"></a><%
}
}
@@ -254,7 +254,7 @@
next.getCaptureDate()) + "\"";
%><a wmSpecial="1" onclick="SetAnchorDate('<%= next.getCaptureTimestamp() %>');" href="<%= results.resultToReplayUrl(next) %>"><%
}
- %><img wmSpecial="1" <%= titleString %> border=0 width=13 height=20 src="<%= contextRoot %>/images/next.jpg"><%
+ %><img style="display: inline;" wmSpecial="1" <%= titleString %> border=0 width=13 height=20 src="<%= contextRoot %>/images/next.jpg"><%
if(next != null) {
%></a><%
}
@@ -265,7 +265,7 @@
last.getCaptureDate()) + "\"";
%><a wmSpecial="1" onclick="SetAnchorDate('<%= last.getCaptureTimestamp() %>');" href="<%= results.resultToReplayUrl(last) %>"><%
}
- %><img wmSpecial="1" <%= titleString %> border=0 width=19 height=20 src="<%= contextRoot %>/images/last.jpg"><%
+ %><img style="display: inline;" wmSpecial="1" <%= titleString %> border=0 width=19 height=20 src="<%= contextRoot %>/images/last.jpg"><%
if(last != null) {
%></a><%
}
@@ -308,7 +308,7 @@
%></a>
</td>
<td>
- <img wmSpecial="1" alt='' height='1' src='<%= contextRoot %>/images/1px.gif' width='5'>
+ <img style="display: inline;" wmSpecial="1" alt='' height='1' src='<%= contextRoot %>/images/1px.gif' width='5'>
</td>
</tr>
</table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2010-04-24 00:48:15
|
Revision: 3063
http://archive-access.svn.sourceforge.net/archive-access/?rev=3063&view=rev
Author: bradtofel
Date: 2010-04-24 00:48:09 +0000 (Sat, 24 Apr 2010)
Log Message:
-----------
INITIAL REV: .jsp disclaimer which "forks" to either a "cool new" GraphTimeline disclaimer, or to a simple disclaimer which indicates a live web capture
Added Paths:
-----------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/DisclaimChooser.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/GraphDisclaimer.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/LiveWebDisclaimer.jsp
Added: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/DisclaimChooser.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/DisclaimChooser.jsp (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/DisclaimChooser.jsp 2010-04-24 00:48:09 UTC (rev 3063)
@@ -0,0 +1,14 @@
+<%@
+ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"
+%><%@
+ page import="org.archive.wayback.core.UIResults"
+%><%@
+ page import="org.archive.wayback.core.WaybackRequest"
+%><%
+UIResults results = UIResults.extractReplay(request);
+WaybackRequest wbr = results.getWbRequest();
+if(wbr.isLiveWebRequest()) {
+ %><jsp:include page="/WEB-INF/replay/LiveWebDisclaimer.jsp" flush="true" /><%
+} else {
+ %><jsp:include page="/WEB-INF/replay/GraphDisclaimer.jsp" flush="true" /><%
+}%>
\ No newline at end of file
Added: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/GraphDisclaimer.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/GraphDisclaimer.jsp (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/GraphDisclaimer.jsp 2010-04-24 00:48:09 UTC (rev 3063)
@@ -0,0 +1,258 @@
+<%@
+ 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="java.util.List"
+ %><%@
+ page import="java.text.ParseException"
+ %><%@
+ page import="org.archive.wayback.ResultURIConverter"
+ %><%@
+ 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.partition.PartitionPartitionMap"
+ %><%@
+ page import="org.archive.wayback.partition.PartitionsToGraph"
+ %><%@
+ page import="org.archive.wayback.util.graph.Graph"
+ %><%@
+ page import="org.archive.wayback.util.graph.GraphEncoder"
+ %><%@
+ page import="org.archive.wayback.util.graph.GraphRenderer"
+ %><%@
+ 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"
+ %><%
+UIResults results = UIResults.extractReplay(request);
+WaybackRequest wbRequest = results.getWbRequest();
+ResultURIConverter uriConverter = results.getURIConverter();
+String contextRoot = wbRequest.getContextPrefix();
+StringFormatter fmt = wbRequest.getFormatter();
+String staticPrefix = results.getContextConfig("static-prefix");
+if(staticPrefix == null) {
+ staticPrefix = contextRoot;
+}
+
+String graphJspPrefix = results.getContextConfig("graphJspPrefix");
+if(graphJspPrefix == null) {
+ graphJspPrefix = contextRoot;
+}
+CaptureSearchResults cResults = results.getCaptureResults();
+
+String exactDateStr = results.getResult().getCaptureTimestamp();
+Date exactDate = results.getResult().getCaptureDate();
+String searchUrl = wbRequest.getRequestUrl();
+String searchUrlSafe = fmt.escapeHtml(wbRequest.getRequestUrl());
+String searchUrlJS = fmt.escapeJavaScript(wbRequest.getRequestUrl());
+String resolution = wbRequest.getTimelineResolution();
+
+CaptureSearchResult first = null;
+CaptureSearchResult prev = null;
+CaptureSearchResult next = null;
+CaptureSearchResult last = null;
+
+Date firstDate = cResults.getFirstResultDate();
+Date lastDate = cResults.getLastResultDate();
+
+long resultCount = cResults.getReturnedCount();
+int resultIndex = 1;
+
+CaptureSearchResultPartitionMap monthMap =
+ new CaptureSearchResultPartitionMap();
+PartitionSize monthSize = Partitioner.monthSize;
+Partitioner<CaptureSearchResult> monthPartitioner =
+ new Partitioner<CaptureSearchResult>(monthMap);
+
+PartitionPartitionMap yearMap =
+ new PartitionPartitionMap();
+PartitionSize yearSize = Partitioner.yearSize;
+Partitioner<Partition<CaptureSearchResult>> yearPartitioner =
+ new Partitioner<Partition<CaptureSearchResult>>(yearMap);
+
+List<Partition<Partition<CaptureSearchResult>>> yearPartitions =
+ yearPartitioner.getRange(yearSize,firstDate,lastDate);
+
+int imgWidth = 800;
+int imgHeight = 35;
+Date firstYearDate = yearPartitions.get(0).getStart();
+Date lastYearDate = yearPartitions.get(yearPartitions.size()-1).getEnd();
+
+List<Partition<CaptureSearchResult>> monthPartitions =
+ monthPartitioner.getRange(monthSize,firstYearDate,lastYearDate);
+
+Iterator<CaptureSearchResult> it = cResults.iterator();
+
+monthPartitioner.populate(monthPartitions,it);
+
+yearPartitioner.populate(yearPartitions,monthPartitions.iterator());
+
+String yearFormatKey = "PartitionSize.dateHeader.yearGraphLabel";
+Graph graph = PartitionsToGraph.partsOfPartsToGraph(yearPartitions,fmt,yearFormatKey,imgWidth,imgHeight);
+String encodedGraph = GraphEncoder.encode(graph);
+String imgUrl = graphJspPrefix + "jsp/graph.jsp?graphdata=" + encodedGraph;
+String starLink = fmt.escapeHtml(contextRoot + "*/" + searchUrl);
+%>
+<!-- BEGIN WAYBACK TIMELINE DISCLAIMER INSERT -->
+<style type="text/css">
+#wm-disclaim {
+display:none;
+line-height:normal !important;
+border:1px solid #000 !important;
+padding:5px !important;
+position:relative !important;
+z-index:99999 !important;
+color:#000 !important;
+background-color:#efefef !important;
+font-size:12px !important;
+font-family:helvetica !important;
+text-align:left !important;
+}
+.wm-disclaim-value {
+font-size: 18px !important;
+font-weight: bold !important;
+color: #333 !important;
+}
+.wm-disclaim-label {
+font-size: 18px !important;
+color: #999 !important;
+}
+#wm-disclaim a {
+color:#00f !important;
+text-decoration:underline !important;
+font-size:12px !important;
+}
+#wm-disclaim-hide {
+float:right !important;
+margin:0 0 5px 5px !important;
+border:1px solid #ccc !important;
+padding:1px 5px !important;
+cursor:default !important;
+font-size:10px !important;
+font-weight:bold !important;
+color:#666 !important;
+}
+#wm-disclaim-hide:hover {
+border:1px outset #ccc !important;
+}
+#wm-disclaim-hide:focus, #wm-disclaim-hide:active {
+border:1px inset #ccc !important;
+}
+.wm-nav-link-div {
+padding:3px !important;
+text-align:center !important;
+}
+</style>
+<script type="text/javascript" src="<%= contextRoot %>js/graph-calc.js" ></script>
+<script type="text/javascript">
+var firstDate = <%= firstYearDate.getTime() %>;
+var lastDate = <%= lastYearDate.getTime() %>;
+var wbPrefix = "<%= contextRoot %>";
+var wbCurrentUrl = "<%= searchUrlJS %>";
+</script>
+<div id="wm-disclaim" dir="ltr" >
+ <table width="100%" border="0" cellpadding="0" cellspacing="3">
+ <tr>
+ <!-- WAYBACK LOGO -->
+ <td rowspan="2" valign="top" align="left"><a href="<%= contextRoot %>"><img style="padding-right:15px;" src="<%= staticPrefix %>images/wayback_logo_tr.gif" width="153" height="54" border="0"></a></td>
+ <!-- /WAYBACK LOGO -->
+ <td width="99%">
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td>
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td width="90%" style="text-align:left; vertical-align:top;">
+ <span class="wm-disclaim-label"><%= fmt.format("GraphTimeline.urlLabel") %></span> <span class="wm-disclaim-value"><%= searchUrlSafe %></span>
+ </td>
+ <td width="10%">
+ <!-- URL FORM -->
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <form action="<%= contextRoot %>query" method="get">
+ <td class="wm-disclaim-label"><%= fmt.format("GraphTimeline.searchLabel") %></td>
+ <td><input type="hidden" name="<%= WaybackRequest.REQUEST_TYPE %>" value="<%= WaybackRequest.REQUEST_CAPTURE_QUERY %>"><input type="text" name="<%= WaybackRequest.REQUEST_URL %>" value="http://" size="24" maxlength="256"></td>
+ <td><input type="submit" name="submit" value="<%= fmt.format("GraphTimeline.searchButtonText") %>"></td>
+ </form>
+ </tr>
+ </table>
+ <!-- /URL FORM -->
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td width="300" title="<%= fmt.format("GraphTimeline.dateLongFormat",exactDate) %>" class="wm-disclaim-label"><%= fmt.format("GraphTimeline.dateLabel") %> <span class="wm-disclaim-value"><%= fmt.spaceToNBSP(fmt.format("GraphTimeline.dateShortFormat",exactDate)) %></span></td>
+ <td width="40%">
+ <div class="wm-nav-link-div">
+ <a id="wm-graph-anchor" href="">
+ <img width="<%= imgWidth %>"
+ height="<%= imgHeight %>"
+ src="<%= imgUrl %>"
+ border="0"
+ onmousemove="document.getElementById('wm-graph-anchor').href= wbPrefix + calcTimestamp(event,this,firstDate,lastDate) + '/' + wbCurrentUrl"></img>
+ </a>
+ </div>
+ <div class="wm-nav-link-div">
+ <%
+ String navs[] = PartitionsToGraph.getNavigators(fmt,results.getResult());
+ String links[] = PartitionsToGraph.getNavigatorLinks(yearPartitions,uriConverter);
+ links[PartitionsToGraph.NAV_CURRENT] = starLink;
+ for(int i = 0; i < navs.length; i++) {
+ if(i > 0) {
+ %> <%
+ }
+ if(links[i] == null) {
+ %><%= navs[i] %><%
+ } else {
+ %> <a href="<%= links[i] %>"><%= navs[i] %></a> <%
+ }
+ }
+ %>
+ </div>
+ </td>
+ <td width="%1" align="right" valign="bottom">
+ <div id="wm-disclaim-hide" onclick="document.getElementById('wm-disclaim').style.display='none'">
+ hide
+ </div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+</div>
+<script type="text/javascript" src="<%= contextRoot %>js/disclaim-element.js" ></script>
+<script type="text/javascript">
+ var wmDisclaimBanner = document.getElementById("wm-disclaim");
+ if(wmDisclaimBanner != null) {
+ disclaimElement(wmDisclaimBanner);
+ }
+</script>
+<!-- END WAYBACK TIMELINE DISCLAIMER INSERT -->
Added: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/LiveWebDisclaimer.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/LiveWebDisclaimer.jsp (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/LiveWebDisclaimer.jsp 2010-04-24 00:48:09 UTC (rev 3063)
@@ -0,0 +1,36 @@
+<%@
+ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"
+%><%@
+ page import="org.archive.wayback.core.CaptureSearchResult"
+%><%@
+ page import="org.archive.wayback.core.UIResults"
+%><%@
+ page import="org.archive.wayback.core.WaybackRequest"
+%><%@
+ page import="org.archive.wayback.util.StringFormatter"
+%><%
+UIResults results = UIResults.extractReplay(request);
+CaptureSearchResult result = results.getResult();
+WaybackRequest wbr = results.getWbRequest();
+StringFormatter fmt = wbr.getFormatter();
+String contextRoot = wbr.getContextPrefix();
+
+String urlString = fmt.escapeHtml(wbr.getRequestUrl());
+String prettyDateTime =
+ fmt.format("MetaReplay.captureDateDisplay", result.getCaptureDate());
+%>
+<!-- Start of LiveWebDisclaimer.jsp output -->
+<div id="wm-disclaim-banner" style="display:none; position:relative; z-index:99999; background-color:#ffffff; font-size:10px; text-align:center; width:100%;">
+ The URL you requested, <%= urlString %> does not exist in this archive.
+ Wayback is showing you a document captured <b>very recently</b> from the live web. The version of the document
+ you are now seeing, archived at <%= prettyDateTime %>, will become part of
+ the permanent archive after it has been added to the archive index.
+</div>
+<script type="text/javascript" src="<%= contextRoot %>js/disclaim-element.js" ></script>
+<script type="text/javascript">
+ var wmDisclaimBanner = document.getElementById("wm-disclaim-banner");
+ if(wmDisclaimBanner != null) {
+ disclaimElement(wmDisclaimBanner);
+ }
+</script>
+<!-- End of LiveWebDisclaimer.jsp output -->
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2010-07-06 22:17:35
|
Revision: 3164
http://archive-access.svn.sourceforge.net/archive-access/?rev=3164&view=rev
Author: bradtofel
Date: 2010-07-06 22:17:28 +0000 (Tue, 06 Jul 2010)
Log Message:
-----------
tweaks
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Toolbar.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/replay/Toolbar.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Toolbar.jsp 2010-06-24 20:27:18 UTC (rev 3163)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Toolbar.jsp 2010-07-06 22:17:28 UTC (rev 3164)
@@ -174,7 +174,7 @@
<table style="border-collapse:collapse;margin:0 auto;padding:0;width:570px;"><tbody><tr>
<td style="padding:3px 0;" colspan="2">
- <form target="_top" method="get" action="<%= queryPrefix %>query" name="wmtb" id="wmtb" style="margin:0!important;padding:0!important;"><input type="text" name="<%= WaybackRequest.REQUEST_URL %>" id="wmtbURL" value="<%= searchUrlSafe %>" style="width:400px;font-size:11px;font-family:'Lucida Grande','Arial',sans-serif;"/><input type="hidden" name="<%= WaybackRequest.REQUEST_TYPE %>" value="<%= WaybackRequest.REQUEST_REPLAY_QUERY %>"><input type="submit" value="Go" style="font-size:11px;font-family:'Lucida Grande','Arial',sans-serif;margin-left:5px;"/><span id="wm_tb_options" style="display:block;"></span></form>
+ <form target="_top" method="get" action="<%= queryPrefix %>query" name="wmtb" id="wmtb" style="margin:0!important;padding:0!important;"><input type="text" name="<%= WaybackRequest.REQUEST_URL %>" id="wmtbURL" value="<%= searchUrlSafe %>" style="width:400px;font-size:11px;font-family:'Lucida Grande','Arial',sans-serif;"/><input type="hidden" name="<%= WaybackRequest.REQUEST_TYPE %>" value="<%= WaybackRequest.REQUEST_REPLAY_QUERY %>"><input type="hidden" name="<%= WaybackRequest.REQUEST_DATE %>" value="<%= data.curResult.getCaptureTimestamp() %>"><input type="submit" value="Go" style="font-size:11px;font-family:'Lucida Grande','Arial',sans-serif;margin-left:5px;"/><span id="wm_tb_options" style="display:block;"></span></form>
</td>
<td style="vertical-align:bottom;padding:5px 0 0 0!important;" rowspan="2">
<table style="border-collapse:collapse;width:110px;color:#99a;font-family:'Helvetica','Lucida Grande','Arial',sans-serif;"><tbody>
@@ -312,7 +312,7 @@
</td>
<td style="text-align:right;padding:5px;width:65px;font-size:11px!important;">
<a href="javascript:;" onclick="document.getElementById('wm-ipp').style.display='none';" style="display:block;padding-right:18px;background:url(<%= staticPrefix %>images/toolbar/wm_tb_close.png) no-repeat 100% 0;color:#33f;font-family:'Lucida Grande','Arial',sans-serif;margin-bottom:23px;" title="<%= fmt.format("ToolBar.closeTitle") %>"><%= fmt.format("ToolBar.closeText") %></a>
- <a href="FAQ" style="display:block;padding-right:18px;background:url(<%= staticPrefix %>images/toolbar/wm_tb_help.png) no-repeat 100% 0;color:#33f;font-family:'Lucida Grande','Arial',sans-serif;" title="<%= fmt.format("ToolBar.helpTitle") %>"><%= fmt.format("ToolBar.helpText") %></a>
+ <a href="https://webarchive.jira.com/wiki/display/WWMOS/FAQs" style="display:block;padding-right:18px;background:url(<%= staticPrefix %>images/toolbar/wm_tb_help.png) no-repeat 100% 0;color:#33f;font-family:'Lucida Grande','Arial',sans-serif;" title="<%= fmt.format("ToolBar.helpTitle") %>"><%= fmt.format("ToolBar.helpText") %></a>
</td>
</tr></tbody></table>
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-24 20:27:18 UTC (rev 3163)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp 2010-07-06 22:17:28 UTC (rev 3164)
@@ -35,19 +35,30 @@
int secs = 5;
%>
+ <jsp:include page="/WEB-INF/global-template/UI-header.jsp" flush="true" />
+
+ <div id="positionHome">
+ <section>
+ <div id="logoHome">
+ <h1><span>Internet Archive's Wayback Machine</span></h1>
+ </div>
+ </section>
+ <section>
+ <div id="error">
<script type="text/javascript">
function go() {
document.location.href = "<%= safeTargetReplayUrlJS %>";
}
window.setTimeout("go()",<%= secs * 1000 %>);
</script>
- <h2>Following redirect...</h2>
- <p>The URL you requested:</p>
- <p><%= safeSource %></p>
- <p>redirected to the URL:</p>
+ <p class="code">Loading...</p>
+ <p class="code shift"><%= safeSource %> | <%= prettyDate %></p>
+ <p class="code shift red">Got an HTTP 302 response at crawl time</p>
+ <p class="code">Redirecting to...</p>
<p><%= safeTarget %></p>
- <p>
- when it was crawled at <%= prettyDate %>. You will be redirected
- to that target in <%= secs %> seconds.
- Click <a href="<%= safeTargetReplayUrl %>">here</a> to go now.
- </p>
+ <p class="impatient"><a href="<%= safeTargetReplayUrl %>">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.
|
|
From: <bra...@us...> - 2010-07-28 00:29:33
|
Revision: 3196
http://archive-access.svn.sourceforge.net/archive-access/?rev=3196&view=rev
Author: bradtofel
Date: 2010-07-28 00:29:26 +0000 (Wed, 28 Jul 2010)
Log Message:
-----------
INITIAL REV: very preliminary Memento-style date-time content negotiation support. .JSP files really need some cleanup. lots of static references and date parsing operations should be centralized into a Memento.java support class.
Added Paths:
-----------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/MementoAggregate.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/MementoValidity.jsp
Added: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/MementoAggregate.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/MementoAggregate.jsp (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/MementoAggregate.jsp 2010-07-28 00:29:26 UTC (rev 3196)
@@ -0,0 +1,3 @@
+<jsp:include page="/WEB-INF/replay/ArchiveComment.jsp" flush="true" />
+<jsp:include page="/WEB-INF/replay/MementoValidity.jsp" flush="true" />
+<jsp:include page="/WEB-INF/replay/Disclaimer.jsp" flush="true" />
Added: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/MementoValidity.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/MementoValidity.jsp (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/MementoValidity.jsp 2010-07-28 00:29:26 UTC (rev 3196)
@@ -0,0 +1,103 @@
+<%@ page import="org.archive.wayback.core.UIResults" %>
+<%@ page import="org.archive.wayback.core.CaptureSearchResults" %>
+<%@ page import="org.archive.wayback.core.CaptureSearchResult"%>
+<%@ page import="java.util.Date" %>
+<%@ page import="org.archive.wayback.core.WaybackRequest" %>
+<%@ page import="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter" %>
+<%@ page import="java.text.SimpleDateFormat" %>
+<%@ page import="java.util.Iterator" %>
+<%
+ UIResults results = UIResults.extractCaptureQuery(request);
+ WaybackRequest wbRequest = results.getWbRequest();
+ CaptureSearchResults cResults = results.getCaptureResults();
+ CaptureSearchResult res = cResults.getClosest(wbRequest, true);
+ String u = wbRequest.getRequestUrl();
+ SimpleDateFormat httpformatterl = new SimpleDateFormat(
+ "E, dd MMM yyyy HH:mm:ss z");
+ String agguri = results.getContextConfig("aggregationPrefix")
+ + "timebundle/" + u;
+ String timemap = " , <"
+ + results.getContextConfig("aggregationPrefix")
+ + "timemap/link/" + u
+ + ">;rel=\"timemap\"; type=\"text/csv\"";
+ ArchivalUrlResultURIConverter uriconverter =
+ (ArchivalUrlResultURIConverter) results.getURIConverter();
+
+ String uriPrefix = uriconverter.getReplayURIPrefix();
+
+ Date f = cResults.getFirstResultDate();
+ Date l = cResults.getLastResultDate();
+ String qvalue = "1.0"; //just example
+ StringBuffer sb = new StringBuffer();
+ response.setHeader("Content-Datetime", httpformatterl.format(res
+ .getCaptureDate()));
+ SimpleDateFormat formatterk = new SimpleDateFormat("yyyyMMddHHmmss");
+ sb.append(", <" + uriPrefix + formatterk.format(f) + "/" + u
+ + ">;rel=\"first-memento\"; datetime=\""
+ + httpformatterl.format(f) + "\"");
+ if (!f.equals(l)) {
+
+ sb.append(", <" + uriPrefix + formatterk.format(f) + "/" + u
+ + ">;rel=\"last-memento\"; datetime=\""
+ + httpformatterl.format(f) + "\"");
+ }
+
+ // calculate closest values for alternates
+ Date closestDate = res.getCaptureDate();
+ CaptureSearchResult closestleft = null;
+ CaptureSearchResult closestright = null;
+ long rclosestDistance = 0;
+ long lclosestDistance = 0;
+ CaptureSearchResult cur = null;
+ String anchorDate = null;
+
+ long maxWindow = -1;
+ long wantTime = closestDate.getTime();
+
+ Iterator<CaptureSearchResult> itr = cResults.iterator();
+ while (itr.hasNext()) {
+ cur = itr.next();
+ cur.getCaptureDate();
+ long curDistance = wantTime - cur.getCaptureDate().getTime();
+ // == 0 propuskaem
+ if (curDistance > 0) {
+ if ((closestright == null)
+ || (Math.abs(curDistance) < Math
+ .abs(rclosestDistance))) {
+ closestright = cur;
+ rclosestDistance = Math.abs(curDistance);
+ }
+ }
+
+ if (curDistance < 0) {
+ if ((closestleft == null)
+ || (Math.abs(curDistance) < Math
+ .abs(lclosestDistance))) {
+ closestleft = cur;
+ lclosestDistance = Math.abs(curDistance);
+ }
+ }
+
+ }
+
+ if (closestleft != null) {
+ if (!closestleft.getCaptureDate().equals(f)) {
+ sb.append(", <" + uriPrefix + formatterk.format(f) + "/"
+ + u + ">;rel=\"prev-memento\"; datetime=\""
+ + httpformatterl.format(f) + "\"");
+ }
+ }
+ if (closestright != null) {
+ if (!closestright.getCaptureDate().equals(l)) {
+ sb.append(", <" + uriPrefix + formatterk.format(f) + "/"
+ + u + ">;rel=\"next-memento\"; datetime=\""
+ + httpformatterl.format(f) + "\"");
+ }
+
+ }
+
+ String origlink = ", <" + u + ">;rel=\"original\"";
+
+ response.setHeader("Link", "<" + agguri + ">;rel=\"timebundle\""
+ + origlink + sb.toString() + timemap);
+%>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2010-08-03 00:34:53
|
Revision: 3205
http://archive-access.svn.sourceforge.net/archive-access/?rev=3205&view=rev
Author: bradtofel
Date: 2010-08-03 00:34:47 +0000 (Tue, 03 Aug 2010)
Log Message:
-----------
LiveWebDisclaimer now looks quite similar to the standard Toolbar, tweaked CSS in normal Toolbar
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/LiveWebDisclaimer.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Toolbar.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/LiveWebDisclaimer.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/LiveWebDisclaimer.jsp 2010-08-03 00:33:59 UTC (rev 3204)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/LiveWebDisclaimer.jsp 2010-08-03 00:34:47 UTC (rev 3205)
@@ -1,36 +1,75 @@
-<%@
- page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"
-%><%@
- page import="org.archive.wayback.core.CaptureSearchResult"
-%><%@
- page import="org.archive.wayback.core.UIResults"
-%><%@
- page import="org.archive.wayback.core.WaybackRequest"
-%><%@
- 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="org.archive.wayback.core.CaptureSearchResult"
+%><%@ page import="org.archive.wayback.core.UIResults"
+%><%@ page import="org.archive.wayback.core.WaybackRequest"
+%><%@ page import="org.archive.wayback.util.url.UrlOperations"
+%><%@ page import="org.archive.wayback.util.StringFormatter"
%><%
UIResults results = UIResults.extractReplay(request);
CaptureSearchResult result = results.getResult();
-WaybackRequest wbr = results.getWbRequest();
-StringFormatter fmt = wbr.getFormatter();
-String contextRoot = results.getStaticPrefix();
+WaybackRequest wbRequest = results.getWbRequest();
+StringFormatter fmt = wbRequest.getFormatter();
-String urlString = fmt.escapeHtml(wbr.getRequestUrl());
+String staticPrefix = results.getStaticPrefix();
+String queryPrefix = results.getQueryPrefix();
+String replayPrefix = results.getReplayPrefix();
+
+String searchUrl =
+ UrlOperations.stripDefaultPortFromUrl(wbRequest.getRequestUrl());
+String searchUrlSafe = fmt.escapeHtml(searchUrl);
+
+Date captureDate = result.getCaptureDate();
+Date now = new Date();
+long capMSSE = captureDate.getTime();
+long nowMSSE = now.getTime();
+long ageMS = nowMSSE - capMSSE;
+long ageMins = Math.round(ageMS / (60 * 1000));
+
String prettyDateTime =
fmt.format("MetaReplay.captureDateDisplay", result.getCaptureDate());
%>
<!-- Start of LiveWebDisclaimer.jsp output -->
-<div id="wm-disclaim-banner" style="display:none; position:relative; z-index:99999; background-color:#ffffff; font-size:10px; text-align:center; width:100%;">
- The URL you requested, <%= urlString %> does not exist in this archive.
- Wayback is showing you a document captured <b>very recently</b> from the live web. The version of the document
- you are now seeing, archived at <%= prettyDateTime %>, will become part of
- the permanent archive after it has been added to the archive index.
+
+<style type="text/css">body{margin-top:0!important;padding-top:0!important;min-width:800px!important;}#wm-ipp a:hover{text-decoration:underline!important;}</style>
+<div id="wm-ipp" style="display:none; position:relative;padding:0 5px;min-height:70px;min-width:800px; z-index:9000;">
+<div id="wm-ipp-inside" style="position:fixed;padding:0!important;margin:0!important;width:97%;min-width:780px;border:5px solid #000;border-top:none;background-image:url(<%= staticPrefix %>images/toolbar/wm_tb_bk_trns.png);text-align:center;-moz-box-shadow:1px 1px 3px #333;-webkit-box-shadow:1px 1px 3px #333;box-shadow:1px 1px 3px #333;font-size:11px!important;font-family:'Lucida Grande','Arial',sans-serif!important;">
+ <table style="border-collapse:collapse;margin:0;padding:0;width:100%;"><tbody><tr>
+ <td style="padding:10px;vertical-align:top;min-width:110px;">
+ <a href="<%= queryPrefix %>" title="Wayback Machine home page" style="background-color:transparent;border:none;"><img src="<%= staticPrefix %>images/toolbar/wayback-toolbar-logo.png" alt="Wayback Machine" width="110" height="39" border="0"/></a>
+ </td>
+ <td style="padding:0!important;text-align:center;vertical-align:top;width:100%;">
+
+ <table style="border-collapse:collapse;margin:0 auto;padding:0;width:570px;"><tbody><tr>
+ <td style="padding:3px 0;" colspan="2">
+ <form target="_top" method="get" action="<%= queryPrefix %>query" name="wmtb" id="wmtb" style="margin:0!important;padding:0!important;"><input type="text" name="<%= WaybackRequest.REQUEST_URL %>" id="wmtbURL" value="<%= searchUrlSafe %>" style="width:400px;font-size:11px;font-family:'Lucida Grande','Arial',sans-serif;"/><input type="hidden" name="<%= WaybackRequest.REQUEST_TYPE %>" value="<%= WaybackRequest.REQUEST_REPLAY_QUERY %>"><input type="hidden" name="<%= WaybackRequest.REQUEST_DATE %>" value="<%= result.getCaptureTimestamp() %>"><input type="submit" value="Go" style="font-size:11px;font-family:'Lucida Grande','Arial',sans-serif;margin-left:5px;"/><span id="wm_tb_options" style="display:block;"></span></form>
+ </td>
+ </tr>
+ <tr>
+ <td style="padding:0!important;">
+ <table style="border-collapse:collapse;margin:0;padding:0;width:100%;"><tbody><tr>
+ <td rowspan="2" style="padding-right:10px!important;"><img src="<%= staticPrefix %>images/toolbar/icon_alert.png" width="24" height="24" border="0" alt="Alert!"/></td>
+ <td style="font-family:'Arial',sans-serif;font-size:14px;font-weight:700;color:#2eaeec; text-align:left;">The Wayback Machine hasn't archived a capture for that URL.</td>
+ </tr>
+ <tr>
+ <td style="font-family:'Georgia',serif;font-size:13px;color:#333; text-align:left;">Here's a capture taken <%= ageMins %> minutes ago from the live web that will become part of the permanent archive in the next few months.</td>
+ </tr></tbody></table>
+ </td>
+ </tr></tbody></table>
+ </td>
+ <td style="text-align:right;padding:5px;width:65px;font-size:11px!important;">
+ <a href="javascript:;" onclick="document.getElementById('wm-ipp').style.display='none';" style="display:block;padding-right:18px;background:url(<%= staticPrefix %>images/toolbar/wm_tb_close.png) no-repeat 100% 0;color:#33f;font-family:'Lucida Grande','Arial',sans-serif;margin-bottom:23px;background-color:transparent;border:none;" title="<%= fmt.format("ToolBar.closeTitle") %>"><%= fmt.format("ToolBar.closeText") %></a>
+ <a href="https://webarchive.jira.com/wiki/display/WWMOS/FAQs" style="display:block;padding-right:18px;background:url(<%= staticPrefix %>images/toolbar/wm_tb_help.png) no-repeat 100% 0;color:#33f;font-family:'Lucida Grande','Arial',sans-serif;background-color:transparent;border:none;" title="<%= fmt.format("ToolBar.helpTitle") %>"><%= fmt.format("ToolBar.helpText") %></a>
+ </td>
+ </tr></tbody></table>
+
</div>
-<script type="text/javascript" src="<%= contextRoot %>js/disclaim-element.js" ></script>
+</div>
+<script type="text/javascript" src="<%= staticPrefix %>js/disclaim-element.js" ></script>
<script type="text/javascript">
- var wmDisclaimBanner = document.getElementById("wm-disclaim-banner");
+ var wmDisclaimBanner = document.getElementById("wm-ipp");
if(wmDisclaimBanner != null) {
disclaimElement(wmDisclaimBanner);
}
</script>
-<!-- End of LiveWebDisclaimer.jsp output -->
\ No newline at end of file
+<!-- End of LiveWebDisclaimer.jsp output -->
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Toolbar.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Toolbar.jsp 2010-08-03 00:33:59 UTC (rev 3204)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Toolbar.jsp 2010-08-03 00:34:47 UTC (rev 3205)
@@ -167,7 +167,7 @@
<div id="wm-ipp" style="display:none; position:relative;padding:0 5px;min-height:70px;min-width:800px; z-index:9000;">
<div id="wm-ipp-inside" style="position:fixed;padding:0!important;margin:0!important;width:97%;min-width:780px;border:5px solid #000;border-top:none;background-image:url(<%= staticPrefix %>images/toolbar/wm_tb_bk_trns.png);text-align:center;-moz-box-shadow:1px 1px 3px #333;-webkit-box-shadow:1px 1px 3px #333;box-shadow:1px 1px 3px #333;font-size:11px!important;font-family:'Lucida Grande','Arial',sans-serif!important;">
<table style="border-collapse:collapse;margin:0;padding:0;width:100%;"><tbody><tr>
- <td style="padding:10px;vertical-align:top;min-width:140px;">
+ <td style="padding:10px;vertical-align:top;min-width:110px;">
<a href="<%= queryPrefix %>" title="Wayback Machine home page" style="background-color:transparent;border:none;"><img src="<%= staticPrefix %>images/toolbar/wayback-toolbar-logo.png" alt="Wayback Machine" width="110" height="39" border="0"/></a>
</td>
<td style="padding:0!important;text-align:center;vertical-align:top;width:100%;">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X