[Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/fr/includes basket.js,1.1,1.2 opac-basket-menu.inc,1.4,1.5 opac-basket-top.inc,1.4,1.5 opac-bottom.inc,1.3,1.4 opac-top.inc,1.6,1.7 opac.css,1.5,1.6

Tue Mar 1 14:41:41 CET 2005

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

Modified Files:
	basket.js opac-basket-menu.inc opac-basket-top.inc 
	opac-bottom.inc opac-top.inc opac.css 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits done here

Index: basket.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/includes/basket.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** basket.js	2 Sep 2004 16:32:18 -0000	1.1
--- basket.js	1 Mar 2005 13:41:07 -0000	1.2
***************
*** 149,152 ****
--- 149,155 ----
  		}
  		addSelRecords(c_value);
+ 	} else {
+ 		c_value = c_value + document.myform.bibid.value + "/";
+ 		addSelRecords(c_value);
  	}
  }
***************
*** 355,357 ****
--- 358,365 ----
          target.all['basket'].innerHTML = " ("+updated_value+")";
      }
+ }
+ 
+ function openBiblio(biblionumber) {
+ 	openerURL="opac-detail.pl?bib="+biblionumber;
+ 	opener.document.location = openerURL;
  }
\ No newline at end of file

Index: opac-basket-menu.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-menu.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-basket-menu.inc	24 Nov 2004 16:09:45 -0000	1.4
--- opac-basket-menu.inc	1 Mar 2005 13:41:07 -0000	1.5
***************
*** 11,13 ****
--- 11,19 ----
  		<span class="basketspacer">&nbsp;</span>
  		<A href='javascript:quit()' class="menu">Fermer</A>
+ 		<!-- TMPL_IF NAME="verbose" -->
+ 			<a href="javascript:showLess()" class="menu">Brief Display</a>
+ 		<!-- TMPL_ELSE -->
+ 			<a href="javascript:showMore()" class="menu">More Details</a>
+ 		<!-- /TMPL_IF -->
+ 
  	</div>

Index: opac-basket-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-top.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-basket-top.inc	24 Nov 2004 16:09:45 -0000	1.4
--- opac-basket-top.inc	1 Mar 2005 13:41:07 -0000	1.5
***************
*** 5,8 ****
--- 5,9 ----
  <head>
  	<title>Panier</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>

Index: opac-bottom.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/includes/opac-bottom.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-bottom.inc	2 Sep 2004 16:32:18 -0000	1.3
--- opac-bottom.inc	1 Mar 2005 13:41:07 -0000	1.4
***************
*** 3,7 ****
  	<p>
  		Connecté en tant que <b><!-- TMPL_VAR NAME="loggedinusername" --></b> <a href="/cgi-bin/koha/opac-user.pl">Accueil Membre</a>
! 		|| <a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Déconnection</a>
  	</p>
  <!-- TMPL_ELSE -->
--- 3,7 ----
  	<p>
  		Connecté en tant que <b><!-- TMPL_VAR NAME="loggedinusername" --></b> <a href="/cgi-bin/koha/opac-user.pl">Accueil Membre</a>
! 		|| <a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Déconnexion</a>
  	</p>
  <!-- TMPL_ELSE -->

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/includes/opac-top.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-top.inc	24 Nov 2004 16:09:45 -0000	1.6
--- opac-top.inc	1 Mar 2005 13:41:07 -0000	1.7
***************
*** 4,9 ****
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
! 	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
  	<script language="JavaScript" type="text/javascript">
--- 4,14 ----
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
! 	<!-- 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 -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
+ 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
  	<script language="JavaScript" type="text/javascript">
***************
*** 15,24 ****
  	var MSG_RECORD_IN_BASKET = _("Cette notice est déjà dans le panier");
  	var MSG_RECORD_ADDED = _("Notice ajoutée au panier");
! 	var MSG_NRECORDS_ADDED = _("Notice ajoutée");
  	var MSG_NRECORDS_IN_BASKET = _("Envoyer le panier");
  	var MSG_NO_RECORD_SELECTED = _("Aucune notice sélectionnée");
  	var MSG_NO_RECORD_ADDED = _("Aucune notice ajoutée");
  	function Dopop(link) {
! 		newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
  	}
  	</script>
--- 20,29 ----
  	var MSG_RECORD_IN_BASKET = _("Cette notice est déjà dans le panier");
  	var MSG_RECORD_ADDED = _("Notice ajoutée au panier");
! 	var MSG_NRECORDS_ADDED = _("Notice(s) ajoutée(s)");
  	var MSG_NRECORDS_IN_BASKET = _("Envoyer le panier");
  	var MSG_NO_RECORD_SELECTED = _("Aucune notice sélectionnée");
  	var MSG_NO_RECORD_ADDED = _("Aucune notice ajoutée");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
  	}
  	</script>
***************
*** 37,41 ****
  		<a class="menu" href="/cgi-bin/koha/opac-user.pl" title="Page d'accueil Membre">Vos informations</a>
  		<span class="spacer">&nbsp;</span>
! 		<a class="menu" href="javascript:openBasket()" title="Panier de Bibliothèque">Panier de Bibliothèque <span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a>
  	</div>
  	<!-- MAIN BODY OF PAGE -->
--- 42,46 ----
  		<a class="menu" href="/cgi-bin/koha/opac-user.pl" title="Page d'accueil Membre">Vos informations</a>
  		<span class="spacer">&nbsp;</span>
