[Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes popup-bottom.inc,1.1,1.2 popup-top.inc,1.1,1.2 basket.js,1.3,1.4 opac-basket-menu.inc,1.2,1.3 opac-basket-top.inc,1.6,1.7 opac-top.inc,1.8,1.9 opac.css,1.17,1.18

Paul POULAIN tipaul at users.sourceforge.net
Tue Mar 1 14:41:39 CET 2005 

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

Modified Files:
	basket.js opac-basket-menu.inc opac-basket-top.inc 
	opac-top.inc opac.css 
Added Files:
	popup-bottom.inc popup-top.inc 
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/en/includes/basket.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** basket.js	8 Dec 2004 10:27:10 -0000	1.3
--- basket.js	1 Mar 2005 13:41:06 -0000	1.4
***************
*** 358,360 ****
--- 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/en/includes/opac-basket-menu.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-basket-menu.inc	9 Jul 2004 17:56:05 -0000	1.2
--- opac-basket-menu.inc	1 Mar 2005 13:41:06 -0000	1.3
***************
*** 11,13 ****
--- 11,19 ----
  		<span class="basketspacer">&nbsp;</span>
  		<A href='javascript:quit()' class="menu">Close</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/en/includes/opac-basket-top.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-basket-top.inc	24 Nov 2004 16:08:55 -0000	1.6
--- opac-basket-top.inc	1 Mar 2005 13:41:06 -0000	1.7
***************
*** 5,8 ****
--- 5,9 ----
  <head>
  	<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>

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** opac-top.inc	3 Jan 2005 10:58:46 -0000	1.8
--- opac-top.inc	1 Mar 2005 13:41:06 -0000	1.9
***************
*** 10,13 ****
--- 10,14 ----
  	<!-- /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">

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** opac.css	3 Jan 2005 11:08:36 -0000	1.17
--- opac.css	1 Mar 2005 13:41:06 -0000	1.18
***************
*** 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,111 ****
--- 116,120 ----
  }
  
+ /* paragraphs */
  p {
  	padding-left:10pt;
***************
*** 115,118 ****
--- 124,128 ----
  }
  
+ /* centered paragraphs */
  p.center {
  	padding-left:10pt;
***************
*** 121,124 ****
--- 131,136 ----
  	text-align:center;
  }
+ 
+ /* the copyright (at the end of the main page */
  p.copyright {
  	border-top: 1px solid #000000;
***************
*** 194,197 ****
--- 206,210 ----
  }
  
+ /* standard input field */
  input {
  	border:0px;
***************
*** 207,210 ****
--- 220,224 ----
  }
  
+ /* textarea input field */
  textarea {
  	border:0px;
***************
*** 212,216 ****
  	background-color:#009999;
  }
- 
  textarea:hover {
  	border:0px;
--- 226,229 ----
***************
*** 219,222 ****
--- 232,236 ----
  }
  
+ /* select input field */
  select {
  	border:0px;
***************
*** 276,281 ****
  #leftbloc {
  	float:left;
! 	width=30%;
! 	border:1;
  }
  
--- 290,295 ----
  #leftbloc {
  	float:left;
! 	width:30%;
! 	border:0;
  }
  
***************
*** 292,308 ****
  #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;
  }
  
***************
*** 332,339 ****
  
  #menuline {
- /*	width:100%;
- 	vertical-align:top;*/
  	float:left;
- /*	position:relative;*/
  	display:block;
  }
--- 344,348 ----
***************
*** 384,395 ****
  	margin-right:10%;
  }
- td {
- 	border:0px;
- }
  
  .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;
--- 393,401 ----
  	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;

More information about the Koha-cvs mailing list