[sword-cvs] swordweb/tiles header.jsp,1.11,1.12

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/swordweb/tiles
In directory www:/tmp/cvs-serv14253/tiles

Modified Files:
	header.jsp 
Log Message:
merged in changes from Don; th eother changes he needed, too

Index: header.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/tiles/header.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- header.jsp	24 Sep 2003 18:19:34 -0000	1.11
+++ header.jsp	15 Oct 2003 15:05:33 -0000	1.12
@@ -1,26 +1,30 @@
+<%
+	String u = request.getRequestURI();
+	String homeID = u.endsWith("index.jsp") ? "id=\"current\"" : "";
+	String passageID = u.endsWith("passageStudy.jsp") ? "id=\"current\"" : "";
+	String parallelID = u.endsWith("parallelstudy.jsp") ? "id=\"current\"" : "";
+	String searchID = u.endsWith("powersearch.jsp") || u.endsWith("wordsearchresults.jsp")  ? "id=\"current\"" : "";
+	String devotionalID = u.endsWith("dailydevotional.jsp") ? "id=\"current\"" : "";
+	String libraryID = u.endsWith("fulllibrary.jsp") ? "id=\"current\"" : "";
+	String preferencesID = u.endsWith("preferences.jsp") ? "id=\"current\"" : "";
+	String aboutID = u.endsWith("about.jsp") ? "id=\"current\"" : "";
+	String helpID = u.endsWith("help.jsp") ? "id=\"current\"" : "";
+%>
+
+
   <div id="header">
     <h1><acronym title="Open Scripture Information Standard">OSIS</acronym> Bible Tool</h1>
     <div id="navlist">
       <ul>
-        <li><a href="index.jsp" title="Home" id="current">Home</a></li>
-        <li><a href="passagestudy.jsp" title="Passage Study">Passage Study</a></li>
-        <li><a href="parallelstudy.jsp" title="Parallel Translations">Parallel</a></li>
-        <li><a href="powersearch.jsp" title="Power Search">Search</a></li>
-        <li><a href="dailydevotion.jsp" title="Daily Devotionals">Devotionals</a></li>
-        <li><a href="fulllibrary.jsp" title="Full Library">Library</a></li>
-        <li><a href="preferences.jsp" title="Preferences">Preferences</a></li>
-        <li><a href="about.jsp" title="About">About</a></li>
-        <li><a href="help.jsp" title="Help">Help</a></li>
+        <li><a href="index.jsp" title="Home" <%= homeID %>>Home</a></li>
+        <li><a href="passagestudy.jsp" title="Passage Study" <%= passageID %>>Passage Study</a></li>
+        <li><a href="parallelstudy.jsp" title="Parallel Translations" <%= parallelID %>>Parallel</a></li>
+        <li><a href="powersearch.jsp" title="Power Search" <%= searchID %>>Search</a></li>
+        <li><a href="dailydevotion.jsp" title="Daily Devotionals" <%= devotionalID %>>Devotionals</a></li>
+        <li><a href="fulllibrary.jsp" title="Full Library" <%= libraryID %>>Library</a></li>
+        <li><a href="preferences.jsp" title="Preferences" <%= preferencesID %>>Preferences</a></li>
+        <li><a href="about.jsp" title="About" <%= aboutID %>>About</a></li>
+        <li><a href="help.jsp" title="Help" <%= helpID %>>Help</a></li>
       </ul>
-		<%
-		String uri = request.getRequestURI();
-		if (request.getQueryString() != null) {
-			uri += "?print=1&" + request.getQueryString();
-		}
-		else {
-			uri += "?print=1";
-		}
-		%>
-		&nbsp;&nbsp;&nbsp;&nbsp;<a target="_blank" href="<%= uri %>">Print</a>
     </div>
   </div>