[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes common-
From: |
Paul POULAIN |
Subject: |
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes common-style.css,1.38,1.39 members-top.inc,1.28,1.29 parameters-top.inc,1.32,1.33 reportswcal-top.inc,1.1,1.2 |
Date: |
Wed, 26 Oct 2005 02:17:09 -0700 |
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30201/koha-tmpl/intranet-tmpl/default/en/includes
Modified Files:
common-style.css members-top.inc parameters-top.inc
reportswcal-top.inc
Log Message:
big commit, still breaking things...
* synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not
be modified deeply.
* code cleaning (cleaning warnings from perl -w) continued
Index: common-style.css
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** common-style.css 12 Aug 2005 13:53:35 -0000 1.38
--- common-style.css 26 Oct 2005 09:17:07 -0000 1.39
***************
*** 54,59 ****
font-size:12px;
padding: 2px 5px 2px 5px;
! margin:5px;
! /* margin-bottom:5px; */
display:inline;
position:static;
--- 54,59 ----
font-size:12px;
padding: 2px 5px 2px 5px;
! margin-top:5px;
! margin-bottom:5px;
display:inline;
position:static;
***************
*** 139,142 ****
--- 139,143 ----
}
+
h1 {
color:#000000;
***************
*** 276,280 ****
a.resultlist {
font-weight : bold;
! display : block;
padding-left : 5px;
}
--- 277,281 ----
a.resultlist {
font-weight : bold;
! /* display : block;*/
padding-left : 5px;
}
Index: members-top.inc
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** members-top.inc 4 Aug 2005 14:02:52 -0000 1.28
--- members-top.inc 26 Oct 2005 09:17:07 -0000 1.29
***************
*** 17,21 ****
color:#FFFFFF;
text-decoration: normal;
- font-weight: bold;
}
a.members:hover {
--- 17,20 ----
***************
*** 23,27 ****
color: #FFFFFF;
text-decoration: normal;
- font-weight: bold;
}
</style>
--- 22,25 ----
Index: parameters-top.inc
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** parameters-top.inc 4 Aug 2005 14:02:52 -0000 1.32
--- parameters-top.inc 26 Oct 2005 09:17:07 -0000 1.33
***************
*** 4,8 ****
--- 4,17 ----
<head>
<title>KOHA: INTRANET: Parameters</title>
+ <!-- Additions to enable Calendar system -->
+ <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-system.css">
+ <!-- End of additions -->
+
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <!-- Additions to enable Calendar system -->
+ <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>
+ <!-- End of additions -->
<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"
-->/includes/common-style.css">
Index: reportswcal-top.inc
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/reportswcal-top.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** reportswcal-top.inc 25 Feb 2005 20:52:14 -0000 1.1
--- reportswcal-top.inc 26 Oct 2005 09:17:07 -0000 1.2
***************
*** 4,11 ****
<head>
<title>KOHA: INTRANET: Reports</title>
- <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"
-->/includes/common-style.css">
<!-- Additions to enable Calendar system -->
<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-system.css">
<!-- End of additions -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
--- 4,11 ----
<head>
<title>KOHA: INTRANET: Reports</title>
<!-- Additions to enable Calendar system -->
<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-system.css">
<!-- End of additions -->
+ <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"
-->/includes/common-style.css">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
***************
*** 16,19 ****
--- 16,20 ----
<!-- End of additions -->
+
<script language="JavaScript" type="text/javascript">
function Help() {
***************
*** 27,31 ****
color:#FFFFFF;
text-decoration: normal;
- font-weight: bold;
background-image:none;
}
--- 28,31 ----
***************
*** 34,38 ****
color: #FFFFFF;
text-decoration: normal;
- font-weight: bold;
}
</style>
--- 34,37 ----
***************
*** 40,64 ****
<body>
! <!-- MENUS -->
! <div id="menubar">
! <span class="koha"><a class="home"
href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
! <a class="acquisition"
href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
! <a class="catalogue"
href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a>
! <a class="circulation"
href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
! <a class="members"
href="/cgi-bin/koha/members/members-home.pl">Members</a>
! <a class="authority"
href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
! <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
! <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
! <a class="about" href="/cgi-bin/koha/about.pl">About</a>
! <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help();
return false;">Help</a>
! </div>
! <div id="submenu">
! <span class="koha">options >> </span>
! <a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes"
class="submenu">Itemtypes</a>
! </div>
<!-- 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 -->
--- 39,47 ----
<body>
! <!-- TMPL_INCLUDE name="menus.inc" -->
<!-- TMPL_IF NAME="loggedinusername" -->
! <p class="user">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" -->
[<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
<!-- TMPL_ELSE -->
! <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to
Koha</p>
<!-- /TMPL_IF -->
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes common-style.css,1.38,1.39 members-top.inc,1.28,1.29 parameters-top.inc,1.32,1.33 reportswcal-top.inc,1.1,1.2,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters aqbookfund.tmpl,1.29,1.30 auth_tag_structure.tmpl,1.3,1.4 viewlog.tmpl,1.2,NONE
- Next by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder labs_theses.tmpl,1.1,1.2 unimarc_field_100.tmpl,1.4,1.5 unimarc_field_210c.tmpl,1.4,1.5
- Previous by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters aqbookfund.tmpl,1.29,1.30 auth_tag_structure.tmpl,1.3,1.4 viewlog.tmpl,1.2,NONE
- Next by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder labs_theses.tmpl,1.1,1.2 unimarc_field_100.tmpl,1.4,1.5 unimarc_field_210c.tmpl,1.4,1.5
- Index(es):