! 		<a class="menu" href="javascript:openBasket()" title="Panier de notices">Panier de notices <span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a>
  	</div>
  	<!-- MAIN BODY OF PAGE -->

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/includes/opac.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** opac.css	24 Nov 2004 16:09:45 -0000	1.5
--- opac.css	1 Mar 2005 13:41:07 -0000	1.6
***************
*** 1,5 ****
  body {
  	background-color:#009999;
! 	font-family:verdana,arial,helvetica;
  	font-size:12pt;
  	margin:0px;
--- 1,5 ----
  body {
  	background-color:#009999;
! 	font-family:verdana,arial,helvetica,sans-serif;
  	font-size:12pt;
  	margin:0px;
***************
*** 28,31 ****
--- 28,32 ----
  }
  
+ /* the page result number */
  a.results {
  	background-color : #FFD9BF;
***************
*** 40,43 ****
--- 41,45 ----
  }
  
+ /* label size & look just before input fields */
  label {
  	float:left;
***************
*** 45,48 ****
--- 47,51 ----
  }
  
+ /* images */
  img {
  	border-width:0px;
***************
*** 57,60 ****
--- 60,64 ----
  }
  
+ /* main title */
  h1 {
  	color:#FFD9BF;
***************
*** 69,72 ****
--- 73,77 ----
  
  /* style for library name, on top of menu (defined in LibraryName systempref) */
+ /* in opac-main page */
  .LibraryName {
  	color:#FFD9BF;
***************
*** 80,83 ****
--- 85,89 ----
  }
  
+ /* in all other pages */
  .SmallLibraryName {
  	color:#FFD9BF;
***************
*** 92,98 ****
  }
  
  h2 {
  	color:#000000;
- /* 	background-color:#FF6600; */
  	background-image: url(/opac-tmpl/css/en/images/bar.gif);
  	background-repeat:repeat-y;
--- 98,104 ----
  }
  
+ /* subtitles. headers of blocks */
  h2 {
  	color:#000000;
  	background-image: url(/opac-tmpl/css/en/images/bar.gif);
  	background-repeat:repeat-y;
***************
*** 101,104 ****
--- 107,112 ----
  	margin: 0px 0px 10px 0px;
  }
+ 
+ /* probably useless */
  h3 {
  	color:#000000;
***************
*** 108,116 ****
--- 116,128 ----
  }
  
+ /* paragraphs */
  p {
  	padding-left:10pt;
  	padding-bottom:0pt;
  	margin:0pt;
+ 	clear:left;
  }
+ 
+ /* centered paragraphs */
  p.center {
  	padding-left:10pt;
***************
*** 119,122 ****
--- 131,136 ----
  	text-align:center;
  }
+ 
+ /* the copyright (at the end of the main page */
  p.copyright {
  	border-top: 1px solid #000000;
***************
*** 192,195 ****
--- 206,210 ----
  }
  
+ /* standard input field */
  input {
  	border:0px;
***************
*** 205,208 ****
--- 220,224 ----
  }
  
+ /* textarea input field */
  textarea {
  	border:0px;
***************
*** 210,214 ****
  	background-color:#009999;
  }
- 
  textarea:hover {
  	border:0px;
--- 226,229 ----
***************
*** 217,220 ****
--- 232,236 ----
  }
  
+ /* select input field */
  select {
  	border:0px;
***************
*** 274,279 ****
  #leftbloc {
  	float:left;
! 	width=30%;
! 	border:1;
  }
  
--- 290,295 ----
  #leftbloc {
  	float:left;
! 	width:30%;
! 	border:0;
  }
  
***************
*** 290,306 ****
  #bloc20, .bloc20 {
  	float:left;
- 	width:30%;
- 	border:0;
  	border:1px solid #000000;
  	margin-right:20px;
  	margin-bottom:20px;
  }
  #bloc60, .bloc60 {
  	float:left;
- 	width:60%;
- 	border:0;
  	border:1px solid #000000;
  	margin-right:20px;
  	margin-bottom:20px;
  }
  
--- 306,320 ----
  #bloc20, .bloc20 {
  	float:left;
  	border:1px solid #000000;
  	margin-right:20px;
  	margin-bottom:20px;
+ 	padding-right:20px;
  }
  #bloc60, .bloc60 {
  	float:left;
  	border:1px solid #000000;
  	margin-right:20px;
  	margin-bottom:20px;
+ 	padding-right:20px;
  }
  
***************
*** 330,337 ****
  
  #menuline {
- /*	width:100%;
- 	vertical-align:top;*/
  	float:left;
- /*	position:relative;*/
  	display:block;
  }
--- 344,348 ----
***************
*** 353,355 ****
  	padding-left:8pt;
  	float:left;
! }
\ No newline at end of file
--- 364,409 ----
  	padding-left:8pt;
  	float:left;
! }
! 
! /* for MARC view  */
! div.tabs {
! 	width:10px;
! 	position:absolute;
! 	display:block;
! 	margin-left:50px;
! 	margin-top:150px;
! }
! 
! div.tabs a {
! 	display:block;
! 	font-size: small;
! 	border: thin solid black;
! 	margin-right: 2px;
! 	padding: 10px 10px;
! 	-moz-border-radius: 5px 0px 0px 5px;
! }
! 
! div.tab {
! 	background-color: #ACE6E6;
! 	display: block;
! 	visibility:hidden;
! 	position:absolute;
! 	margin-left:72px;
! 	margin-top:150px;
! 	margin-right:10%;
! }
! 
! .MARCtag { /* style for tag definition (700 - Statement of responsability) */
! 	font-weight:bold;
! 	color:#FF6600;
! 	background-color:#FFFFFF;
! 	background-image:none;
! 	border-bottom: thin solid #FF6600;
! 	margin-right:30%;
! }
! 
! .labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
! 	float:left;
! 	width: 12em;
! 	margin-left:30px;
! }