[Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en opac-ISBDdetail... [dev_week]

Owen Leonard oleonard at athenscounty.lib.oh.us
Wed Sep 6 16:42:07 CEST 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Owen Leonard <oleonard>	06/09/06 14:42:07

Modified files:
	koha-tmpl/opac-tmpl/npl/en: opac-ISBDdetail.tmpl 
	                            opac-MARCdetail.tmpl 
	                            opac-account.tmpl 
	                            opac-addbookbybiblionumber.tmpl 
	                            opac-auth.tmpl 
	                            opac-authorities-home.tmpl 
	                            opac-authoritiesdetail.tmpl 
	                            opac-authoritiessearchresultlist.tmpl 
	                            opac-basket.tmpl 
	                            opac-detailprint.tmpl 
	                            opac-dictionary.tmpl 
	                            opac-full-serial-issues.tmpl 
	                            opac-passwd.tmpl 
	                            opac-readingrecord.tmpl 
	                            opac-recacquisitions.tmpl 
	                            opac-reserve.tmpl opac-search.tmpl 
	                            opac-sendbasketform.tmpl 
	                            opac-serial-issues.tmpl 
	                            opac-shelves.tmpl 
	                            opac-suggestions.tmpl opac-user.tmpl 
	                            opac-userdetails.tmpl 
	                            opac-userupdate.tmpl 

Log message:
	Restructuring for new layout CSS. Putting navigation after the main content in the source. Using body ids to control layout scheme for individual pages.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.5.2.1&r2=1.1.2.5.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.8.2.3&r2=1.1.2.8.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-account.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2.2.1&r2=1.1.2.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.9&r2=1.1.2.9.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-auth.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.1&r2=1.1.2.3.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-authorities-home.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-authoritiesdetail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4.2.1&r2=1.1.2.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-authoritiessearchresultlist.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4&r2=1.1.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-basket.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-detailprint.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-dictionary.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.5.2.1&r2=1.1.2.5.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-full-serial-issues.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.1&r2=1.1.2.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-passwd.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.2&r2=1.1.2.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-readingrecord.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.2&r2=1.1.2.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-recacquisitions.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-reserve.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4.2.1&r2=1.1.2.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.14&r2=1.1.2.14.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-sendbasketform.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-serial-issues.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2.2.1&r2=1.1.2.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-suggestions.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.5.2.1&r2=1.1.2.5.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.11.2.4&r2=1.1.2.11.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-userdetails.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.2&r2=1.1.2.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-userupdate.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.4.1&r2=1.1.4.2

Patches:
Index: opac-ISBDdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl,v
retrieving revision 1.1.2.5.2.1
retrieving revision 1.1.2.5.2.2
diff -u -b -r1.1.2.5.2.1 -r1.1.2.5.2.2
--- opac-ISBDdetail.tmpl	23 Aug 2006 16:56:21 -0000	1.1.2.5.2.1
+++ opac-ISBDdetail.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.5.2.2
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- ISBD
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 
 <div id="main">

Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl,v
retrieving revision 1.1.2.8.2.3
retrieving revision 1.1.2.8.2.4
diff -u -b -r1.1.2.8.2.3 -r1.1.2.8.2.4
--- opac-MARCdetail.tmpl	23 Aug 2006 16:56:21 -0000	1.1.2.8.2.3
+++ opac-MARCdetail.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.8.2.4
@@ -1,5 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- MARC Details for Record No. <!-- TMPL_VAR name="biblionumber" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
+
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 
 <div id="main">
@@ -235,7 +237,7 @@
 					</label>
 					<!-- TMPL_VAR name="marc_value" -->
 					<!-- TMPL_IF name="link" -->
-						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->"title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator=&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
 					<!-- /TMPL_IF --><br class="clear" />
 				</p>
 			<!-- /TMPL_LOOP -->

Index: opac-account.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-account.tmpl,v
retrieving revision 1.1.2.2.2.1
retrieving revision 1.1.2.2.2.2
diff -u -b -r1.1.2.2.2.1 -r1.1.2.2.2.2
--- opac-account.tmpl	23 Aug 2006 16:56:21 -0000	1.1.2.2.2.1
+++ opac-account.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.2.2.2
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Account for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 
 <!--CONTENT-->

Index: opac-addbookbybiblionumber.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.9.2.1
diff -u -b -r1.1.2.9 -r1.1.2.9.2.1
--- opac-addbookbybiblionumber.tmpl	27 Apr 2006 17:02:20 -0000	1.1.2.9
+++ opac-addbookbybiblionumber.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.9.2.1
@@ -1,4 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Add to My Virtual Shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<body>
 <div id="window">
 <h3>Add <i><!-- TMPL_VAR NAME="title" --></i> <!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> to a Virtual Shelf</h3><form action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="post">
 <!-- TMPL_IF NAME="CGIbookshelves" --><div class="details">
@@ -22,5 +23,4 @@
 </div>
 	<p><input type="hidden" name="category" value="1" /><input type="submit" value="Add to My Virtual Shelf" class="submit"></p></form>
 </div>
-</body>
-</html>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-auth.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-auth.tmpl,v
retrieving revision 1.1.2.3.2.1
retrieving revision 1.1.2.3.2.2
diff -u -b -r1.1.2.3.2.1 -r1.1.2.3.2.2
--- opac-auth.tmpl	23 Aug 2006 16:56:21 -0000	1.1.2.3.2.1
+++ opac-auth.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.3.2.2
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Log in to Your Account
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 
 <!--CONTENT-->

Index: opac-authorities-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-authorities-home.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -b -r1.1.2.2 -r1.1.2.2.2.1
--- opac-authorities-home.tmpl	6 Mar 2006 19:44:37 -0000	1.1.2.2
+++ opac-authorities-home.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.2.2.1
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Advanced Search
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
+<!--TMPL_INCLUDE NAME="masthead.inc" -->
 
 <div id="main">
 
@@ -50,4 +50,6 @@
 </form>
 
 </div>
+
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-authoritiesdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-authoritiesdetail.tmpl,v
retrieving revision 1.1.2.4.2.1
retrieving revision 1.1.2.4.2.2
diff -u -b -r1.1.2.4.2.1 -r1.1.2.4.2.2
--- opac-authoritiesdetail.tmpl	3 Aug 2006 12:15:21 -0000	1.1.2.4.2.1
+++ opac-authoritiesdetail.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.4.2.2
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Advanced Search
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
+<!--TMPL_INCLUDE NAME="masthead.inc" -->
 
 <div id="main">
 <div class="tabbed">
@@ -19,5 +19,5 @@
         <!-- /TMPL_LOOP -->
 </table>
 </div>	
-</body>
-</html>
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-authoritiessearchresultlist.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-authoritiessearchresultlist.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.4.2.1
diff -u -b -r1.1.2.4 -r1.1.2.4.2.1
--- opac-authoritiessearchresultlist.tmpl	10 Apr 2006 20:16:57 -0000	1.1.2.4
+++ opac-authoritiessearchresultlist.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.4.2.1
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Authorities Search
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
+<!--TMPL_INCLUDE NAME="masthead.inc" -->
 
 <div id="main">
 	<h1>Authority search results</h1>
@@ -79,4 +79,5 @@
 		</p>
 	</div>	
 </div>
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-basket.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-basket.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -u -b -r1.1.2.3 -r1.1.2.3.2.1
--- opac-basket.tmpl	22 Mar 2006 18:32:34 -0000	1.1.2.3
+++ opac-basket.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.3.2.1
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Your Book Bag<!-- TMPL_IF NAME="print_basket" --><!-- TMPL_INCLUDE NAME="doc-head-close-basket-print.inc" --><!-- TMPL_ELSE --><!-- TMPL_INCLUDE NAME="doc-head-close-basket.inc" --><!-- /TMPL_IF -->
-
+<!-- TMPL_IF NAME="print_basket" --><body onload="print();"><!-- TMPL_ELSE --><body><!-- /TMPL_IF -->
 <div id="window">
 	<!-- TMPL_UNLESS NAME="print_basket" --><h3>Your Book Bag</h3>
 	<!-- MENUS -->

Index: opac-detailprint.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detailprint.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -u -b -r1.1.2.3 -r1.1.2.3.2.1
--- opac-detailprint.tmpl	17 Mar 2005 22:22:38 -0000	1.1.2.3
+++ opac-detailprint.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.3.2.1
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE NAME="doc-head-close-basket-print.inc" -->
-
+<body>
 <div id="window">
 <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
 <div class="details">

Index: opac-dictionary.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-dictionary.tmpl,v
retrieving revision 1.1.2.5.2.1
retrieving revision 1.1.2.5.2.2
diff -u -b -r1.1.2.5.2.1 -r1.1.2.5.2.2
--- opac-dictionary.tmpl	11 Jul 2006 14:06:57 -0000	1.1.2.5.2.1
+++ opac-dictionary.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.5.2.2
@@ -1,4 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Dictionary Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<body>
 
 <div id="window">
 	<h1>Dictionary Search</h1>

Index: opac-full-serial-issues.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-full-serial-issues.tmpl,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -b -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- opac-full-serial-issues.tmpl	23 Aug 2006 16:56:21 -0000	1.1.2.1.2.1
+++ opac-full-serial-issues.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.1.2.2
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Serials
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
+<!--TMPL_INCLUDE NAME="masthead.inc" -->
 
 
 

Index: opac-passwd.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-passwd.tmpl,v
retrieving revision 1.1.2.3.2.2
retrieving revision 1.1.2.3.2.3
diff -u -b -r1.1.2.3.2.2 -r1.1.2.3.2.3
--- opac-passwd.tmpl	23 Aug 2006 16:56:21 -0000	1.1.2.3.2.2
+++ opac-passwd.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.3.2.3
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Change Your Password
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 
 <div id="main">

Index: opac-readingrecord.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-readingrecord.tmpl,v
retrieving revision 1.1.2.3.2.2
retrieving revision 1.1.2.3.2.3
diff -u -b -r1.1.2.3.2.2 -r1.1.2.3.2.3
--- opac-readingrecord.tmpl	23 Aug 2006 16:56:21 -0000	1.1.2.3.2.2
+++ opac-readingrecord.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.3.2.3
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Library Home for  <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 
 <div id="main">

Index: opac-recacquisitions.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-recacquisitions.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -b -r1.1.2.2 -r1.1.2.2.2.1
--- opac-recacquisitions.tmpl	8 Mar 2006 20:01:21 -0000	1.1.2.2
+++ opac-recacquisitions.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.2.2.1
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Recent Acquisitions
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
 
 <div id="main">
 
@@ -38,4 +38,5 @@
 </form>
 </div>
 
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-reserve.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-reserve.tmpl,v
retrieving revision 1.1.2.4.2.1
retrieving revision 1.1.2.4.2.2
diff -u -b -r1.1.2.4.2.1 -r1.1.2.4.2.2
--- opac-reserve.tmpl	23 Aug 2006 16:56:21 -0000	1.1.2.4.2.1
+++ opac-reserve.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.4.2.2
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Reserving <!-- TMPL_VAR NAME="title" --> for <!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 
 <div id="main">
@@ -95,7 +96,7 @@
 			<p>Note there will be a reserve charge of <strong>$<!-- TMPL_VAR NAME="fee" --></strong></p>
 		<!-- /TMPL_IF -->
 </div>
-<p><input type="submit" value="Finish and Place Reservation" class="submit" onclick="this.value='Please wait...'; this.disabled=true; this.form.submit();"> <input type="submit" class="cancel" value="Cancel" onclick="location.href='/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'; return false;"</p>
+<p><input type="submit" value="Finish and Place Reservation" class="submit" onclick="this.value='Please wait...'; this.disabled=true; this.form.submit();"> <input type="submit" class="cancel" value="Cancel" onclick="location.href='/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'; return false;"/></p>
 
 </FORM>
 

Index: opac-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.14.2.1
diff -u -b -r1.1.2.14 -r1.1.2.14.2.1
--- opac-search.tmpl	21 Apr 2006 21:22:59 -0000	1.1.2.14
+++ opac-search.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.14.2.1
@@ -1,9 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Advanced Search
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
+<!--TMPL_INCLUDE NAME="masthead-basic.inc" -->
 
-<!-- CONTENT -->
 <div id="main">
 <form name="f" method="post" action="/cgi-bin/koha/opac-search.pl">
 <h1>Search the Catalog</h1>
@@ -158,4 +157,5 @@
 </div>
 
 </div>
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-sendbasketform.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-sendbasketform.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -b -r1.1.2.1 -r1.1.2.1.2.1
--- opac-sendbasketform.tmpl	25 Jan 2005 21:52:29 -0000	1.1.2.1
+++ opac-sendbasketform.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.1.2.1
@@ -22,5 +22,6 @@
 	
 </div><p><form action="opac-sendbasket.pl" method="get" /><input type="submit" class="icon close" value="Close Window" onclick="window.close(); return false;" /></form></p>
 </div>
-</body>
-</html>
\ No newline at end of file
+
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file

Index: opac-serial-issues.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-serial-issues.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -u -b -r1.1.2.3 -r1.1.2.3.2.1
--- opac-serial-issues.tmpl	5 Jul 2005 21:29:08 -0000	1.1.2.3
+++ opac-serial-issues.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.3.2.1
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Serials
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
+<!--TMPL_INCLUDE NAME="masthead.inc" -->
 
 <div id="main">
 <h1>Issues for a subscription</h1>
@@ -88,5 +88,7 @@
 </div>
 <!-- /TMPL_LOOP -->
 </div>
-</body>
-</html>
+
+
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file

Index: opac-shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl,v
retrieving revision 1.1.2.2.2.1
retrieving revision 1.1.2.2.2.2
diff -u -b -r1.1.2.2.2.1 -r1.1.2.2.2.2
--- opac-shelves.tmpl	23 Aug 2006 16:56:21 -0000	1.1.2.2.2.1
+++ opac-shelves.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.2.2.2
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- <!-- TMPL_IF Name="viewshelf" -->Contents of <!-- TMPL_VAR Name="shelfname" --><!-- TMPL_ELSE -->List of Virtual Shelves<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
 
 <div id="main">
 <div class="content-block">

Index: opac-suggestions.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-suggestions.tmpl,v
retrieving revision 1.1.2.5.2.1
retrieving revision 1.1.2.5.2.2
diff -u -b -r1.1.2.5.2.1 -r1.1.2.5.2.2
--- opac-suggestions.tmpl	23 Aug 2006 16:56:21 -0000	1.1.2.5.2.1
+++ opac-suggestions.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.5.2.2
@@ -2,8 +2,8 @@
 <!-- TMPL_IF name="op_add" -->Enter a new purchase suggestion<!-- /TMPL_IF -->
 <!-- TMPL_IF name="op_else" -->Purchase Suggestions<!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
 
 <div id="main">
 <!-- TMPL_IF name="op_add" -->

Index: opac-user.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1.2.11.2.4
retrieving revision 1.1.2.11.2.5
diff -u -b -r1.1.2.11.2.4 -r1.1.2.11.2.5
--- opac-user.tmpl	23 Aug 2006 16:56:21 -0000	1.1.2.11.2.4
+++ opac-user.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.11.2.5
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Library Home for  <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 
 <div id="main">

Index: opac-userdetails.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-userdetails.tmpl,v
retrieving revision 1.1.2.1.2.2
retrieving revision 1.1.2.1.2.3
diff -u -b -r1.1.2.1.2.2 -r1.1.2.1.2.3
--- opac-userdetails.tmpl	23 Aug 2006 16:56:21 -0000	1.1.2.1.2.2
+++ opac-userdetails.tmpl	6 Sep 2006 14:42:07 -0000	1.1.2.1.2.3
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Personal Details for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 
 

Index: opac-userupdate.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-userupdate.tmpl,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -b -r1.1.4.1 -r1.1.4.2
--- opac-userupdate.tmpl	23 Aug 2006 16:56:21 -0000	1.1.4.1
+++ opac-userupdate.tmpl	6 Sep 2006 14:42:07 -0000	1.1.4.2
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Updating Details for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 
 <!--CONTENT-->





More information about the Koha-cvs mailing list