[sword-cvs] swordweb blues.css,1.5,1.6 bookdisplay.jsp,1.2,1.3 fulllibrary.jsp,1.6,1.7 index.jsp,1.6,1.7

sword@www.crosswire.org sword@www.crosswire.org
Wed, 17 Sep 2003 15:22:45 -0700


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

Modified Files:
	blues.css bookdisplay.jsp fulllibrary.jsp index.jsp 
Log Message:
small fixes

Index: blues.css
===================================================================
RCS file: /usr/local/cvsroot/swordweb/blues.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- blues.css	20 Aug 2003 18:02:19 -0000	1.5
+++ blues.css	17 Sep 2003 22:22:43 -0000	1.6
@@ -64,23 +64,32 @@
 	margin: .5em 0 0 0;
 	}
 
-a {font: bold 11px/16px verdana, geneva, arial, helvetica, sans-serif; 
+a {
+	font: bold 11px/16px verdana, geneva, arial, helvetica, sans-serif;
 	color: #69c;
-	background: transparent; 
-	text-decoration: none;}
-a:link {color: #69c; 
-	background: 
-	ransparent;}
+	background: transparent;
+	text-decoration: none;
+	}
+
+a:link {
+	color: #69c;
+	background:
+	ransparent;
+	}
+
 a:visited {
-	color: #69c; 
-	background: transparent;}
-a:hover {color: #000099; 
-	background: transparent; 
-	text-decoration: none;}
+	color: #69c;
+	background: transparent;
+	}
+a:hover {
+	color: #000099;
+	background: transparent;
+	text-decoration: none;
+	}
 a:active {
-	color: #69c; 
-	background: 
-	transparent; 
+	color: #69c;
+	background:
+	transparent;
 	text-decoration: none;}
 
 /* header content section ---------- */
@@ -100,12 +109,21 @@
 	background-color: transparent;
 	}
 
-#header ul li {display:inline;
+#header img {
+	align:right;
+	top:5px;
+	right:5px;
+	position:absolute;
+	}
+
+#header ul li {
+	display:inline;
 	padding: 0px 0px 0px 0px;
 	margin: 0px 0px 0px 0px;
 }
 
 #header ul {
+	display:inline;
 	padding: 0px 0px 0px 0px;
 	margin: 0px 0px 0px 0px;
 }
@@ -144,8 +162,10 @@
 	padding: 0px 0px 0px 10px;
 	margin: 0px 0px 0px 5px;
 	list-style-type: square;
+	list-style-type:none;
 }
 
+
 /* --- right column ---------- */
 
 #content-sub-2 {
@@ -167,7 +187,7 @@
 }
 
 
-	/* --- center column  (main content)---------- */
+/* --- center column  (main content)---------- */
 
 #content-main {
 	margin: 0 185px;
@@ -266,19 +286,18 @@
 /* blue panel */
 .bluepanel {
 	background-color: #eeeeee;
-	border: 1px dotted #dddddd;
-	padding: 0px 5px 0px 5px;
-	text-align: left;
+	border:1px solid #dddddd;
+	padding:0px 5px 0px 5px;
+	text-align:left;
 }
 
 .bluepanel input.textinput{
-	border-style: solid;
-	border: 1px solid #555555;
+	border:1px solid #555555;
 	width:100px;
 }
 
-.bluepanel input.searchbutton{
-	border: 2px outset #eeeeee;
+.bluepanel input.searchbutton {
+	border: 2px solid #eeeeee;
 	color:#ffffff;
 	background-color:#000099;
 }
@@ -326,6 +345,22 @@
 	padding: 0;
 	margin: 0;
 }
