From: <bra...@us...> - 2010-05-18 23:39:34
|
Revision: 3120 http://archive-access.svn.sourceforge.net/archive-access/?rev=3120&view=rev Author: bradtofel Date: 2010-05-18 23:39:28 +0000 (Tue, 18 May 2010) Log Message: ----------- now uses getQuery|Static|ReplayPrefix Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/template/UI-footer.jsp trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/template/UI-header.jsp Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/template/UI-footer.jsp =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/template/UI-footer.jsp 2010-05-18 23:38:40 UTC (rev 3119) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/template/UI-footer.jsp 2010-05-18 23:39:28 UTC (rev 3120) @@ -4,18 +4,20 @@ <% UIResults results = UIResults.getGeneric(request); StringFormatter fmt = results.getWbRequest().getFormatter(); -String contextRoot = results.getWbRequest().getContextPrefix(); -String serverRoot = results.getWbRequest().getServerPrefix(); + +String staticPrefix = results.getStaticPrefix(); +String queryPrefix = results.getQueryPrefix(); +String replayPrefix = results.getReplayPrefix(); %> <!-- FOOTER --> <div align="center"> <hr noshade size="1" align="center"> <p> - <a href="<%= contextRoot %>"> + <a href="<%= staticPrefix %>"> <%= fmt.format("UIGlobal.homeLink") %> </a> | - <a href="<%= contextRoot %>help.jsp"> + <a href="<%= staticPrefix %>help.jsp"> <%= fmt.format("UIGlobal.helpLink") %> </a> </p> Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/template/UI-header.jsp =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/template/UI-header.jsp 2010-05-18 23:38:40 UTC (rev 3119) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/template/UI-header.jsp 2010-05-18 23:39:28 UTC (rev 3120) @@ -8,8 +8,11 @@ UIResults results = UIResults.getGeneric(request); WaybackRequest wbRequest = results.getWbRequest(); StringFormatter fmt = wbRequest.getFormatter(); -String contextRoot = wbRequest.getContextPrefix(); -String serverRoot = wbRequest.getServerPrefix(); + +String staticPrefix = results.getStaticPrefix(); +String queryPrefix = results.getQueryPrefix(); +String replayPrefix = results.getReplayPrefix(); + %> <!-- HEADER --> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -18,8 +21,8 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <link rel="stylesheet" type="text/css" - href="<%= contextRoot %>css/styles.css" - src="<%= contextRoot %>css/styles.css" /> + href="<%= staticPrefix %>css/styles.css" + src="<%= staticPrefix %>css/styles.css" /> <title><%= fmt.format("UIGlobal.pageTitle") %></title> <base target="_top" /> </head> @@ -33,7 +36,7 @@ <!-- WAYBACK LOGO --> - <td width="26%"><a href="<%= contextRoot %>"><img src="<%= contextRoot %>images/wayback_logo_sm.gif" width="153" height="54" border="0"></a></td> + <td width="26%"><a href="<%= staticPrefix %>"><img src="<%= staticPrefix %>images/wayback_logo_tr.gif" width="153" height="54" border="0"></a></td> <!-- /WAYBACK LOGO --> @@ -56,11 +59,11 @@ <!-- URL FORM --> - <form action="<%= contextRoot %>query" method="get"> + <form action="<%= queryPrefix %>query" method="get"> <tr> - <td nowrap align="center"><img src="<%= contextRoot %>images/shim.gif" width="1" height="20"> + <td nowrap align="center"><img src="<%= staticPrefix %>images/shim.gif" width="1" height="20"> <b class="mainBodyW"> <font size="2" color="#FFFFFF" face="Arial, Helvetica, sans-serif"> @@ -89,7 +92,7 @@ <input type="submit" name="Submit" value="<%= fmt.format("UIGlobal.urlSearchButton") %>" align="absMiddle"> - <a href="<%= contextRoot %>advanced_search.jsp" style="color:white;font-size:11px"> + <a href="<%= staticPrefix %>advanced_search.jsp" style="color:white;font-size:11px"> <%= fmt.format("UIGlobal.advancedSearchLink") %> </a> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |