[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/includes do... [rel_2_2]

Joshua Ferraro jmf at kados.org
Sun Feb 5 22:38:35 CET 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch: 	rel_2_2
Changes by:	Joshua Ferraro <kados at savannah.gnu.org>	06/02/05 21:38:35

Modified files:
	koha-tmpl/intranet-tmpl/npl/en/includes: 
	                                         doc-head-barcodes-close.inc 
	                                         doc-head-circ-close.inc 
	                                         doc-head-close-addbiblio.inc 
	                                         doc-head-close-calendar.inc 
	                                         doc-head-close-z3950.inc 
	                                         doc-head-close.inc 
	                                         main-top-addbiblio.inc 
	                                         main-top-circ.inc 

Log message:
	Adds support for intranetstylesheet to NPL templates

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-barcodes-close.inc.diff?only_with_tag=rel_2_2&tr1=1.1.2.2&tr2=1.1.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc.diff?only_with_tag=rel_2_2&tr1=1.2.2.3&tr2=1.2.2.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc.diff?only_with_tag=rel_2_2&tr1=1.1.2.5&tr2=1.1.2.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-calendar.inc.diff?only_with_tag=rel_2_2&tr1=1.1.2.3&tr2=1.1.2.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-z3950.inc.diff?only_with_tag=rel_2_2&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc.diff?only_with_tag=rel_2_2&tr1=1.1.2.4&tr2=1.1.2.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-addbiblio.inc.diff?only_with_tag=rel_2_2&tr1=1.3.2.1&tr2=1.3.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-circ.inc.diff?only_with_tag=rel_2_2&tr1=1.3.2.1&tr2=1.3.2.2&r1=text&r2=text

Patches:
Index: koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-barcodes-close.inc
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-barcodes-close.inc:1.1.2.2 koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-barcodes-close.inc:1.1.2.3
--- koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-barcodes-close.inc:1.1.2.2	Sat Feb  4 18:39:48 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-barcodes-close.inc	Sun Feb  5 21:38:35 2006
@@ -2,7 +2,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+	<!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
 </style>
 <style type="text/css">
Index: koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc:1.2.2.3 koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc:1.2.2.4
--- koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc:1.2.2.3	Sat Feb  4 18:39:48 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc	Sun Feb  5 21:38:35 2006
@@ -2,7 +2,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+<!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);<!-- /TMPL_IF -->
 	        <!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
 </style>
 <script language="JavaScript" type="text/javascript">
Index: koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc:1.1.2.5 koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc:1.1.2.6
--- koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc:1.1.2.5	Sat Feb  4 18:39:48 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc	Sun Feb  5 21:38:35 2006
@@ -2,7 +2,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css">
-        @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+        <!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
         @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/marc-editor.css);
 </style>
Index: koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-calendar.inc
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-calendar.inc:1.1.2.3 koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-calendar.inc:1.1.2.4
--- koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-calendar.inc:1.1.2.3	Sat Feb  4 18:39:48 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-calendar.inc	Sun Feb  5 21:38:35 2006
@@ -2,7 +2,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+	<!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
 </style>
 <!-- Additions to enable Calendar system -->
Index: koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-z3950.inc
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-z3950.inc:1.1.2.1 koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-z3950.inc:1.1.2.2
--- koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-z3950.inc:1.1.2.1	Sat Feb  4 18:39:48 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-z3950.inc	Sun Feb  5 21:38:35 2006
@@ -3,7 +3,7 @@
 <!-- TMPL_IF name="refresh" --><meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR NAME="refresh" -->" /><!-- /TMPL_IF -->
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME="themelang" -->/includes/intranet.css);
+<!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
 	#main {
 		background-color : #CCCC99;
Index: koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc:1.1.2.4 koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc:1.1.2.5
--- koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc:1.1.2.4	Sat Feb  4 18:39:48 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc	Sun Feb  5 21:38:35 2006
@@ -2,7 +2,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+	<!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
 </style>
 <script language="JavaScript" type="text/javascript">
Index: koha/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-addbiblio.inc
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-addbiblio.inc:1.3.2.1 koha/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-addbiblio.inc:1.3.2.2
--- koha/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-addbiblio.inc:1.3.2.1	Sat Feb  4 18:39:48 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-addbiblio.inc	Sun Feb  5 21:38:35 2006
@@ -6,7 +6,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+	<!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
 	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/tabs.css);
 </style>
Index: koha/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-circ.inc
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-circ.inc:1.3.2.1 koha/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-circ.inc:1.3.2.2
--- koha/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-circ.inc:1.3.2.1	Sat Feb  4 18:39:48 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-circ.inc	Sun Feb  5 21:38:35 2006
@@ -6,7 +6,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+	<!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
 </style>
 <script language="JavaScript" type="text/javascript">





More information about the Koha-cvs mailing list