[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en/includes doc-he... [dev_week]
|
From: |
Owen Leonard |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en/includes doc-he... [dev_week] |
|
Date: |
Wed, 23 Aug 2006 16:41:07 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Owen Leonard <oleonard> 06/08/23 16:41:07
Modified files:
koha-tmpl/opac-tmpl/npl/en/includes: doc-head-close.inc
masthead-user.inc
masthead.inc
masthead_adv.inc
navigation.inc
opac-colors.css
opac-facets.inc
opac-layout.css
Log message:
Many changes related to layout, colors etc.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.11.2.6&r2=1.1.2.11.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead-user.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.6.2.1&r2=1.1.2.6.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.8.2.8&r2=1.1.2.8.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead_adv.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.6&r2=1.1.2.6.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.4.2.13&r2=1.2.2.4.2.14
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.1&r2=1.1.2.3.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-facets.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4.2.5&r2=1.1.2.4.2.6
Patches:
Index: doc-head-close.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1.2.11.2.6
retrieving revision 1.1.2.11.2.7
diff -u -b -r1.1.2.11.2.6 -r1.1.2.11.2.7
--- doc-head-close.inc 7 Aug 2006 18:41:02 -0000 1.1.2.11.2.6
+++ doc-head-close.inc 23 Aug 2006 16:41:07 -0000 1.1.2.11.2.7
@@ -16,13 +16,7 @@
@import url(<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR
NAME="opaclayoutstylesheet" -->);
</style>
<!-- /TMPL_IF -->
-<style type="text/css">
-.term {
-font-weight: bold;
-color: red;
-}
-</style>
<!-- TMPL_IF NAME="livesearch" -->
<style type="text/css">
@import url(<!-- TMPL_VAR NAME="themelang" -->/includes/livesearch.css);
@@ -89,4 +83,4 @@
var MSG_NO_RECORD_ADDED = "No item was added to your book bag";
</script>
</head>
-<body>
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
Index: masthead-user.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead-user.inc,v
retrieving revision 1.1.2.6.2.1
retrieving revision 1.1.2.6.2.2
diff -u -b -r1.1.2.6.2.1 -r1.1.2.6.2.2
--- masthead-user.inc 21 Jul 2006 16:26:24 -0000 1.1.2.6.2.1
+++ masthead-user.inc 23 Aug 2006 16:41:07 -0000 1.1.2.6.2.2
@@ -1,8 +1,8 @@
<div id="masthead">
<h1><!-- TMPL_IF NAME="opacsmallimage" --><img alt="<!-- TMPL_VAR
NAME="LibraryName" -->" src="<!-- TMPL_VAR NAME='opacsmallimage' -->" /><!--
/TMPL_IF -->Library Catalog Search</h1>
-<div class="menu"><form action="/cgi-bin/koha/opac-zoomsearch.pl"
method="post">
-<p><a href="/cgi-bin/koha/opac-zoomsearch.pl">Search Home</a> <!-- TMPL_IF
NAME="opacbookbag" -->| <a href="" onclick="openBasket(); return false;"
title="A "shopping cart" for your selections">Book Bag</a><!--
/TMPL_IF --></p> <p><label for="quick_ccl_query">Search the
Catalog</label><input type="hidden" name="op" value="get_results" />
-<input name="ccl_query" id="quick_ccl_query" type="text" />
+<div class="menu"><form action="/search" method="post">
+<p><a href="/search">Search Home</a> <!-- TMPL_IF NAME="opacbookbag" -->| <a
href="" onclick="openBasket(); return false;" title="A "shopping
cart" for your selections">Book Bag</a><!-- /TMPL_IF --></p> <p><label
for="quick_query">Search the Catalog</label>
+<input name="qf" id="quick_query" type="text" />
<input type="submit" value="Search" class="submit" /></p></form></div>
<!-- <div class="menu"><a href="/cgi-bin/koha/opac-user.pl">your library
home</a> |
<a href="/cgi-bin/koha/opac-userdetails.pl">your personal details</a> |
<a href="/cgi-bin/koha/opac-shelves.pl">My Virtual Shelves</a> | <a
class="logout" href="/cgi-bin/koha/opac-logout.pl">log out</a>
@@ -24,3 +24,8 @@
</div>
<!-- /TMPL_IF -->
</div>
+
+<!-- TMPL_IF NAME="opaclanguagesdisplay" --><div id="languages">
+ <ul>
+ <!-- TMPL_LOOP NAME="languages" --><!-- TMPL_IF NAME="current"
--><li><!-- TMPL_VAR NAME="label" --> </li><!-- TMPL_ELSE --><li><a
href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="language"
-->"><!-- TMPL_VAR NAME="label" --></a> </li><!-- /TMPL_IF --><!-- /TMPL_LOOP
-->
+ </ul></div><!-- /TMPL_IF -->
Index: masthead.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc,v
retrieving revision 1.1.2.8.2.8
retrieving revision 1.1.2.8.2.9
diff -u -b -r1.1.2.8.2.8 -r1.1.2.8.2.9
--- masthead.inc 9 Aug 2006 22:59:30 -0000 1.1.2.8.2.8
+++ masthead.inc 23 Aug 2006 16:41:07 -0000 1.1.2.8.2.9
@@ -1,31 +1,40 @@
<div id="masthead">
-<h2 id="libraryname"><!-- TMPL_VAR NAME="LibraryName" --></h2>
+<h1 id="libraryname"><a href="/cgi-bin/koha/opac-main.pl"><!-- TMPL_VAR
NAME="LibraryName" --></a></h1>
+<div id="members">
+ <ul><!-- TMPL_IF NAME="loggedinusername" --><!-- /TMPL_IF
--><!--TMPL_IF NAME="virtualshelves" --><li><a
href="/cgi-bin/koha/opac-shelves.pl">My Virtual Shelves</a></li><!-- /TMPL_IF
--><!-- TMPL_IF NAME="loggedinusername" --><li><a
href="/cgi-bin/koha/opac-user.pl">My Account</a></li><!-- /TMPL_IF --><!--
TMPL_IF NAME="opacbookbag" --><li><a href="/cgi-bin/koha/opac-basket.pl"
onclick="openBasket(); return false;" title="A "shopping cart" for
your selections">Book Bag<span id="basket"><script language="javascript"
type="text/javascript">if(basketcount){ document.write(basketcount)
};</script></span></a></li><!-- /TMPL_IF --><!-- TMPL_IF
NAME="loggedinusername" --><li><span class="members">Logged in as <span
class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR
NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR
NAME="surname" --><!-- /TMPL_LOOP --></span></span></li><li><a class="logout"
href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li><!-- TMPL_ELSE --><li><a
href="/cgi-bin/koha/opac-user.pl">Log in to Your Account</a></li><!-- /TMPL_IF
-->
+ </ul>
+</div>
+
<div class="menu">
-<form name="searchform" method="get" action="/cgi-bin/koha/opac-zoomsearch.pl"
id="searchform">
+<form name="searchform" method="get" action="/search" id="searchform">
<p>
<label for="masthead_search">Search</label>
-<input type="hidden" name="op" value="get_results" />
-<input type="hidden" name="search_type" value="cql" />
-<select name="ccl_query" id="masthead_search">
+<select name="idx" id="masthead_search">
<option selected="selected" value="">Library Catalog</option>
- <option value="ti=">Title</option>
- <option value="te=">Exact Title</option>
- <option value="au=">Author</option>
- <option value="su=">Subject</option>
- <option value="isbn=">ISBN</option>
- <option value="series=">Series</option>
- <option value="publisher=">Publisher</option>
- <option value="acqdate=">Acquisition Date</option>
- <option value="callnum=">Call Number</option>
+ <option value="ti">Title</option>
+ <option value="au">Author</option>
+ <option value="su">Subject</option>
+ <option value="isbn">ISBN</option>
+ <option value="series">Series</option>
+ <option value="publisher">Publisher</option>
+ <option value="acqdate">Acquisition Date</option>
+ <option value="callnum">Call Number</option>
</select>
-<input type="text" name="ccl_query" style="width: 30%;"/>
-<input type="submit" value="Search" class="submit" /></p>
+<input type="text" name="qf" style="width: 30%;"/>
+<input type="submit" name="do" value="Search" class="submit" /> <a
href="/search">Advanced Search</a></p>
</form></div>
-
-<div id="members">
- <ul><!-- TMPL_IF NAME="loggedinusername" --><li><span
class="members">Logged in as <span class="loggedinusername"><!-- TMPL_LOOP
NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR
NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP
--></span></span></li><!-- TMPL_ELSE --><li><a class="card"
href="/cgi-bin/koha/opac-user.pl">Log in to access<br /> cardholder
features</a></li><!-- /TMPL_IF --><!--TMPL_IF NAME="virtualshelves" --><li><a
href="/cgi-bin/koha/opac-shelves.pl">My Virtual Shelves</a></li><!-- /TMPL_IF
--><!-- TMPL_IF NAME="loggedinusername" --><li><a
href="/cgi-bin/koha/opac-user.pl">My Account</a></li><!-- /TMPL_IF --><!--
TMPL_IF NAME="opacbookbag" --><li><a href="/cgi-bin/koha/opac-basket.pl"
onclick="openBasket(); return false;" title="A "shopping cart" for
your selections">Book Bag<span id="basket"><script language="javascript"
type="text/javascript">if(basketcount){ document.write(basketcount)
};</script></span></a></li><!-- /TMPL_IF --><!-- TMPL_IF
NAME="loggedinusername" --><li><a class="logout"
href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li><!-- /TMPL_IF -->
- </ul>
</div>
+
+<!-- TMPL_IF NAME="opaclanguagesdisplay" --><div id="languages">
+ <ul>
+ <!-- TMPL_LOOP NAME="languages" --><!-- TMPL_IF NAME="current"
--><li><!-- TMPL_VAR NAME="label" --> </li><!-- TMPL_ELSE --><li><a
href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="language"
-->"><!-- TMPL_VAR NAME="label" --></a> </li><!-- /TMPL_IF --><!-- /TMPL_LOOP
-->
+ </ul></div><!-- /TMPL_IF -->
+<div id="breadcrumbs">
+<!-- TMPL_IF NAME="searchdesc" --><p><!-- TMPL_IF name="total"
--><strong>“<!-- TMPL_VAR NAME="searchdesc" -->”</strong> returned
<!-- TMPL_VAR NAME="total" --> results<!-- TMPL_IF NAME="related" --> (related
searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search"
--><!-- /TMPL_LOOP -->)<!-- /TMPL_IF -->. <a
href="http://a9.com/-/opensearch/search/B0007WF826/<!-- TMPL_VAR
NAME='searchdesc' -->?count=10&startPage=1"><img title="RSS Feed for search
<!-- TMPL_VAR NAME='searchdesc' -->" alt="RSS Feed for search <!-- TMPL_VAR
NAME='searchdesc' -->" src="<!-- TMPL_VAR
NAME=themelang>/images/feed-icon-16x16.png" border="0" /></a>
+<!-- TMPL_ELSE -->
+<strong>“<!-- TMPL_VAR NAME="searchdesc" -->”</strong>
+<!-- TMPL_VAR NAME="search_error" -->
+<!-- /TMPL_IF --></p><!-- /TMPL_IF -->
</div>
Index: masthead_adv.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead_adv.inc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.6.2.1
diff -u -b -r1.1.2.6 -r1.1.2.6.2.1
--- masthead_adv.inc 27 Apr 2006 17:02:20 -0000 1.1.2.6
+++ masthead_adv.inc 23 Aug 2006 16:41:07 -0000 1.1.2.6.2.1
@@ -1,6 +1,6 @@
<div id="masthead">
<h1><!-- TMPL_IF NAME="opacsmallimage" --><img alt="<!-- TMPL_VAR
NAME="LibraryName" -->" src="<!-- TMPL_VAR NAME="opacsmallimage" -->" /><!--
/TMPL_IF -->Library Catalog Search</h1>
-<div class="menu"><a href="/cgi-bin/koha/opac-main.pl">Search Home</a> <!--
TMPL_IF NAME="opacbookbag" -->| <a href="" onclick="openBasket(); return
false;" title="A "shopping cart" for your selections">Book Bag<span
id="basket"><script language="javascript"
type="text/javascript">if(basketcount){ document.write(basketcount)
};</script></span></a><!-- /TMPL_IF --></div><br class="clear">
+<div class="menu"><a href="/cgi-bin/koha/opac-main.pl">Search Home</a> <!--
TMPL_IF NAME="opacbookbag" -->| <a href="" onclick="openBasket(); return
false;" title="A "shopping cart" for your selections">Book Bag<span
id="basket"><script language="javascript"
type="text/javascript">if(basketcount){ document.write(basketcount)
};</script></span></a><!-- /TMPL_IF --></div><br class="clear" />
<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername"
--><div id="members">
<ul>
Index: navigation.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc,v
retrieving revision 1.2.2.4.2.13
retrieving revision 1.2.2.4.2.14
diff -u -b -r1.2.2.4.2.13 -r1.2.2.4.2.14
--- navigation.inc 9 Aug 2006 23:59:21 -0000 1.2.2.4.2.13
+++ navigation.inc 23 Aug 2006 16:41:07 -0000 1.2.2.4.2.14
@@ -7,7 +7,7 @@
<!-- TMPL_LOOP NAME="facets_loop" -->
<li id="<!-- TMPL_VAR NAME="type_id" -->"><!-- TMPL_VAR NAME="type_label"
--><ul>
<!-- TMPL_LOOP NAME="facets" -->
- <li><a href="/search?q=<!-- TMPL_VAR NAME="searchdesc"
-->&q=<!-- TMPL_VAR NAME="type_link_value" -->=<!-- TMPL_VAR
NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value"
-->"><!-- TMPL_VAR NAME="facet_label_value" --></a> (<!-- TMPL_VAR
NAME="facet_count" -->)</li>
+ <li><a href="/search?q=<!-- TMPL_VAR NAME="searchdesc" --> and
<!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value"
-->" title="<!-- TMPL_VAR NAME="facet_title_value" -->"><!-- TMPL_VAR
NAME="facet_label_value" --></a> (<!-- TMPL_VAR NAME="facet_count" -->)</li>
<!-- /TMPL_LOOP -->
<!-- TMPL_IF NAME="expandable" -->
<li class="showmore"><a href="/search?q=<!-- TMPL_VAR NAME="searchdesc"
-->&expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id"
-->">Show More</a></li>
Index: opac-colors.css
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-colors.css,v
retrieving revision 1.1.2.3.2.1
retrieving revision 1.1.2.3.2.2
diff -u -b -r1.1.2.3.2.1 -r1.1.2.3.2.2
--- opac-colors.css 9 Aug 2006 22:59:30 -0000 1.1.2.3.2.1
+++ opac-colors.css 23 Aug 2006 16:41:07 -0000 1.1.2.3.2.2
@@ -64,6 +64,10 @@
background-color: #FFFFFF;
}
+body#withsidebar #main {
+ border: 0;
+}
+
caption {
color: #000066;
}
@@ -89,6 +93,21 @@
background-color: transparent;
}
+div#advanced-search fieldset {
+ border-right : 1px solid #999999;
+ border-top : 1px solid #999999;
+ border-bottom : 1px solid #999999;
+ border-left : 1px solid #999999;
+}
+
+div#advanced-search legend {
+ color : #003366;
+}
+
+dl.details dt {
+ color: #000066;
+}
+
em.new {
color: #CC3333;
}
@@ -101,8 +120,15 @@
color: #D3DFAD;
}
+h1#libraryname a {
+ color: #000066;
+ margin-left: .3em;
+ text-decoration: none;
+}
+
input.icon {
background-color: #6699CC;
+ border: 1px outset #666666;
color: #FFFFCC;
}
@@ -111,10 +137,20 @@
border: 1px dashed #CC6600;
}
+span.itemicon {
+ background-color : #F8F8EB;
+ border: 1px solid #D8DEB8;
+}
+
table {
background-color: #FFFFFF;
}
+table.itemtypes td {
+ background-color: #F8F8EB;
+ border: 1px solid #D8DEB8;
+}
+
td {
border-bottom: 1px solid #DDDDDD;
border-right: 1px solid #DDDDDD;
@@ -127,6 +163,21 @@
color: #000000;
}
+td.credit {
+ color: #000066;
+}
+
+td.debit {
+ color: #990000;
+}
+
+td.sum, th.sum {
+}
+
+td.sum {
+ background-color : #FFFFCC;
+}
+
td.label {
border-bottom: 1px solid #CCCCCC;
border-left: 1px solid #CCCCCC;
@@ -142,6 +193,15 @@
color: #000088;
}
+div.details {
+ padding: 5px;
+}
+
+div.details table, div.details td, div.details th {
+ border: 0;
+ border-bottom: 1px solid #DDDDDD;
+}
+
td.overdue {
color: #CC0000;
}
@@ -177,35 +237,12 @@
tr.overdue td {
background-color: #FEA7A7;
-/* Tabs */
-ul.link-tabs {
-}
-
-ul.link-tabs li {
-}
-
-ul.link-tabs li a {
- border-left: 1px solid #FFFFE3;
- border-right: 1px solid #666600;
- border-top: 1px solid #FFFFE3;
}
-ul.link-tabs li.off a {
- background-color: #D8DEB8;
- border-bottom: 1px solid #CCCC99;
-}
-
-ul.link-tabs li.off a:hover {
- background-color: #FFFFEC;
- border-left: 1px solid #BEBF84;
- border-right: 2px solid #333333;
- border-top: 1px solid #BEBF84;
-}
-
-ul.link-tabs li.on a {
- background-color: #FFFFCC;
- border-bottom: 1px solid #FFFFCC;
-}
+input.cancel {
+ background-color: #990033;
+ border: 1px outset #666666;
+ color: #FFFFCC;
}
.content-block {
@@ -269,43 +306,49 @@
}
.menu {
- color: #000000;
+ background-image : url(../images/menubg.gif);
+ background-repeat: repeat-x;
+ background-color: #6699CC;
+ border-top: 1px solid #335599;
+ border-bottom: 1px solid #335599;
+ color: #FFFFFF;
}
-.menu a:link, #members a:link {
- color: #0099CC;
+.menu a:link {
+ color : #FFFFCC;
}
-.menu a:link.logout {
- background-color: #FFDD75;
- color: #000000;
+.menu a:visited {
+ color : #FFFFCC;
}
-.menu a:visited, #members a:visited {
- color: #0099CC;
+.menu a:hover {
+ color : #FFFFFF;
}
-.menu a:visited.logout {
- background-color: #FFDD75;
- color: #000000;
+.menu a:active {
+ color : #FFFF99;
}
-.menu a:hover, #members a:hover {
- color: #990000;
+#members a:link {
+ color: #0099CC;
}
-.menu a:hover.logout {
- background-color: #FFCC33;
- color: #000000;
+#members a:visited {
+ color: #0099CC;
}
-.menu a:active, #members a:active {
+#members a:hover {
color: #990000;
}
-.menu a:active.logout {
- background-color: #FFDD75;
- color: #000000;
+#members a:active {
+ color: #990000;
+}
+
+.menu input.submit {
+ background-color : #6BA037;
+ color: #FFFFFF;
}
.note {
@@ -355,6 +398,7 @@
.submit {
background-color: #6699CC;
+ border: 1px outset #666666;
color: #FFFFCC;
}
@@ -367,9 +411,17 @@
border-bottom: 1px solid #DDDDDD;
}
+#languages ul li a {
+ border: 1px solid #D8DEB8;
+}
+
+#languages ul li a:hover {
+ background-color: #FFFFCC;
+}
+
#main {
- background-color: transparent;/*
- border-right: 1px solid #EEEEEE;*/
+ background-color: transparent;
+ border-top: 1px solid #EEEEEE;
}
#masthead {
@@ -378,7 +430,7 @@
}
#members {
- background-image : url(navBarBgDef.gif);
+ background-image : url(../images/navBarBgDef.gif);
background-repeat: repeat-x;
border-top: 1px solid #9999CC;
border-bottom : 1px solid #9999CC;
@@ -387,7 +439,7 @@
}
#members ul li a:link, #members ul li a:visited, #members ul li a:hover,
#members ul li a:active, #members span.members {
- background-image : url(navBarBg.gif);
+ background-image : url(../images/navBarBg.gif);
background-repeat: repeat-x;
border-left: 1px solid #9999CC;
color: #006699;
@@ -398,7 +450,7 @@
}
#members ul li a:hover {
- background-image : url(navBarBgHover.gif);
+ background-image : url(../images/navBarBgHover.gif);
background-repeat: repeat-x;
}
@@ -407,13 +459,13 @@
}
#members a.logout:link, #members a.logout:visited, #members a.logout:hover,
#members a.logout:active {
- background-image : url(navBarBgLogout.gif);
+ background-image : url(../images/navBarBgLogout.gif);
background-repeat: repeat-x;
color: #000000;
}
#members a:hover.logout {
- background-image : url(navBarBgLogoutHover.gif);
+ background-image : url(../images/navBarBgLogoutHover.gif);
background-repeat: repeat-x;
color: #000000;
}
@@ -469,8 +521,16 @@
}
#sidebar {
- background-color: #F8F8EB;
- border: 1px dashed #666666;
+ /*background-color: #F8F8EB;
+ border: 1px dashed #666666;*/
+}
+
+#sidebar fieldset {
+ background-color: #F9F9FF;
+}
+
+#sidebar legend {
+ color : #003366;
}
#sidebar .submit {
Index: opac-facets.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-facets.inc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- opac-facets.inc 28 Jul 2006 01:45:34 -0000 1.1.2.4
+++ opac-facets.inc 23 Aug 2006 16:41:07 -0000 1.1.2.5
@@ -1,95 +1,15 @@
-<!-- Tigra Menus -->
-<style type="text/css">
-.intd td {
- padding: 0;
-}
-i_txt0_0 {
- color: #000000;
- font-size: 14px;
-}
-td .intd {
- width: 100px;
-}
-.intd table {
- border-collapse: separate;
- margin : 0;
- padding : 0;
-}
-.ctrl {
- padding:0;
-}
-</style>
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR
NAME="themelang" -->/includes/tigra/tree.js"></script>
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR
NAME="themelang" -->/includes/tigra/tree_tpl.js"></script>
-<script type="text/javascript" language="javascript">
-
-<!-- TMPL_IF NAME="total" -->
-
-var LIMITS_TREE = [
-['Further limit search to', null,
-
- <!-- TMPL_IF NAME=branchloop -->
- ['Branch', null,
- <!-- TMPL_LOOP NAME=branchloop -->
- ['<!-- TMPL_VAR NAME=branchname
-->','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and branch=<!-- TMPL_VAR NAME=value -->'],
+<!-- TMPL_UNLESS name="OpacNav" --><div id="nav"><!-- TMPL_IF
NAME="opacfacets" -->
+<!-- TMPL_IF NAME="facets_loop" --><h6>Refine Your Search</h6>
+<ul id="facets">
+<!-- TMPL_LOOP NAME="facets_loop" -->
+<li id="<!-- TMPL_VAR NAME="type_id" -->"><!-- TMPL_VAR NAME="type_label"
--><ul>
+ <!-- TMPL_LOOP NAME="facets" -->
+ <li><a href="/search?q=<!-- TMPL_VAR NAME="searchdesc" --> and
<!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value"
-->" title="<!-- TMPL_VAR NAME="facet_title_value" -->"><!-- TMPL_VAR
NAME="facet_label_value" --></a> (<!-- TMPL_VAR NAME="facet_count" -->)</li>
<!-- /TMPL_LOOP -->
- ],
- <!-- /TMPL_IF -->
- <!-- TMPL_IF NAME=itemtypeloop -->
- ['Collection Code', null,
- <!-- TMPL_LOOP NAME=itemtypeloop -->
- ['<!-- TMPL_VAR NAME=description
-->','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and collection=<!-- TMPL_VAR NAME=value -->'],
- <!-- /TMPL_LOOP -->
- ],
- <!-- /TMPL_IF -->
-
- ['Format', 'null',
- ['Regular
Print','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and material-category=t and
material-designation=a'],
- ['Large
Print','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and material-category=t and
material-designation=b'],
-
['Braille','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and material-category=t and
material-designation=b'],
-
['Manuscript','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and material-category=t and
material-designation=a'],
-
['Microform','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and material-category=t and
material-designation=a'],
- ['CD
Audio','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and material-category=t and
material-designation=a'],
- ['Cassette
Recording','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and material-category=t and
material-designation=a'],
- ['LP
Recording','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and material-category=t and
material-designation=a'],
- ['Videocassette
(VHS)','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and material-category=v and
material-designation=f'],
- ['Videodisk
(DVD)','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and material-category=v and
material-designation=d'],
- ['CD-ROM
(Computer)','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and material-category=c and
material-designation=o'],
- ],
- ['Audience', 'null',
-
['Easy','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and (audience=a or audience=b)' ],
-
['Juvenile','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and (audience=j or audience=c)' ],
- ['Young
Adult','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and audience=d' ],
-
['Adult','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and audience=e' ],
- ],
- ['Content', 'null',
-
['Fiction','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and fiction=1'],
-
['Non-Fiction','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and fiction=0'],
-
['Biography','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and biography=b'],
-
['Mystery','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and mystery='],
- ['Thesis/Dissertation',''],
- ['Musical Recording',''],
- ['non-Musical Recording',''],
- ],
- ['Language', 'null',
-
['中文','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and language=chi'],
-
['deutsch','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and language=ger'],
-
['english','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and language=eng'],
-
['español','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and language=spa'],
-
['français','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and language=fre'],
-
['italiano','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and language=ita'],
-
['日本語','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!--
TMPL_VAR NAME=searchdesc --> and language=jpn'],
- ],
-
- ],
-];
-<!-- TMPL_ELSE -->
-var LIMITS_TREE = '';
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="facets" -->
-<!-- TMPL_VAR NAME="facets" -->
-<!-- TMPL_ELSE -->
-<!-- TMPL_VAR NAME="default_facets" -->
+<!-- TMPL_IF NAME="expandable" -->
+ <li class="showmore"><a href="/search?q=<!-- TMPL_VAR NAME="searchdesc"
-->&expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id"
-->">Show More</a></li>
<!-- /TMPL_IF -->
-</script>
-<!-- /Tigra -->
+</ul></li>
+<!-- /TMPL_LOOP -->
+</ul><!-- /TMPL_IF -->
+<!-- /TMPL_IF --></div><!-- /TMPL_UNLESS -->
\ No newline at end of file
Index: opac-layout.css
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-layout.css,v
retrieving revision 1.1.2.4.2.5
retrieving revision 1.1.2.4.2.6
diff -u -b -r1.1.2.4.2.5 -r1.1.2.4.2.6
--- opac-layout.css 9 Aug 2006 22:59:30 -0000 1.1.2.4.2.5
+++ opac-layout.css 23 Aug 2006 16:41:07 -0000 1.1.2.4.2.6
@@ -1,3 +1,113 @@
+/* NO COLUMNS */
+
+body #main {
+ margin-left : 2%;
+}
+
+/* TWO COLUMNS, RIGHT SIDEBAR */
+
+body#withsidebar #main {
+ float: left;
+ margin-left: 1%;
+ width: 58%;
+ }
+
+* html body#withsidebar #main {
+ margin-left: .5%;
+ }
+
+body#withsidebar #sidebar
+ {
+ float: left;
+ margin-top : 2.4em;
+ width: 39%;
+}
+
+/* THREE COLUMNS */
+
+body#tricolumn #main
+ {
+ float: left;
+ width: 55%;
+ margin-left: 20%;
+ }
+* html body#tricolumn #main
+ {
+ display: inline;
+ }
+body#tricolumn #nav
+ {
+ float: left;
+ width: 20%;
+ margin-left: -75%;
+ }
+body#tricolumn #sidebar
+ {
+ float: left;
+ width: 25%;
+ }
+
+/* TWO COLUMNS RIGHT NAVIGATION */
+
+body#withnav #main
+ {
+ float: left;
+ width: 77%;
+ margin-left: 23%;
+ }
+* html body#withnav #main
+ {
+ display: inline;
+ }
+#nav
+ {
+ float: left;
+ width: 23%;
+ margin-left: -100%;
+ max-width: 225px;
+ }
+
+
+/* we need this for IE 5.01 - otherwise the wrapper does not expand to the
+necessary height (unless fixed, this problem becomes even more acute
+weirdness as the method is enhanced */
+#wrapper
+ {
+/* Normally a Holly-style hack height: 1% would suffice but that causes
+IE 5.01 to completely collapse the wrapper - instead we float it */
+ float: left;
+/* NB. possibly only IE 5.01 needs to get this float value - otherwise 5.5
sometimes
+(I saw it happen many moons ago) makes the width of wrapper too small
+the float: none with the comment is ignored by 5.01,
+5.5 and above see it and carry on about their business
+It's probably fine to just remove it, but it's left here
+just in case that many moons ago problem rears its head again */
+ float/**/: none;
+ }
+/* easy clearing */
+#wrapper:after
+ {
+ content: '[DO NOT LEAVE IT IS NOT REAL]';
+ display: block;
+ height: 0;
+ clear: both;
+ visibility: hidden;
+ }
+#wrapper
+ {
+ display: inline-block;
+ }
+/*\*/
+#wrapper
+ {
+ display: block;
+ }
+/* end easy clearing */
+#footer
+ {
+ clear: both;
+ }
+
a {
font-weight: bold;
}
@@ -67,6 +177,10 @@
padding: 0;
}
+input, select, th, td {
+ font-size:1em
+}
+
caption {
font-family: Arial, Geneva, Helvetica, sans-serif;
font-weight: bold;
@@ -79,11 +193,6 @@
float: right;
}
-div.details table, div.details td, div.details th {
- border: 0;
- border-bottom: 1px solid #DDDDDD;
-}
-
div.details td.details {
text-align: left;
}
@@ -147,6 +256,24 @@
width: 95%;
}
+dl.details dt {
+ font-weight: bold;
+ margin: .5em 0;
+}
+
+dl.details dd {
+ margin-left: 1em;
+}
+
+dl.details ul {
+ padding: 0;
+ margin-left: 1em;
+}
+
+dl.details ul p {
+ margin-left : 0;
+}
+
em.new {
font-style: normal;
font-weight: bold;
@@ -240,6 +367,13 @@
background-image: url(../images/brief.gif);
}
+input.cancel {
+ font-family: Verdana, Arial, Geneva, Helvetica, sans-serif;
+ font-size : .9em;
+ font-weight: bold;
+ padding: 2px;
+}
+
input.cart, a.cart {
background-image: url(../images/basket.gif);
}
@@ -268,6 +402,7 @@
background-position: left;
background-repeat: no-repeat;
font-family: Verdana, Arial, Geneva, Helvetica, sans-serif;
+ font-size : .9em;
font-weight: bold;
padding: 2px 2px 2px 22px;
}
@@ -323,6 +458,13 @@
padding: 3px 0 2px 0;
}
+span.itemicon {
+ float : left;
+ font-size: .9em;
+ margin: 2px;
+ white-space: nowrap;
+}
+
span.print {
font-size: .7em;
font-weight: normal;
@@ -346,6 +488,22 @@
text-align: right;
}
+td.credit {
+ text-align: right;
+}
+
+td.debit {
+ text-align: right;
+}
+
+td.sum, th.sum {
+ text-align: right;
+}
+
+td.sum {
+ font-weight: bold;
+}
+
td.label {
font-weight: bold;
line-height: 1.5em;
@@ -392,12 +550,24 @@
margin: 3px;
}
-ul#facets li {
+#nav h6 {
+ text-align: center;
+}
+
+#nav ul#facets {
+ margin : 0;
+ padding : 0;
+}
+
+#nav ul#facets li {
font-weight: bold;
text-align: left;
}
-ul#facets ul li {
+#nav ul#facets li#branch_facet, #nav ul#facets li#subject_facet, #nav
ul#facets li#series_facet, #nav ul#facets li#author_facet {
+}
+
+#nav ul#facets ul li {
border: 0;
font-size: .95em;
font-weight: normal;
@@ -405,16 +575,16 @@
text-align: left;
}
-ul#facets ul li a {
+#nav ul#facets ul li a {
font-weight: normal;
text-decoration: underline;
}
-ul#facets ul li.showmore {
+#nav ul#facets ul li.showmore {
text-align: center;
}
-ul#facets ul li.showmore a {
+#nav ul#facets ul li.showmore a {
font-weight: bold;
text-decoration: none;
}
@@ -457,9 +627,37 @@
}
.content-block {
- margin: 5px;
padding: 5px;
- width: 90%;
+}
+
+div#advanced-search p {
+ margin: .4em;
+}
+
+div#advanced-search fieldset {
+ /*margin-left : -1em;*/
+ margin-bottom: .3em;
+}
+
+div#advanced-search fieldset p {
+ margin-left : 1em;
+ white-space: nowrap;
+}
+
+table.itemtypes {
+ border-collapse: separate;
+ border-spacing: 3px;
+ display: block;
+ padding: 0;
+ margin: 0;
+}
+
+div#advanced-search legend, div#sidebar legend {
+ font-weight: bold;
+}
+
+div#advanced-search label {
+
}
.count {
@@ -474,16 +672,21 @@
.detail-sidebar {
float: right;
- margin : 0 0 0 15px;
padding: 5px;
+ margin-left : 15px;
text-align: center;
- width: 35%;
+ width : 35%;
}
.detail-sidebar .further {
float: none;
text-align: left;
- width: 90%;
+ width : 90%;
+}
+
+.further {
+ text-align: left;
+ width : 90%;
}
.ex {
@@ -491,9 +694,7 @@
}
.further {
- float: right;
margin: 5px;
- width: 30%;
}
.further h4 {
@@ -539,9 +740,10 @@
}
.menu {
- margin-bottom: 5px;
- margin-left: 15px;
- margin-right: 10px;
+ line-height: 3em;
+ font-size: 1.2em;
+ margin: 0;
+ padding: 5px;
}
.menu a.logout {
@@ -601,11 +803,15 @@
.operations {
margin-top: 7px;
- padding-left: 10px;
+ padding: 0 10px;
text-align: center;
width: 100%;
}
+.operations img {
+ padding: 5px;
+}
+
.operations li {
list-style-type: none;
margin: 0;
@@ -671,6 +877,7 @@
.submit {
font-family: Verdana, Arial, Geneva, Helvetica, sans-serif;
+ font-size : .9em;
font-weight: bold;
padding: 2px;
}
@@ -719,6 +926,30 @@
text-align: left;
}
+#languages {
+ position: absolute;
+ top: 10px;
+ right: 5px;
+}
+
+#languages ul {
+ list-style: none;
+ margin: 0;
+ padding : 0;
+}
+
+#languages ul li {
+ display: inline;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: .9em;
+}
+
+#languages ul li a {
+ font-weight: normal;
+ padding: 0 3px;
+ text-decoration: none;
+}
+
#loose_form label, #keyword_form label, #precise_form label, #cql_form label,
#advanced label, #cql label, #power label, #proximity label {
font-weight: bold;
text-align: right;
@@ -729,19 +960,21 @@
width: 96%;
}
-#main {
+/*#main {
margin-left: 20%;
margin-right: 0;
padding: 0;
position: relative;
-}
+}*/
#masthead {
margin: 0;
+ margin-bottom : 1em;
padding: 0;
}
#members {
+ font-size: .8em;
font-weight: bold;
padding: 4px 0 4px 0;
}
@@ -782,12 +1015,12 @@
text-align: right;
}
-#nav {
+/*#nav {
float: left;
margin: 0;
padding: 0;
width: 20%;
-}
+}*/
#nav a {
font-family: Arial, Geneva, Helvetica, sans-serif;
@@ -866,12 +1099,12 @@
text-align: left;
}
-#sidebar {
+/*#sidebar {
float: right;
margin: 20px;
padding: 5px;
width: 20%;
-}
+}*/
#sidebar .submit {
font-family: Verdana, Arial, Geneva, Helvetica, sans-serif;
- [Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en/includes doc-he... [dev_week],
Owen Leonard <=