[Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes basket.js,1.4,1.5 opac-basket-top.inc,1.7,1.8 opac.css,1.18,1.19 opac-top.inc,1.9,1.10

[Paul POULAIN]

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

Modified Files:
        basket.js opac-basket-top.inc opac.css opac-top.inc 
Log Message:
synch'ing 2.2 and head

Index: basket.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/basket.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** basket.js   1 Mar 2005 13:41:06 -0000       1.4
--- basket.js   4 May 2005 08:58:30 -0000       1.5
***************
*** 296,307 ****
  
  function quit() {
-       if (document.myform.records.value) {
-               var rep = false;
-               rep = confirm(MSG_CONFIRM_DEL_RECORDS);
-               if (rep) {
-                       delSelRecords();
-               }
-       }
-       updateBasket(arrayRecords.length-1,top.opener.document);
        window.close();
  }
--- 296,299 ----
***************
*** 314,318 ****
        var loc = CGIBIN + "opac-sendbasket.pl?" + strCookie;
  
!       var 
optWin="dependant=yes,scrollbars=no,resizable=no,height=300,width=400,top=50,left=100";
        var win_form = open(loc,"win_form",optWin);
  }
--- 306,310 ----
        var loc = CGIBIN + "opac-sendbasket.pl?" + strCookie;
  
!       var 
optWin="dependant=yes,scrollbars=no,resizable=no,height=300,width=600,top=50,left=100";
        var win_form = open(loc,"win_form",optWin);
  }

Index: opac-basket-top.inc
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** opac-basket-top.inc 1 Mar 2005 13:41:06 -0000       1.7
--- opac-basket-top.inc 4 May 2005 08:58:30 -0000       1.8
***************
*** 6,10 ****
        <title>OPAC Basket</title>
        <meta http-equiv="Content-Type" content="text/html; 
charset=iso-8859-1"/>
!       <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR 
name="themelang">/includes/opac.css">
        <script type="text/javascript" language="javascript" src="<!-- TMPL_VAR 
NAME="themelang" -->/includes/basket.js"></script>
        <script language="JavaScript" type="text/javascript">
--- 6,14 ----
        <title>OPAC Basket</title>
        <meta http-equiv="Content-Type" content="text/html; 
charset=iso-8859-1"/>
!       <!-- TMPL_IF name="opacstylesheet" -->
!               <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR 
name="opacstylesheet"-->" />
!       <!-- TMPL_ELSE -->
!               <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR 
name="themelang"-->/includes/opac.css" />
!       <!-- /TMPL_IF -->
        <script type="text/javascript" language="javascript" src="<!-- TMPL_VAR 
NAME="themelang" -->/includes/basket.js"></script>
        <script language="JavaScript" type="text/javascript">

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** opac.css    1 Mar 2005 13:41:06 -0000       1.18
--- opac.css    4 May 2005 08:58:30 -0000       1.19
***************
*** 341,344 ****
--- 341,345 ----
        margin-bottom:10px;
        -moz-border-radius: 6px;
+       display:inline;
  }
  

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** opac-top.inc        1 Mar 2005 13:41:06 -0000       1.9
--- opac-top.inc        4 May 2005 08:58:30 -0000       1.10
***************
*** 39,42 ****
--- 39,50 ----
                <span class="spacer">&nbsp;</span>
                <a class="menu" href="/cgi-bin/koha/opac-search.pl" 
title="Advanced search">Advanced search</a>
+               <!-- TMPL_IF NAME="loggedinusername" -->
+                       <!-- TMPL_IF name="virtualshelves" -->
+                               <a href="/cgi-bin/koha/opac-shelves.pl" 
class="menu">Virtual shelves</a>
+                       <!-- /TMPL_IF -->
+                       <!-- TMPL_IF name="suggestion" -->
+                               <a href="opac-suggestions.pl" class="menu">View 
& manage suggestions</a>
+                       <!-- /TMPL_IF -->
+               <!-- /TMPL_IF -->
                <span class="spacer">&nbsp;</span>
                <a class="menu" href="/cgi-bin/koha/opac-user.pl" title="Member 
Home page" >Personal page</a>