Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access:[2782] branches/wayback-1_4_2/wayback-webapp/src /main/webapp/WEB-INF/replay
|
From: <bra...@us...> - 2009-07-18 00:40:11
|
Revision: 2782
http://archive-access.svn.sourceforge.net/archive-access/?rev=2782&view=rev
Author: bradtofel
Date: 2009-07-18 00:40:05 +0000 (Sat, 18 Jul 2009)
Log Message:
-----------
FEATURE: Timeline.jsp improvements which prevent Timeline from being severely distorted on some pages.
Modified Paths:
--------------
branches/wayback-1_4_2/wayback-webapp/src/main/webapp/WEB-INF/replay/JSLessTimeline.jsp
branches/wayback-1_4_2/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp
Modified: branches/wayback-1_4_2/wayback-webapp/src/main/webapp/WEB-INF/replay/JSLessTimeline.jsp
===================================================================
--- branches/wayback-1_4_2/wayback-webapp/src/main/webapp/WEB-INF/replay/JSLessTimeline.jsp 2009-07-18 00:38:09 UTC (rev 2781)
+++ branches/wayback-1_4_2/wayback-webapp/src/main/webapp/WEB-INF/replay/JSLessTimeline.jsp 2009-07-18 00:40:05 UTC (rev 2782)
@@ -21,8 +21,8 @@
StringFormatter fmt = wbRequest.getFormatter();
CaptureSearchResults cResults = results.getCaptureResults();
-String exactDateStr = wbRequest.getReplayTimestamp();
-Date exactDate = wbRequest.getReplayDate();
+String exactDateStr = results.getResult().getCaptureTimestamp();
+Date exactDate = results.getResult().getCaptureDate();
String searchUrl = wbRequest.getRequestUrl();
String resolution = wbRequest.getTimelineResolution();
@@ -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: branches/wayback-1_4_2/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp
===================================================================
--- branches/wayback-1_4_2/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp 2009-07-18 00:38:09 UTC (rev 2781)
+++ branches/wayback-1_4_2/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp 2009-07-18 00:40:05 UTC (rev 2782)
@@ -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.
|
