[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 menus.i
|
From: |
Paul POULAIN |
|
Subject: |
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes menus.inc,1.1,1.2 marc-editor.css,1.5,1.6 marc-top.inc,1.13,1.14 members-top.inc,1.27,1.28 parameters-top.inc,1.31,1.32 |
|
Date: |
Thu, 04 Aug 2005 07:02:55 -0700 |
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19014/koha-tmpl/intranet-tmpl/default/en/includes
Modified Files:
marc-editor.css marc-top.inc members-top.inc
parameters-top.inc
Added Files:
menus.inc
Log Message:
synch'ing 2.2 and head
Index: marc-editor.css
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/marc-editor.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** marc-editor.css 13 Jul 2004 12:56:21 -0000 1.5
--- marc-editor.css 4 Aug 2005 14:02:52 -0000 1.6
***************
*** 44,50 ****
font-weight:bold;
color:#ad11ad;
! background-color:FFFFFF;
background-image:url('');
- border-bottom: thin solid #ad11ad;
margin-right:30%;
}
--- 44,49 ----
font-weight:bold;
color:#ad11ad;
! background-color:#E8E0F1;
background-image:url('');
margin-right:30%;
}
***************
*** 55,57 ****
--- 54,57 ----
margin-left:30px;
display:inline;
+ color:#000000;
}
Index: marc-top.inc
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** marc-top.inc 20 Jun 2005 14:19:50 -0000 1.13
--- marc-top.inc 4 Aug 2005 14:02:52 -0000 1.14
***************
*** 40,67 ****
<body>
<!-- TMPL_UNLESS name="popup" -->
! <!-- 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/loadmodules.pl?module=search&marc=1&type=intranet"
class="submenu2">search</a>
! <a
href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&type=intranet"
class="submenu">Add biblio</a>
! <a class="submenu2" href="/cgi-bin/koha/bull-home.pl">Serial</a>
! <a href="/cgi-bin/koha/bookshelves/shelves.pl"
class="submenu">Virtual shelves</a>
! </div>
! <!-- /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 -->
--- 40,48 ----
<body>
<!-- TMPL_UNLESS name="popup" -->
! <!-- 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 -->
+ <!-- /TMPL_UNLESS -->
Index: members-top.inc
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** members-top.inc 17 Sep 2004 13:19:56 -0000 1.27
--- members-top.inc 4 Aug 2005 14:02:52 -0000 1.28
***************
*** 30,55 ****
<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/members/members-home.pl"
class="submenu">Search</a>
! <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add"
class="submenu2">Add member</a>
! <a
href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add"
class="submenu">Add organisation</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 -->
--- 30,37 ----
<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 -->
Index: parameters-top.inc
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** parameters-top.inc 17 Sep 2004 13:19:56 -0000 1.31
--- parameters-top.inc 4 Aug 2005 14:02:52 -0000 1.32
***************
*** 13,17 ****
color: #FFFFFF;
text-decoration: normal;
- font-weight: bold;
background-image:none;
}
--- 13,16 ----
***************
*** 20,24 ****
color: #FFFFFF;
text-decoration: normal;
- font-weight: bold;
}
</style>
--- 19,22 ----
***************
*** 31,57 ****
}
</script>
! <!-- 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/admin/aqbookfund.pl" class="submenu">Funds</a>
! <a href="/cgi-bin/koha/admin/authorised_values.pl"
class="submenu2">Auth value</a>
! <a href="/cgi-bin/koha/admin/currency.pl"
class="submenu2">Currencies</a>
! <a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Printers</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 -->
--- 29,37 ----
}
</script>
!
! <!-- 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 menus.inc,1.1,1.2 marc-editor.css,1.5,1.6 marc-top.inc,1.13,1.14 members-top.inc,1.27,1.28 parameters-top.inc,1.31,1.32,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes favicon.ico,1.1,1.2 about-top.inc,1.20,1.21 acquisitions-top.inc,1.27,1.28 auth-top.inc,1.7,1.8 bull-top.inc,1.5,1.6 cat-top.inc,1.35,1.36 circulation-top.inc,1.30,1.31 common-style.css,1.36,1.37
- Next by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member-quicksearch-results.tmpl,1.3,1.4
- Previous by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes favicon.ico,1.1,1.2 about-top.inc,1.20,1.21 acquisitions-top.inc,1.27,1.28 auth-top.inc,1.7,1.8 bull-top.inc,1.5,1.6 cat-top.inc,1.35,1.36 circulation-top.inc,1.30,1.31 common-style.css,1.36,1.37
- Next by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member-quicksearch-results.tmpl,1.3,1.4
- Index(es):