[sword-cvs] swordweb index.jsp,1.25,1.26 init.jsp,1.12,1.13

sword@www.crosswire.org sword@www.crosswire.org
Wed, 19 Nov 2003 01:13:15 -0700


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

Modified Files:
	index.jsp init.jsp 
Log Message:



Index: index.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/index.jsp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- index.jsp	18 Nov 2003 20:38:30 -0000	1.25
+++ index.jsp	19 Nov 2003 08:13:12 -0000	1.26
@@ -48,12 +48,9 @@
 <div id="style">
 <h2>Style:</h2>
 		<ul>
-			<li><a title="Washed Out" 
-href="index.jsp?setStyle=Washed+Out">Washed Out</a></li>
-			<li><a title="Sandy Creek" 
-href="index.jsp?setStyle=Sandy+Creek">Sandy Creek</a></li>
-			<li><a title="Parchment" 
-href="index.jsp?setStyle=Parchment">Parchment</a></li>
+<% for (int i = 0; i < styleNames.size(); i++) { %>
+			<li><a href="index.jsp?setStyle=<%= URLEncoder.encode((String)styleNames.get(i)) %>" title="<%= (String) styleNames.get(i) %>"><%= (String) styleNames.get(i) %></a></li>
+<% } %>
 		</ul>
 </div>
 

Index: init.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/init.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- init.jsp	18 Nov 2003 04:33:50 -0000	1.12
+++ init.jsp	19 Nov 2003 08:13:13 -0000	1.13
@@ -16,6 +16,7 @@
 	static Vector tabNames = null;
 	static Vector tabLinks = null;
 	static Vector tabTitles = null;
+	static Vector tabDefaults = null;
 %>
 
 <%
@@ -26,42 +27,52 @@
 			styleFiles = new Vector();
 			styleDescriptions = new Vector();
 
-			styleNames.add("Washed Out");
-			styleFiles.add("wash.css");
+			styleNames.add("Parchment");
+			styleFiles.add("parchment.css");
 
 			styleNames.add("Sandy Creek");
 			styleFiles.add("sandy.css");
 
-			styleNames.add("Parchment");
-			styleFiles.add("parchment.css");
+			styleNames.add("Washed Out");
+			styleFiles.add("wash.css");
 
 			tabNames  = new Vector();
 			tabLinks  = new Vector();
 			tabTitles = new Vector();
+			tabDefaults = new Vector();
+
 			tabNames.add("Home");
 			tabTitles.add("Home");
 			tabLinks.add("index.jsp");
+			tabDefaults.add("true");
 			tabNames.add("Passage Study");
 			tabTitles.add("Passage Study");
 			tabLinks.add("passagestudy.jsp");
+			tabDefaults.add("true");
 			tabNames.add("Parallel");
 			tabTitles.add("Parallel Display");
 			tabLinks.add("parallelstudy.jsp");
+			tabDefaults.add("true");
 			tabNames.add("Power Search");
 			tabTitles.add("Power Search");
 			tabLinks.add("powersearch.jsp");
+			tabDefaults.add("true");
 			tabNames.add("Devotionals");
 			tabTitles.add("Daily Devotionals");
 			tabLinks.add("dailydevotion.jsp");
+			tabDefaults.add("false");
 			tabNames.add("Library");
 			tabTitles.add("Full Library");
 			tabLinks.add("fulllibrary.jsp");
+			tabDefaults.add("false");
 			tabNames.add("Preferences");
 			tabTitles.add("Preferences");
 			tabLinks.add("preferences.jsp");
+			tabDefaults.add("true");
 			tabNames.add("FAQ");
 			tabTitles.add("Frequently Asked Questions");
 			tabLinks.add("about.jsp");
+			tabDefaults.add("true");
 		}
 	}
 
@@ -122,7 +133,7 @@
 	if (showTabs == null) {
 		showTabs = new Vector();
 		for (int i = 0; i < tabNames.size(); i++) {
-			showTabs.add("true");
+			showTabs.add((String)tabDefaults.get(i));
 		}
 	}
 	String[] showTab = request.getParameterValues("showTab");