[Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.20,1.21 opac-top.inc,1.10,1.11

[Paul POULAIN]

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

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

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** opac.css	15 Jun 2005 19:55:14 -0000	1.20
--- opac.css	20 Jun 2005 14:22:29 -0000	1.21
***************
*** 51,55 ****
  	border-width:0px;
  	text-align:left;
! 	position:absolute;
  }
  
--- 51,58 ----
  	border-width:0px;
  	text-align:left;
! 	display:inline;
! 	float:left;
! 	padding-left:10px;
! 	padding-right:10px;
  }
  
***************
*** 91,99 ****
  	font-weight:bold;
  	font-size: 115%;
- 	text-align : center;
  	vertical-align:top;
  	padding: 2px;
  	width:100%;
- 	margin-left:70px;
  }
  
--- 94,100 ----
***************
*** 143,147 ****
  	border:1px solid #000000;
  	border-collapse:collapse;
! 	width:90%;
  }
  /* header */
--- 144,148 ----
  	border:1px solid #000000;
  	border-collapse:collapse;
! 	position:static;
  }
  /* header */
***************
*** 155,165 ****
  	border-bottom:1px solid #000000;
  	border-top:1px solid #000000;
- 	padding:5px;
  }
  /* standard cell */
  td {
  	font-size:10pt;
  	border-left:1px solid #000000;
  	vertical-align:top;
  }
  
--- 156,173 ----
  	border-bottom:1px solid #000000;
  	border-top:1px solid #000000;
  }
  /* standard cell */
+ 
+ tr {
+ 	display:table-row;
+ 	position:static;
+ }
+ 
  td {
  	font-size:10pt;
  	border-left:1px solid #000000;
  	vertical-align:top;
+ 	position:static;
+ 	display:table-cell;
  }
  
***************
*** 355,361 ****
  }
  
  #menuline {
- 	float:left;
  	display:block;
  }
  
--- 363,374 ----
  }
  
+ #title {
+ 	display:block;
+ 	margin-left:0px;
+ }
+ 
  #menuline {
  	display:block;
+ 	margin-left:100px;
  }
  
***************
*** 369,376 ****
  
  /* a little spacer. should not be used */
- .spacer {
- 	padding-left:20pt;
- 	float:left;
- }
  .basketspacer {
  	padding-left:8pt;
--- 382,385 ----
***************
*** 378,388 ****
  }
  
  /* for MARC view  */
  div.tabs {
! 	width:10px;
! 	position:absolute;
  	display:block;
! 	margin-left:50px;
! 	margin-top:150px;
  }
  
--- 387,419 ----
  }
  
+ /* for SubscritptionHistory view  */
+ div.tabsubs {
+ 	margin-left:150px;
+ 	position:inline;
+ }
+ 
+ div.tabsubs a {
+ 	font-size: small;
+ 	border: thin solid black;
+ 	margin-right: 2px;
+ 	padding: 10px 10px;
+ 	-moz-border-radius: 5px 5px 0px 0px;
+ }
+ 
+ div.tabsub {
+ 	background-color: #ACE6E6;
+ 	position:absolute;
+ 	visibility:hidden;
+ 	margin-left:150px;
+ 	margin-top:0px;
+ border:4px;
+ }
+ 
  /* for MARC view  */
  div.tabs {
! 	width:15px;
  	display:block;
! 	margin-top:70px;
! 	margin-left:40px;
  }
  
***************
*** 396,399 ****
--- 427,440 ----
  }
  
+ div.tabbloc {
+ 	position:absolute;
+ 	display:block;
+ 	top:140px;
+ 	left:62px;
+ 	margin-right:0px;
+ 	border: 1px solid black;
+ 	background-color:none;
+ }
+ 
  div.tab {
  	background-color: #ACE6E6;
***************
*** 401,407 ****
  	visibility:hidden;
  	position:absolute;
! 	margin-left:72px;
! 	margin-top:150px;
! 	margin-right:10%;
  }
  
--- 442,448 ----
  	visibility:hidden;
  	position:absolute;
! 	float:left;
! 	margin-right:0px;
! 	background-color:none;
  }
  

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** opac-top.inc	4 May 2005 08:58:30 -0000	1.10
--- opac-top.inc	20 Jun 2005 14:22:30 -0000	1.11
***************
*** 25,29 ****
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
  	}
  	</script>
--- 25,29 ----
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=700,height=500,toolbar=false,scrollbars=yes');
  	}
  	</script>
***************
*** 31,41 ****
  <body>
  	<!-- MENUS -->
! 	<div id="menuline">
! 		<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo" style="float: left" />
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
! 		<span class="spacer">&nbsp;</span>
! 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
- 		<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" -->
--- 31,44 ----
  <body>
  	<!-- MENUS -->
! 	<div id="title">
! 		<!-- TMPL_IF name="opacsmallimage" -->
! 			<img src="<!-- TMPL_VAR name="opacsmallimage"-->" height="50" alt="koha logo"/>
! 		<!-- TMPL_ELSE -->
! 			<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
! 		<!-- /TMPL_IF -->
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
! 	</div>
! 	<div id="menuline">
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
  		<!-- TMPL_IF NAME="loggedinusername" -->
***************
*** 47,53 ****
  			<!-- /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>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="javascript:openBasket()" title="Biblio basket">Biblio basket <span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a>
  	</div>
--- 50,54 ----