[sword-cvs] swordweb/layouts base-layout.jsp,1.9,1.10

sword@www.crosswire.org sword@www.crosswire.org
Wed, 22 Oct 2003 02:13:39 -0700


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

Modified Files:
	base-layout.jsp 
Log Message:
fixes

Index: base-layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/layouts/base-layout.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- base-layout.jsp	16 Oct 2003 14:02:21 -0000	1.9
+++ base-layout.jsp	22 Oct 2003 09:13:37 -0000	1.10
@@ -7,30 +7,12 @@
 <head>
 	<title>OSIS Web:<tiles:getAsString name="title"/></title>
 
+	<link href="wash.css" title="Washed Out" rel="stylesheet" type="text/css" />
+	<link href="blue.css" title="Old Blue" rel="alternate stylesheet" type="text/css" />
+	<link href="blank.css" title="Blank" rel="alternate stylesheet" type="text/css" />
 
-	<%
-		String print = request.getParameter("print");
-		if ("1".equals(print)) {
-	%>
-			<link href="print.css" title="Printer friendly" rel="stylesheet" type="text/css" />
-	<%
-		}
-		else {
-	%>
-			<link href="wash.css" title="Washed Out" rel="stylesheet" type="text/css" />
-			<link href="blue.css" title="Old Blue" rel="alternate stylesheet" type="text/css" />
-			<link href="blank.css" title="Blank" rel="alternate stylesheet" type="text/css" />
-	<%
-		}
-	%>
-
-		<link href="wash.css" title="Washed Out" rel="stylesheet" type="text/css" />
-		<link href="blue.css" title="Old Blue" rel="alternate stylesheet" type="text/css" />
-		<link href="blank.css" title="Blank" rel="alternate stylesheet" type="text/css" />
-
-		<!--For printing stuff -->
-		<link rel="stylesheet" type="text/css" media="print" href="print.css" />
-
+	<!--For printing stuff -->
+	<link rel="stylesheet" type="text/css" media="print" href="print.css" />
 </head>
 
 	<body>
@@ -47,7 +29,7 @@
             <legend>by keyword or phrase:</legend> <input type="text" name="searchTerm" size="10" /> <input type="submit" value="go" title="Search by keyword or phrase" />
           </fieldset>
         </form>
-        <form action="passagestudy.jsp">
+	<form action="<tiles:getAsString name="lookup_url"/>">
           <fieldset>
             <legend>by verse or passage:</legend> <input type="text" name="key" size="10" /> <input type="submit" value="go" title="Search by verse or passage" />
           </fieldset>