+
+
+ul.library {
+}
+
+ul.library li {
+	font-size:small;
+}
+ul.library ul  {
+
+}
+ul.library ul li {
+	font-size:x-small;
+}
+
+
 
 ul.booknav {
 	padding: 0px 0px 0px 0px;

Index: bookdisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/bookdisplay.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bookdisplay.jsp	20 Aug 2003 05:08:36 -0000	1.2
+++ bookdisplay.jsp	17 Sep 2003 22:22:43 -0000	1.3
@@ -96,13 +96,13 @@
 			if (target.equals(rootTreeKey))
 				out.print("<b>");
 			if (children.length > 0) {
-				out.print("<a href=\"bookdisplay.jsp?" + ((open)?"close":"open") + "=" + URLEncoder.encode(rootTreeKey) + "\">" + ((open)?"[-]":"[+]") + "</a>");
+				out.print("<a href=\"bookdisplay.jsp?" + ((open)?"close":"open") + "=" + URLEncoder.encode(rootTreeKey) + "\"><img src=\"images/" + ((open)?"minus":"plus") + ".png\"/></a>");
 			}
 			if (target.equals(rootTreeKey))
 				out.print("</b>");
 			out.print(" <a href=\"bookdisplay.jsp?gbsEntry=" + URLEncoder.encode(rootTreeKey) + "\">" + localName + "</a></li>");
 		}
-				
+
 		if ((open) || (offset < 1)) {
 			if (children.length > 0)
 				out.print("<ul>");
@@ -110,7 +110,7 @@
 			for (int i = 0; i < children.length; i++) {
 				printTree(bookTreeOpen, out, module, rootTreeKey+"/"+children[i], target);
 			}
-				
+
 			if (children.length > 0)
 				out.print("</ul>");
 		}

Index: fulllibrary.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/fulllibrary.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fulllibrary.jsp	31 Aug 2003 01:53:04 -0000	1.6
+++ fulllibrary.jsp	17 Sep 2003 22:22:43 -0000	1.7
@@ -43,7 +43,8 @@
 	<tiles:put name="lookup_url" value="fulllibrary.jsp" />
 	<tiles:put name="title" value="Full Library Catalog" />
 	<tiles:put name="sidebar_left" type="string">
-		<ul>
+		<h3>OSIS Library</h3>
+		<ul class="library">
 <%
 			Vector leaves = new Vector();
 			for (int i = 0; i < modInfo.length; i++) {
@@ -51,8 +52,8 @@
 					leaves.add(modInfo[i].category);
 					boolean open = catTreeOpen.contains(modInfo[i].category);
 %>
-		
-					<li><b><a href="fulllibrary.jsp?<%= (open)?"close":"open" %>=<%= URLEncoder.encode(modInfo[i].category) %>"><%= ((open)?"[-]":"[+]") %></a>  <%= modInfo[i].category %></b></li>
+
+					<li><a href="fulllibrary.jsp?<%= (open)?"close":"open" %>=<%= URLEncoder.encode(modInfo[i].category) %>"> <img src="images/<%= ((open)?"minus":"plus") %>.png"/></a>  <%= modInfo[i].category %></li>
 <%
 					if (open) {
 %>

Index: index.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/index.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- index.jsp	31 Aug 2003 01:53:04 -0000	1.6
+++ index.jsp	17 Sep 2003 22:22:43 -0000	1.7
@@ -16,7 +16,7 @@
 </ul>
 </div>
 <div>
-<h3>OSIS Library</h3><br/>
+<h3>OSIS Library</h3>
 		<ul>
 <%
 			Vector leaves = new Vector();
@@ -24,8 +24,7 @@
 				if (!leaves.contains(modInfo[i].category)) {
 					leaves.add(modInfo[i].category);
 %>
-		
-<li><a href="fulllibrary.jsp?action=closeAll&open=<%= URLEncoder.encode(modInfo[i].category) %>"><%= modInfo[i].category %></a></li><br/>
+<li><a href="fulllibrary.jsp?action=closeAll&amp;open=<%= URLEncoder.encode(modInfo[i].category) %>"><img width="10" height="10" alt="+" src="images/plus.png"/> <%= modInfo[i].category %></a></li>
 <%
 				}
 			}