[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes acquisitions-top.inc,1.26,1.27 common-print.css,1.1,1.2 common-style.css,1.35,1.36 intranet-main.css,1.4,1.5 marc-top.inc,1.12,1.13
Paul POULAIN
tipaul at users.sourceforge.net
Mon Jun 20 16:19:53 CEST 2005
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7303/koha-tmpl/intranet-tmpl/default/en/includes
Modified Files:
acquisitions-top.inc common-print.css common-style.css
intranet-main.css marc-top.inc
Log Message:
synch'ing 2.2 and head
Index: acquisitions-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** acquisitions-top.inc 8 Mar 2005 14:15:29 -0000 1.26
--- acquisitions-top.inc 20 Jun 2005 14:19:50 -0000 1.27
***************
*** 6,9 ****
--- 6,19 ----
<link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/includes/common-print.css">
<link rel="stylesheet" type="text/css" media="screen" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+ <!-- Additions for Calendar-system -->
+ <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+ <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js">
+ </script>
+ <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js">
+ </script>
+ <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js">
+ </script>
+ <!-- /Additions for Calendar-system -->
+
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<script language="JavaScript" type="text/javascript">
Index: common-print.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-print.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** common-print.css 8 Mar 2005 10:37:31 -0000 1.1
--- common-print.css 20 Jun 2005 14:19:50 -0000 1.2
***************
*** 34,36 ****
{
display: block;
! }
\ No newline at end of file
--- 34,38 ----
{
display: block;
! }
!
!
Index: common-style.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** common-style.css 20 Jan 2005 18:03:33 -0000 1.35
--- common-style.css 20 Jun 2005 14:19:50 -0000 1.36
***************
*** 75,78 ****
--- 75,79 ----
border:0px;
border-collapse:collapse;
+ font-size:10pt;
margin : auto;
}
Index: intranet-main.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/intranet-main.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** intranet-main.css 30 Jul 2004 14:29:40 -0000 1.4
--- intranet-main.css 20 Jun 2005 14:19:50 -0000 1.5
***************
*** 55,59 ****
text-align:center;
background-color:#ad11ad;
! color: #FFFFFF;
text-decoration: normal;
font-weight: bold;
--- 55,59 ----
text-align:center;
background-color:#ad11ad;
! color: #000000;
text-decoration: normal;
font-weight: bold;
***************
*** 84,87 ****
--- 84,106 ----
}
+ h2 {
+ margin-top:0px;
+ margin-bottom:4px;
+ text-align:center;
+ padding:0px;
+ font-size:125%;
+ padding-left:10px;
+ padding-right:10px;
+ padding-bottom:3px;
+ padding-top:3px;
+ }
+ h2.reports{
+ text-align:center;
+ background-color: #6b7cbe;
+ color: #FFFFFF;
+ text-decoration: normal;
+ font-weight: bold;
+ }
+
h1.circulation{
text-align:center;
***************
*** 92,95 ****
--- 111,123 ----
}
+ h1.authority {
+ text-align:center;
+ background-color: #6b7cbe;
+ color:#000000;
+ text-decoration: normal;
+ font-weight: bold;
+ background-image:none;
+ }
+
h1.parameters{
text-align:center;
***************
*** 121,125 ****
cursor: hand;
background-color:#ad11ad;
! color:#FFFFFF;
font-weight: bold;
border:1px solid #000000;
--- 149,153 ----
cursor: hand;
background-color:#ad11ad;
! color:#000000;
font-weight: bold;
border:1px solid #000000;
***************
*** 127,131 ****
}
! a.members {
font-weight: normal;
text-decoration: none;
--- 155,167 ----
}
! .little {
! font-weight: normal;
! font-size:10pt;
! padding:0px 0px 0px 0px;
! text-decoration: none;
! line-height:100%;
! }
!
! .members {
font-weight: normal;
text-decoration: none;
***************
*** 135,139 ****
line-height:200%;
}
! a.members:hover {
background-color: #86c268;
border:1px solid #000000;
--- 171,175 ----
line-height:200%;
}
! .members:hover {
background-color: #86c268;
border:1px solid #000000;
***************
*** 144,148 ****
}
! a.acquisition {
font-weight: normal;
text-decoration: none;
--- 180,200 ----
}
! a.authority {
! font-weight: normal;
! text-decoration: none;
! cursor: hand;
! color:#777777;
! font-weight: bold;
! line-height:200%;
! }
! a.authority:hover {
! background-color: #6b7cbe;
! border:1px solid #000000;
! color: #000000;
! text-decoration: none;
! font-weight: bold;
! }
!
! .acquisition {
font-weight: normal;
text-decoration: none;
***************
*** 152,156 ****
line-height:200%;
}
! a.acquisition:hover {
background-color: #ffdf61;
border:1px solid #000000;
--- 204,208 ----
line-height:200%;
}
! .acquisition:hover {
background-color: #ffdf61;
border:1px solid #000000;
***************
*** 169,172 ****
--- 221,225 ----
line-height:200%;
}
+
a.reports:hover {
background-color: #6b7cbe;
***************
*** 178,182 ****
}
! a.circulation {
font-weight: normal;
text-decoration: none;
--- 231,235 ----
}
! .circulation {
font-weight: normal;
text-decoration: none;
***************
*** 186,190 ****
line-height:200%;
}
! a.circulation:hover {
background-color: #be6170;
border:1px solid #000000;
--- 239,243 ----
line-height:200%;
}
! .circulation:hover {
background-color: #be6170;
border:1px solid #000000;
***************
*** 262,263 ****
--- 315,323 ----
padding:0px;
}
+
+ #bloc25, .bloc25 {
+ float:left;
+ border:1px solid #000000;
+ margin:0px;
+ padding:0px;
+ }
Index: marc-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** marc-top.inc 2 Dec 2004 16:43:28 -0000 1.12
--- marc-top.inc 20 Jun 2005 14:19:50 -0000 1.13
***************
*** 62,67 ****
<!-- /TMPL_UNLESS -->
<!-- TMPL_IF NAME="loggedinusername" -->
! <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
<!-- TMPL_ELSE -->
! <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
<!-- /TMPL_IF -->
--- 62,67 ----
<!-- /TMPL_UNLESS -->
<!-- TMPL_IF NAME="loggedinusername" -->
! <p> Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
<!-- TMPL_ELSE -->
! <p><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
<!-- /TMPL_IF -->
More information about the Koha-cvs
mailing list