[Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes doc-head-close-basket.inc,1.1.2.1,1.1.2.2 doc-head-close.inc,1.1.2.2,1.1.2.3

[Owen Leonard]

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4793/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
        doc-head-close-basket.inc doc-head-close.inc 
Log Message:
Updates to add opacstylesheet system preferences functionality

Index: doc-head-close-basket.inc
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close-basket.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** doc-head-close-basket.inc   17 Mar 2005 21:37:01 -0000      1.1.2.1
--- doc-head-close-basket.inc   12 Jul 2005 21:17:56 -0000      1.1.2.2
***************
*** 3,9 ****
--- 3,15 ----
  <meta http-equiv="Content-Language" content="en-us" />
  <link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" 
-->/includes/favicon.ico" type="image/x-icon" />
+       <!-- TMPL_IF name="opacstylesheet" -->
+ <style type="text/css"> 
+       @import url(<!-- TMPL_VAR NAME="opacstylesheet" -->);
+ </style>
+       <!-- TMPL_ELSE -->
  <style type="text/css"> 
        @import url(<!-- TMPL_VAR NAME="themelang" -->/includes/opac.css);
  </style>
+       <!-- /TMPL_IF -->
  <script type="text/javascript" language="javascript" src="<!-- TMPL_VAR 
NAME="themelang" -->/includes/script.js"></script>
  <script type="text/javascript" language="javascript" src="<!-- TMPL_VAR 
NAME="themelang" -->/includes/basket.js"></script>

Index: doc-head-close.inc
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** doc-head-close.inc  9 Jun 2005 21:18:44 -0000       1.1.2.2
--- doc-head-close.inc  12 Jul 2005 21:17:56 -0000      1.1.2.3
***************
*** 3,10 ****
  <meta http-equiv="Content-Language" content="en-us" />
  <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/opac.css);
        @import url(<TMPL_VAR NAME="themelang">/includes/marc-editor.css);      
  </style>
  <script type="text/javascript" language="javascript" src="<TMPL_VAR 
NAME="themelang">/includes/script.js"></script>
  <script type="text/javascript" language="javascript" src="<TMPL_VAR 
NAME="themelang">/includes/basket.js"></script>
--- 3,16 ----
  <meta http-equiv="Content-Language" content="en-us" />
  <link rel="shortcut icon" href="<TMPL_VAR 
NAME="themelang">/includes/favicon.ico" type="image/x-icon" />
+       <!-- TMPL_IF name="opacstylesheet" -->
  <style type="text/css"> 
!       @import url(<!-- TMPL_VAR NAME="opacstylesheet" -->);
! </style>
!       <!-- TMPL_ELSE -->
! <style type="text/css"> 
!       @import url(<!-- TMPL_VAR NAME="themelang" -->/includes/opac.css);
        @import url(<TMPL_VAR NAME="themelang">/includes/marc-editor.css);      
  </style>
+       <!-- /TMPL_IF -->
  <script type="text/javascript" language="javascript" src="<TMPL_VAR 
NAME="themelang">/includes/script.js"></script>
  <script type="text/javascript" language="javascript" src="<TMPL_VAR 
NAME="themelang">/includes/basket.js"></script>