[sword-cvs] swordweb/layouts base-layout.jsp,1.7,1.8

Wed, 15 Oct 2003 08:05:35 -0700

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

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

Index: base-layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/layouts/base-layout.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8

--- base-layout.jsp	24 Sep 2003 18:19:34 -0000	1.7
+++ base-layout.jsp	15 Oct 2003 15:05:33 -0000	1.8
@@ -7,36 +7,15 @@
 <head>
 	<title>OSIS Web:<tiles:getAsString name="title"/></title>
 
-	<%
-		String print = request.getParameter("print");
-		if ("1".equals(print)) {
-	%>
-			<link href="print.css" title="Printer friendly" rel="stylesheet" type="text/css" />
-	<%
-		}
-		else {
-	%>
-			<link href="blues.css" title="Blue" rel="stylesheet" type="text/css" />
-			<link href="wash.css" title="Washed Out" 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" />
 </head>
 
-<%
-	if ("1".equals(request.getParameter("print"))) {
-%>
-	<body onLoad="window.print();">
-<%
-	}
-	else {
-%>
 	<body>
-<%
-	}
-%>
-
 	<%-- include footer --%>
 	<tiles:insert attribute="header" />
 
@@ -57,23 +36,30 @@
         </form>
       </div>
 
+	  <%-- include left sidebar --%>
+	  <tiles:insert attribute="sidebar_left" />
+   </div>
 
-			<%-- include left sidebar --%>
-			<tiles:insert attribute="sidebar_left" />
+	<div id="content-sub-2">
+		<div id="printer">
+		<p>
+		<img src="images/printer.gif" width="17" height="16" alt="This is a printer friendly version" />
+		This page is printer friendly.
+		</p>
 		</div>
 
-		<div id="content-sub-2">
-			<%-- include right sidebar --%>
-			<tiles:insert attribute="sidebar_right" />
-		</div>
+		<%-- include right sidebar --%>
+		<tiles:insert attribute="sidebar_right" />
+	</div>
 
-		<div id="content-main">
-			<%-- include main content --%>
-			<tiles:insert attribute="content" />
-		</div>
+	<div id="content-main">
+		<%-- include main content --%>
+		<tiles:insert attribute="content" />
 	</div>
+</div>
+
+<%-- include footer --%>
+<tiles:insert attribute="footer" />
 
-	<%-- include footer --%>
-	<tiles:insert attribute="footer" />
 </body>
 </html>



