[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: |
Tue, 19 Sep 2006 13:13:22 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Owen Leonard <oleonard> 06/09/19 13:13:21
Modified files:
koha-tmpl/opac-tmpl/npl/en/includes: doc-head-close-results.inc
masthead-basic.inc
masthead-user.inc
masthead.inc navigation.inc
opac-colors.css
opac-facets.inc
opac-layout.css
usermenu.inc
koha-tmpl/opac-tmpl/npl/en: opac-account.tmpl
opac-advsearch.tmpl opac-basket.tmpl
opac-detail.tmpl opac-main.tmpl
opac-passwd.tmpl
opac-readingrecord.tmpl
opac-results.tmpl opac-shelves.tmpl
opac-suggestions.tmpl opac-user.tmpl
opac-userdetails.tmpl
opac-userupdate.tmpl
Log message:
Catching up with changes to dev_week: Refining layout framework,
updating user menu, etc.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close-results.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead-basic.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2
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.2&r2=1.1.2.6.2.3
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.10&r2=1.1.2.8.2.11
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.14&r2=1.2.2.4.2.15
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.3&r2=1.1.2.3.2.4
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.5&r2=1.1.2.6
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.7&r2=1.1.2.4.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/usermenu.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-account.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2.2.2&r2=1.1.2.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-advsearch.tmpl?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/opac-basket.tmpl?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/opac-detail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.19.2.8&r2=1.1.2.19.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.14.2.4&r2=1.3.2.14.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-passwd.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.3&r2=1.1.2.3.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-readingrecord.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.3&r2=1.1.2.3.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.14&r2=1.1.2.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2.2.2&r2=1.1.2.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-suggestions.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.5.2.2&r2=1.1.2.5.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.11.2.5&r2=1.1.2.11.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-userdetails.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.3&r2=1.1.2.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-userupdate.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.4.2&r2=1.1.4.3
Patches:
Index: includes/doc-head-close-results.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/doc-head-close-results.inc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- includes/doc-head-close-results.inc 6 Sep 2006 14:22:52 -0000 1.1.2.2
+++ includes/doc-head-close-results.inc 19 Sep 2006 13:13:21 -0000 1.1.2.3
@@ -1,28 +1,17 @@
</title>
-<!-- TMPL_IF NAME="TemplateEncoding" -->
-<meta http-equiv="Content-Type" content="text/html; charset=<!-- TMPL_VAR
NAME='TemplateEncoding' -->" />
-<!-- TMPL_ELSE -->
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="TemplateEncoding" --><meta http-equiv="Content-Type"
content="text/html; charset=<!-- TMPL_VAR NAME='TemplateEncoding' -->" /><!--
TMPL_ELSE --><meta http-equiv="Content-Type" content="text/html; charset=utf-8"
/><!-- /TMPL_IF -->
<meta http-equiv="Content-Language" content="en-us" />
<link rel="shortcut icon" href="<!-- TMPL_VAR
NAME="themelang">/includes/favicon.ico" type="image/x-icon" />
<!-- TMPL_IF NAME="searchdesc" --><!-- TMPL_IF name="total" --><link
rel="alternate" type="application/rss+xml" title="RSS"
href="http://a9.com/-/opensearch/search/B0007WF826/<!-- TMPL_VAR
NAME="searchdesc" -->?count=10&startPage=1" /><!-- /TMPL_IF --><!--
/TMPL_IF -->
- <!-- TMPL_IF name="opacstylesheet" -->
-<style type="text/css">
+<!-- TMPL_IF name="opacstylesheet" --><style type="text/css">
@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR
NAME="opacstylesheet" -->);
-</style>
- <!-- TMPL_ELSE -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang"
-->/includes/<!-- TMPL_VAR NAME="opaccolorstylesheet" -->" />
+</style><!-- TMPL_ELSE --><link rel="stylesheet" type="text/css" href="<!--
TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR NAME="opaccolorstylesheet"
-->" />
<style type="text/css">
@import url(<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR
NAME="opaclayoutstylesheet" -->);
-</style>
- <!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="livesearch" -->
-<style type="text/css">
+</style><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="livesearch" --><style type="text/css">
@import url(<!-- TMPL_VAR NAME="themelang" -->/includes/livesearch.css);
-</style>
-<!-- /TMPL_IF -->
+</style><!-- /TMPL_IF -->
<script language="javascript" type="text/javascript">
function Help() {
newin=window.open("/cgi-bin/koha/help.pl","Koha
Help",'width=600,height=600,toolbar=false,scrollbars=yes');
@@ -55,8 +44,6 @@
newwin.close();
}
-
-
function openDictionary(dict, search, target) {
if ((dict == 'all') || (dict == 'publicationyear')) {
alert("The selected field is not correct to search on
dictionary.");
@@ -67,14 +54,12 @@
}
</script>
- <script type="text/javascript" language="javascript" src="<TMPL_VAR
NAME="themelang">/includes/catsearch.js"></script>
- <script type="text/javascript" language="javascript" src="<TMPL_VAR
NAME="themelang">/includes/main.js"></script>
- <!-- TMPL_IF NAME="AmazonContent" -->
- <script type="text/javascript" language="javascript" src="<TMPL_VAR
NAME="themelang">/includes/amazonimages.js"></script>
- <!-- /TMPL_IF -->
- <script type="text/javascript" language="javascript" src="<TMPL_VAR
NAME="themelang">/includes/script.js"></script>
- <script type="text/javascript" language="javascript" src="<TMPL_VAR
NAME="themelang">/includes/basket.js"></script>
- <script type="text/javascript" language="javascript">
+<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR
NAME="themelang" -->/includes/catsearch.js"></script>
+<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR
NAME="themelang" -->/includes/main.js"></script>
+<!-- TMPL_IF NAME="AmazonContent" --><script type="text/javascript"
language="javascript" src="<!-- TMPL_VAR NAME="themelang"
-->/includes/amazonimages.js"></script><!-- /TMPL_IF -->
+<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR
NAME="themelang" -->/includes/script.js"></script>
+<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR
NAME="themelang" -->/includes/basket.js"></script>
+<script type="text/javascript" language="javascript">
var MSG_BASKET_EMPTY = "You book bag is currently empty";
var MSG_RECORD_IN_BASKET = "This item is already in your book bag";
var MSG_RECORD_ADDED = "This item has been added to your book bag";
Index: includes/masthead-basic.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/masthead-basic.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- includes/masthead-basic.inc 23 Aug 2006 16:59:24 -0000 1.1.2.1
+++ includes/masthead-basic.inc 19 Sep 2006 13:13:21 -0000 1.1.2.2
@@ -11,5 +11,5 @@
<!-- 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
-->
+ <!-- TMPL_LOOP NAME="languages" --><li><a
href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="language"
-->"><!-- TMPL_VAR NAME="label" --></a> </li><!-- /TMPL_LOOP -->
</ul></div><!-- /TMPL_IF -->
\ No newline at end of file
Index: includes/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.2
retrieving revision 1.1.2.6.2.3
diff -u -b -r1.1.2.6.2.2 -r1.1.2.6.2.3
--- includes/masthead-user.inc 23 Aug 2006 16:41:07 -0000 1.1.2.6.2.2
+++ includes/masthead-user.inc 19 Sep 2006 13:13:21 -0000 1.1.2.6.2.3
@@ -27,5 +27,5 @@
<!-- 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
-->
+ <!-- TMPL_LOOP NAME="languages" --><li><a
href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="language"
-->"><!-- TMPL_VAR NAME="label" --></a> </li><!-- /TMPL_LOOP -->
</ul></div><!-- /TMPL_IF -->
Index: includes/masthead.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc,v
retrieving revision 1.1.2.8.2.10
retrieving revision 1.1.2.8.2.11
diff -u -b -r1.1.2.8.2.10 -r1.1.2.8.2.11
--- includes/masthead.inc 6 Sep 2006 14:25:03 -0000 1.1.2.8.2.10
+++ includes/masthead.inc 19 Sep 2006 13:13:21 -0000 1.1.2.8.2.11
@@ -2,7 +2,7 @@
<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><!-- TMPL_IF NAME="loggedinusername" --><!-- /TMPL_IF
--><!--TMPL_IF NAME="virtualshelves" --><li><a
href="/cgi-bin/koha/opac-shelves.pl">Your Virtual Shelves</a></li><!-- /TMPL_IF
--><!-- TMPL_IF NAME="loggedinusername" --><li><a
href="/cgi-bin/koha/opac-user.pl">Your 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"><img border="0" src="<!-- TMPL_VAR
NAME="themelang">/images/cart-small.gif"> Cart<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">Your Account</a></li><!-- /TMPL_IF -->
</ul>
</div>
@@ -22,14 +22,14 @@
<option value="acqdate">Acquisition Date</option>
<option value="callnum">Call Number</option>
</select>
-<input type="text" name="qf" style="width: 30%;"/>
+<input type="text" name="q" style="width: 30%;"/>
<input type="submit" name="do" value="Search" class="submit" /> <a
href="/search">Advanced Search</a></p>
</form></div>
</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
-->
+ <!-- TMPL_LOOP NAME="languages" --><li><a
href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="language"
-->"><!-- TMPL_VAR NAME="label" --></a> </li><!-- /TMPL_LOOP -->
</ul></div><!-- /TMPL_IF -->
<div id="breadcrumbs">
Index: includes/navigation.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc,v
retrieving revision 1.2.2.4.2.14
retrieving revision 1.2.2.4.2.15
diff -u -b -r1.2.2.4.2.14 -r1.2.2.4.2.15
--- includes/navigation.inc 23 Aug 2006 16:41:07 -0000 1.2.2.4.2.14
+++ includes/navigation.inc 19 Sep 2006 13:13:21 -0000 1.2.2.4.2.15
@@ -1,19 +1,3 @@
<div id="nav">
<!-- TMPL_VAR NAME="OpacNav" -->
-
-<!-- TMPL_IF NAME="opacfacets" -->
-<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 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 -->
-</ul></li>
-<!-- /TMPL_LOOP -->
-</ul>
-<!-- /TMPL_IF -->
</div>
Index: includes/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.3
retrieving revision 1.1.2.3.2.4
diff -u -b -r1.1.2.3.2.3 -r1.1.2.3.2.4
--- includes/opac-colors.css 6 Sep 2006 14:28:24 -0000 1.1.2.3.2.3
+++ includes/opac-colors.css 19 Sep 2006 13:13:21 -0000 1.1.2.3.2.4
@@ -246,7 +246,7 @@
}
tr.overdue td {
- background-color: #FEA7A7;
+ background-color: #FFDDDD;
}
input.cancel {
@@ -464,8 +464,8 @@
}
#main {
- background-color: transparent;
- border-top: 1px solid #EEEEEE;
+ background-color: transparent;/*
+ border-top: 1px solid #EEEEEE;*/
}
#masthead {
@@ -482,18 +482,18 @@
color: #000066;
}
-#members ul li a:link, #members ul li a:visited, #members ul li a:hover,
#members ul li a:active, #members span.members {
+#members ul li a:link, #members ul li a:visited, #members span.members {
background-image : url(../images/navBarBg.gif);
background-repeat: repeat-x;
border-left: 1px solid #9999CC;
color: #006699;
}
-#members ul li:last-child {
+#members ul li:last-child a {
border-right : 1px solid #9999CC;
}
-#members ul li a:hover {
+#members ul li a:hover, #members ul li a:active {
background-image : url(../images/navBarBgHover.gif);
background-repeat: repeat-x;
}
@@ -569,6 +569,10 @@
border: 1px dashed #666666;*/
}
+#sidebar .content-block {
+ background-color : #EEEEEE;
+}
+
#sidebar fieldset {
background-color: #F9F9FF;
}
@@ -580,7 +584,6 @@
#sidebar .submit {
background-color: #6BA037;
color: #FFFFFF;
- font-size: 1.2em;
}
#sidebar h3 {
@@ -637,3 +640,32 @@
border-left : 1px solid #DDDDDD;
border-bottom : 1px solid #DDDDDD;
}
\ No newline at end of file
+
+#usermenu {
+ background-image : url(../images/usermenu-background.gif);
+ background-repeat: repeat-x;
+ background-color: #EEEEEB;
+ border-top: 1px solid #EEEEEE;
+ border-bottom: 1px solid #335599;
+ color: #000000;
+}
+
+#usermenu ul li a:link, #usermenu ul li a:visited {
+ background-image : url(../images/usermenu-background.gif);
+ background-repeat: repeat-x;
+ border-left: 1px solid #9999CC;
+ color: #006699;
+}
+
+#usermenu ul li:last-child a {
+ border-right : 1px solid #9999CC;
+}
+
+#usermenu ul li a:hover, #usermenu ul li a:active {
+ background-image : url(../images/usermenu-background-hover.gif);
+ background-repeat: repeat-x;
+}
+
+#usermenu a {
+ text-decoration: none;
+}
\ No newline at end of file
Index: includes/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.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- includes/opac-facets.inc 23 Aug 2006 16:41:07 -0000 1.1.2.5
+++ includes/opac-facets.inc 19 Sep 2006 13:13:21 -0000 1.1.2.6
@@ -1,5 +1,7 @@
-<!-- TMPL_UNLESS name="OpacNav" --><div id="nav"><!-- TMPL_IF
NAME="opacfacets" -->
-<!-- TMPL_IF NAME="facets_loop" --><h6>Refine Your Search</h6>
+<div id="nav">
+
+<!-- TMPL_IF NAME="opacfacets" -->
+<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>
@@ -11,5 +13,6 @@
<!-- /TMPL_IF -->
</ul></li>
<!-- /TMPL_LOOP -->
-</ul><!-- /TMPL_IF -->
-<!-- /TMPL_IF --></div><!-- /TMPL_UNLESS -->
\ No newline at end of file
+</ul>
+<!-- /TMPL_IF -->
+</div>
Index: includes/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.7
retrieving revision 1.1.2.4.2.8
diff -u -b -r1.1.2.4.2.7 -r1.1.2.4.2.8
--- includes/opac-layout.css 6 Sep 2006 14:28:24 -0000 1.1.2.4.2.7
+++ includes/opac-layout.css 19 Sep 2006 13:13:21 -0000 1.1.2.4.2.8
@@ -25,82 +25,54 @@
/* THREE COLUMNS */
-body#tricolumn #main
- {
+body#tricolumn #main_wrapper {
float: left;
- width: 55%;
- margin-left: 20%;
- }
-* html body#tricolumn #main
+ width: 100%;
+}
+
+body#tricolumn #main
{
- display: inline;
+ margin: 0 150px 0 175px;
}
+
body#tricolumn #nav
{
float: left;
- width: 20%;
- margin-left: -75%;
+ margin-left: -100%;
+ width: 175px;
}
body#tricolumn #sidebar
{
float: left;
- width: 25%;
+ margin-left: -150px;
+ width: 150px;
}
-/* TWO COLUMNS RIGHT NAVIGATION */
+/* TWO COLUMNS LEFT NAVIGATION */
-body#withnav #main
+body#withnav #main_wrapper
{
float: left;
- margin-left: 175px;
+ width: 100%;
}
-* html body#withnav #main
+body#withnav #main
{
- display: inline;
+ margin: 0 0 0 175px;
}
-#nav
+
+body#withnav #nav
{
float: left;
- width: 175px;
margin-left: -100%;
+ width: 175px;
}
+body#withnav #main .content-block {
+ padding-left : 10px;
+}
+
+/* END TWO COLUMNS RIGHT NAVIGATION */
-/* 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;
@@ -182,6 +154,7 @@
caption {
font-family: Arial, Geneva, Helvetica, sans-serif;
+ font-size : 1.3em;
font-weight: bold;
margin: 0;
padding: 5px 0 3px 0;
@@ -625,6 +598,14 @@
padding: 5px;
}
+#home {
+ text-align : center;
+}
+
+#home #searchform input.submit {
+ font-size : 1.3em;
+}
+
div#advanced-search p {
margin: .4em;
}
@@ -911,6 +892,14 @@
font-weight: bold;
}
+#sidebar .content-block {
+ margin : 0 10px 0 0;
+}
+
+form#auth h3 {
+ font-size : 1.1em;
+}
+
#footer {
clear: both;
padding: 10px;
@@ -997,7 +986,7 @@
#members ul li:last-child {
}
-#members ul li a:hover {\
+#members ul li a:hover {
}
#members ul {
@@ -1101,6 +1090,7 @@
font-family: Verdana, Arial, Geneva, Helvetica, sans-serif;
font-weight: bold;
padding: 2px;
+ font-size: 1em;
}
#sidebar h3 {
@@ -1170,3 +1160,33 @@
div#holdings td, div#holdings th {
padding : 5px;
}
\ No newline at end of file
+
+#usermenu {
+ font-size: .9em;
+ font-weight: bold;
+ margin-top : -1.1em;
+ margin-bottom : 1em;
+ padding: 4px 0 4px 0;
+}
+
+#usermenu li {
+ display: inline;
+ list-style: none;
+ margin: 0;
+}
+
+#usermenu ul li a:link, #usermenu ul li a:visited, #usermenu ul li a:hover,
#usermenu ul li a:active, #usermenu span.members {
+ padding : 4px;
+}
+
+#usermenu ul li:last-child {
+}
+
+#usermenu ul li a:hover {
+}
+
+#usermenu ul {
+ margin: 0;
+ padding: 0;
+ text-align: right;
+}
\ No newline at end of file
Index: includes/usermenu.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/usermenu.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- includes/usermenu.inc 23 Aug 2006 16:59:24 -0000 1.1.2.1
+++ includes/usermenu.inc 19 Sep 2006 13:13:21 -0000 1.1.2.2
@@ -1,2 +1 @@
-<div id="usermenu"> <a href="/cgi-bin/koha/opac-account.pl">my fines</a> |
- <a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a>
<!-- TMPL_IF name="OpacPasswordChange" --> | <a
href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- /TMPL_IF
--><!-- TMPL_IF NAME="opacreadinghistory" -->| <a
href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF
--> <!-- TMPL_IF name="suggestion" -->| <a
href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF
--></div>
\ No newline at end of file
+<div id="usermenu"><ul><li><a href="/cgi-bin/koha/opac-account.pl">your
fines</a></li><li><a href="/cgi-bin/koha/opac-userdetails.pl">your personal
details</a></li><!-- TMPL_IF name="OpacPasswordChange" --><li><a
href="/cgi-bin/koha/opac-passwd.pl">change your password</a></li><!-- /TMPL_IF
--><!-- TMPL_IF NAME="opacreadinghistory" --><li><a
href="/cgi-bin/koha/opac-readingrecord.pl">your reading history</a></li><!--
/TMPL_IF --><li><!-- TMPL_IF name="suggestion" --><a
href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a></li><!--
/TMPL_IF --></ul></div>
\ No newline at end of file
Index: opac-account.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-account.tmpl,v
retrieving revision 1.1.2.2.2.2
retrieving revision 1.1.2.2.2.3
diff -u -b -r1.1.2.2.2.2 -r1.1.2.2.2.3
--- opac-account.tmpl 6 Sep 2006 14:42:07 -0000 1.1.2.2.2.2
+++ opac-account.tmpl 19 Sep 2006 13:13:21 -0000 1.1.2.2.2.3
@@ -2,13 +2,14 @@
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
<!-- TMPL_INCLUDE name="masthead.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
<!--CONTENT-->
<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
+<div id="main_wrapper">
<div id="main">
<div class="content-block">
-<!-- TMPL_INCLUDE name="usermenu.inc" -->
<h1>Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR
NAME="surname" --></h1>
<!-- /TMPL_LOOP -->
@@ -44,6 +45,6 @@
<!-- TMPL_ELSE --><h4>You have no Fines or Charges</h4><!-- /TMPL_IF -->
</div>
</div>
-
+</div>
<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
Index: opac-advsearch.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-advsearch.tmpl,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-advsearch.tmpl 6 Sep 2006 14:43:47 -0000 1.1.2.4
+++ opac-advsearch.tmpl 19 Sep 2006 13:13:21 -0000 1.1.2.5
@@ -59,7 +59,7 @@
<option value="<!-- TMPL_VAR NAME="value" -->" <!--
TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!--
/TMPL_IF -->><!-- TMPL_VAR NAME="label" --></option>
<!-- /TMPL_LOOP -->
</select>
- <input size="30" name="qf" title="Enter search terms" value=""/>
+ <input size="30" name="q" title="Enter search terms" value=""/>
<!-- TMPL_IF NAME="expanded_options" -->
<!-- TMPL_IF NAME="scan_index" --><!-- TMPL_VAR
NAME="scan_index" --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="add_field" --><a href="" title="Add another
field">[+]</a><!-- /TMPL_IF -->
Index: opac-basket.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-basket.tmpl,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-basket.tmpl 6 Sep 2006 14:42:07 -0000 1.1.2.3.2.1
+++ opac-basket.tmpl 19 Sep 2006 13:13:21 -0000 1.1.2.3.2.2
@@ -3,7 +3,7 @@
<div id="window">
<!-- TMPL_UNLESS NAME="print_basket" --><h3>Your Book Bag</h3>
<!-- MENUS -->
- <div class="menu">
+ <div>
<!-- TMPL_IF NAME="verbose" -->
<form class="inline" action="opac-basket.pl" method="get"><input type="submit"
class="icon brief" onclick="showLess(); return false;" value="Brief Display"
/></form>
<!-- TMPL_ELSE -->
Index: opac-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1.2.19.2.8
retrieving revision 1.1.2.19.2.9
diff -u -b -r1.1.2.19.2.8 -r1.1.2.19.2.9
--- opac-detail.tmpl 6 Sep 2006 14:46:05 -0000 1.1.2.19.2.8
+++ opac-detail.tmpl 19 Sep 2006 13:13:21 -0000 1.1.2.19.2.9
@@ -2,7 +2,7 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
<!--TMPL_INCLUDE NAME="masthead.inc" -->
-
+<div id="main_wrapper">
<div id="main">
<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
<div class="detail-sidebar">
@@ -23,7 +23,7 @@
</div>
<div id="item-details">
-<!-- TMPL_IF NAME="AmazonContent" --><!-- TMPL_IF NAME="amazonisbn" --><a
href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="amazonisbn"
-->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0"
src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="amazonisbn"
-->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image"
/></a><!-- TMPL_ELSE --><img border="0"
src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif";
alt="Book Cover Image" /><!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="AmazonContent" --><!-- TMPL_IF NAME="amazonisbn" --><a
href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="amazonisbn"
-->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0"
src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="amazonisbn"
-->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image"
/></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
<h2><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> <span
class="subtitle"><!-- TMPL_VAR NAME="subtitle" --></span><!-- /TMPL_IF --></h2>
<!-- TMPL_IF NAME="author" --><h3 class="author">By <a href="/search?q=au:<!--
TMPL_VAR NAME="author" -->"><!-- TMPL_VAR NAME="author" --></a></h3><!--
/TMPL_IF -->
@@ -44,7 +44,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="MARCSUBJCTS" -->
- <p><strong>Related Subject(s):</strong> <!-- TMPL_LOOP
NAME="MARCSUBJCTS" -->
+ <p><strong>Subject(s):</strong> <!-- TMPL_LOOP
NAME="MARCSUBJCTS" -->
<!-- TMPL_LOOP
NAME="MARCSUBJECT_SUBFIELDS_LOOP" -->
<!-- TMPL_VAR
NAME="separator" --><a title="$<!-- TMPL_VAR NAME="code" --> <!-- TMPL_VAR
NAME="value" -->" href="/search?q=<!-- TMPL_LOOP NAME="link_loop" --><!--
TMPL_VAR NAME="operator" -->su:<!-- TMPL_VAR NAME="link" --> <!-- /TMPL_LOOP
-->"><!-- TMPL_VAR NAME="value" --></a>
<!-- /TMPL_LOOP --> |
@@ -58,7 +58,7 @@
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</div>
-
+<br class="clear" />
<ul class="link-tabs">
<li id="holdings_tab" class="on"><a
href="/cgi-bin/koha/opac-detail.pl?display=holdings"
onclick="changeView('holdings'); return false;">Holdings</a> </li>
@@ -213,7 +213,7 @@
</div> <!-- itemReviews -->
<!-- /TMPL_IF-->
-
+</div>
</div>
<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: opac-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl,v
retrieving revision 1.3.2.14.2.4
retrieving revision 1.3.2.14.2.5
diff -u -b -r1.3.2.14.2.4 -r1.3.2.14.2.5
--- opac-main.tmpl 6 Sep 2006 14:47:38 -0000 1.3.2.14.2.4
+++ opac-main.tmpl 19 Sep 2006 13:13:21 -0000 1.3.2.14.2.5
@@ -3,36 +3,22 @@
<body id="tricolumn">
<!--TMPL_INCLUDE NAME="masthead.inc" -->
+<div id="main_wrapper">
<div id="main">
-
-<div class="content-block">
-
-<!-- Put Shelf Browser Here -->
-
-</div>
-
<div class="content-block">
-<!-- Put Virtual Shelves Here -->
-
</div>
-
-<div class="content-block">
-
-<!-- Put Interesting Things here -->
-
-
</div>
</div>
<div id="sidebar">
<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" -->
-<!-- TMPL_ELSE --><form action="/cgi-bin/koha/opac-user.pl" method="post"
name="auth" id="auth">
+<!-- TMPL_ELSE --><div class="content-block"><form
action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
<h3>Log in to Check Your Account</h3>
<p><label for="userid">Card Number:</label><!-- Hide from NPL --><input
type="text" id="userid" size="10" name="userid" /><!-- /Hide from NPL --> <!--
Display for NPL // <input type="text" id="userid" size="10" name="userid"
onblur="ValidateCode();" /> //Display for NPL --></p>
<p><label for="password">Password:</label> <input type="password"
id="password" size="10" name="password" /></p>
<p><input type="submit" value="Log In" class="submit" /></p>
-</form>
+</form></div>
<!-- /TMPL_IF --><!-- /TMPL_IF -->
</div>
Index: opac-passwd.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-passwd.tmpl,v
retrieving revision 1.1.2.3.2.3
retrieving revision 1.1.2.3.2.4
diff -u -b -r1.1.2.3.2.3 -r1.1.2.3.2.4
--- opac-passwd.tmpl 6 Sep 2006 14:42:07 -0000 1.1.2.3.2.3
+++ opac-passwd.tmpl 19 Sep 2006 13:13:21 -0000 1.1.2.3.2.4
@@ -2,11 +2,11 @@
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
<!-- TMPL_INCLUDE name="masthead.inc" -->
-
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+<div id="main_wrapper">
<div id="main">
<div class="content-block">
-<!-- TMPL_INCLUDE name="usermenu.inc" -->
<!-- TMPL_IF NAME= "Error_messages" -->
<h3>There was a problem with your submission</h3>
@@ -44,6 +44,6 @@
</div>
</div>
-
+</div>
<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
Index: opac-readingrecord.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-readingrecord.tmpl,v
retrieving revision 1.1.2.3.2.3
retrieving revision 1.1.2.3.2.4
diff -u -b -r1.1.2.3.2.3 -r1.1.2.3.2.4
--- opac-readingrecord.tmpl 6 Sep 2006 14:42:07 -0000 1.1.2.3.2.3
+++ opac-readingrecord.tmpl 19 Sep 2006 13:13:21 -0000 1.1.2.3.2.4
@@ -2,11 +2,11 @@
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
<!-- TMPL_INCLUDE name="masthead.inc" -->
-
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+<div id="main_wrapper">
<div id="main">
<div class="content-block">
-<!-- TMPL_INCLUDE name="usermenu.inc" -->
<h3>Reading History of <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR
NAME="surname" --></h3>
@@ -36,6 +36,6 @@
<!-- /TMPL_UNLESS -->
</div>
</div>
-
+</div>
<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
Index: opac-results.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-results.tmpl,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -b -r1.1.2.14 -r1.1.2.15
--- opac-results.tmpl 6 Sep 2006 14:49:16 -0000 1.1.2.14
+++ opac-results.tmpl 19 Sep 2006 13:13:21 -0000 1.1.2.15
@@ -2,6 +2,7 @@
<!-- TMPL_INCLUDE NAME="doc-head-close-results.inc" -->
<body id="withnav">
<!--TMPL_INCLUDE NAME="masthead.inc" -->
+<div id="main_wrapper">
<div id="main" class="searchresults">
<div class="content-block">
<!-- TMPL_IF NAME="koha_spsuggest" --><div style="font-size: 12px;">Did you
mean: <ul style="list-style: none;"><!-- TMPL_LOOP NAME="SPELL_SUGGEST" -->
<li><a href="/search?q=<!-- TMPL_VAR NAME="spsuggestion" -->"><!-- TMPL_VAR
NAME="spsuggestion" --></a></li><!-- /TMPL_LOOP --></ul></div><!-- /TMPL_IF -->
@@ -80,7 +81,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="sort_by_loop" -->
- <p><select id="sort_by" name="sort_by"
onChange="document.mainform.submit();">
+ <p><select id="sort_by" name="sort_by"
onChange="document.myform.submit();">
<option value="">Field-weighted, Relevance Ranked</option>
<!-- TMPL_LOOP NAME="sort_by_loop" -->
<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF
NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF
-->><!-- TMPL_VAR NAME="label" --></option>
@@ -126,14 +127,14 @@
</form>
<!-- /TMPL_IF -->
-<div class="pages">
+<!-- TMPL_IF NAME="PAGE_NUMBERS" --><div class="pages">
<!-- Row of numbers corresponding to search result pages -->
<!-- TMPL_IF NAME="previous_page_offset" --><a class="nav"
href="/search?do=search&q=<!-- TMPL_VAR NAME="searchdesc"
-->&offset=<!-- TMPL_VAR NAME="previous_page_offset" -->"><<
Previous</a><!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="PAGE_NUMBERS" --><!-- TMPL_IF NAME="highlight"
--><span class="current"><!-- TMPL_VAR NAME="pg" --></span><!-- TMPL_ELSE -->
<a class="nav" href="/search?do=search&q=<!-- TMPL_VAR
NAME="searchdesc" -->&offset=<!-- TMPL_VAR NAME="offset" --><!-- TMPL_IF
NAME="sort_by" -->&sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF
-->"><!-- TMPL_VAR NAME="pg" --></a><!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF NAME="next_page_offset" --><a class="nav"
href="/search?do=search&q=<!-- TMPL_VAR NAME="searchdesc"
-->&offset=<!-- TMPL_VAR NAME="next_page_offset" -->">Next >></a><!--
/TMPL_IF -->
-</div>
+</div><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="outer_sup_results_loop" -->
<h3><!-- TMPL_LOOP NAME="outer_sup_results_loop" --></h3>
@@ -152,10 +153,10 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF name="suggestion" -->
-<div class="note">Not finding what you're looking for?<br /> Make a <a
href="opac-suggestions.pl?op=add">purchase suggestion</a></div>
+<div class="note">Not finding what you're looking for?<br /> Make a <a
href="/cgi-bin/koha/opac-suggestions.pl?op=add">purchase suggestion</a></div>
<!-- /TMPL_IF -->
</div>
</div>
-<!-- TMPL_INCLUDE NAME="navigation.inc" -->
+</div>
<!-- TMPL_INCLUDE NAME="opac-facets.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: opac-shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl,v
retrieving revision 1.1.2.2.2.2
retrieving revision 1.1.2.2.2.3
diff -u -b -r1.1.2.2.2.2 -r1.1.2.2.2.3
--- opac-shelves.tmpl 6 Sep 2006 14:42:07 -0000 1.1.2.2.2.2
+++ opac-shelves.tmpl 19 Sep 2006 13:13:21 -0000 1.1.2.2.2.3
@@ -2,6 +2,7 @@
<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
<!--TMPL_INCLUDE NAME="masthead.inc" -->
+<div id="main_wrapper">
<div id="main">
<div class="content-block">
<!-- TMPL_IF Name="viewshelf" -->
@@ -17,8 +18,8 @@
<td><input type="checkbox"
name="REM-<!-- TMPL_VAR Name="itemnumber" -->" /><input type="hidden"
name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
<input type="hidden" name="modifyshelfcontents" value="1" />
<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR
Name="shelfnumber" -->" /></td>
- <td><img src="<!-- TMPL_VAR
NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!--
TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></td>
- <td><a href="opac-detail.pl?bib=<!--
TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></td>
+ <td><img src="<!-- TMPL_VAR
NAME="themelang" -->/images/<!-- TMPL_VAR NAME="ccode" -->.gif" alt="<!--
TMPL_VAR NAME="ccode" -->" title="<!-- TMPL_VAR NAME="ccode" -->" /></td>
+ <td><!-- TMPL_IF NAME="AmazonContent"
--><a class="p1" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->"><img src="<!-- TMPL_IF NAME="isbn"
-->http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn"
-->.01.TZZZZZZZ.jpg<!-- TMPL_ELSE
-->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!--
/TMPL_IF -->" alt="image" class="thumbnail" /></a><!-- /TMPL_IF --><a
href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR
Name="title" --></a></td>
<td><!-- TMPL_VAR Name="author" --></td>
<td><!-- TMPL_VAR NAME="classification"
--></td>
</tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
@@ -131,6 +132,7 @@
<br clear="both" />
</div>
</div>
+</div>
<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
Index: opac-suggestions.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-suggestions.tmpl,v
retrieving revision 1.1.2.5.2.2
retrieving revision 1.1.2.5.2.3
diff -u -b -r1.1.2.5.2.2 -r1.1.2.5.2.3
--- opac-suggestions.tmpl 6 Sep 2006 14:42:07 -0000 1.1.2.5.2.2
+++ opac-suggestions.tmpl 19 Sep 2006 13:13:21 -0000 1.1.2.5.2.3
@@ -4,8 +4,9 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
<!--TMPL_INCLUDE NAME="masthead.inc" -->
-
+<div id="main_wrapper">
<div id="main">
+<div class="content-block">
<!-- TMPL_IF name="op_add" -->
<h1>Enter a new purchase suggestion</h1>
<div class="details">
@@ -141,6 +142,7 @@
<p>Note : if you're viewing purchase suggestions submitted by anybody,
the results will contain only <em>new</em> purchase suggestions. Suggestions
being processed by a librarian will not be shown.</p>
<!-- /TMPL_IF -->
</div>
-
+</div>
+</div>
<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: opac-user.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1.2.11.2.5
retrieving revision 1.1.2.11.2.6
diff -u -b -r1.1.2.11.2.5 -r1.1.2.11.2.6
--- opac-user.tmpl 6 Sep 2006 14:42:07 -0000 1.1.2.11.2.5
+++ opac-user.tmpl 19 Sep 2006 13:13:21 -0000 1.1.2.11.2.6
@@ -2,12 +2,12 @@
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
<!-- TMPL_INCLUDE name="masthead.inc" -->
-
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+<div id="main_wrapper">
<div id="main">
<div class="content-block">
<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
-<h3>Hello, <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
<span class="print">(<a href="/cgi-bin/koha/opac-logout.pl">Click here</a> if
you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" -->
<!-- TMPL_VAR NAME="surname" -->)</span></h3>
-<!-- TMPL_INCLUDE name="usermenu.inc" -->
+<h1>Hello, <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
<span class="print">(<a href="/cgi-bin/koha/opac-logout.pl">Click here</a> if
you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" -->
<!-- TMPL_VAR NAME="surname" -->)</span></h1>
<!-- TMPL_IF name="textmessaging"-->
<div class="error"><h3>Message from the library</h3>
<p><!-- TMPL_VAR name="textmessaging" --></p></div>
@@ -26,12 +26,12 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="amountoverzero" -->
-<div class="table"><table>
+<table>
<caption>Fines and Charges</caption>
<tr><th colspan="2">Amount</th></tr>
<tr><td>You currently owe fines and charges amounting to:</td>
<td><a href="/cgi-bin/koha/opac-account.pl"><!-- TMPL_VAR
NAME="amountoutstanding" --></a></td></tr>
-</table></div>
+</table>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME"amountlessthanzero" -->
@@ -54,7 +54,7 @@
</tr>
<!-- TMPL_LOOP NAME="WAITING" -->
<!-- TMPL_IF NAME="atdestination" --><tr>
- <td><img src="<!-- TMPL_VAR NAME="themelang"
-->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR
NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></td>
+ <td><img src="<!-- TMPL_VAR NAME="themelang"
-->/images/<!-- TMPL_VAR NAME="ccode" -->.gif" alt="<!-- TMPL_VAR NAME="ccode"
-->" title="<!-- TMPL_VAR NAME="ccode" -->" /></td>
<td>
<a href="opac-detail.pl?bib=<!--
TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span
class="item-details">
<!-- TMPL_VAR NAME="author" --></span></td><td><!-- TMPL_VAR
NAME="reservedate" --></td><td><!-- TMPL_IF NAME="atdestination" -->
@@ -70,7 +70,7 @@
<!-- TMPL_IF NAME="issues_count" -->
-<div class="table"><table>
+<table>
<caption>Issues <span class="count">(<!-- TMPL_VAR NAME="issues_count" -->
total)</span></caption>
<!-- ISSUES TABLE ROWS --><tr>
<th colspan="2">Title</th>
@@ -83,8 +83,8 @@
<!-- TMPL_LOOP NAME="ISSUES" -->
<!-- TMPL_IF NAME="overdue" --><tr class="overdue"><!-- TMPL_ELSE --><tr><!--
/TMPL_IF -->
-<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR
NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!--
TMPL_VAR NAME="description" -->" /></td>
-<td><!-- Display for NPL // <!-- TMPL_IF NAME="isbn" --><a
href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber"
ESCAPE="URL" -->"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR
name="isbn" -->.01.THUMBZZZ.jpg" alt="Book Cover Image" class="thumbnail"
/></a><!-- /TMPL_IF --> //Display for NPL --><a
href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber"
-->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
+<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR
NAME="ccode" -->.gif" alt="<!-- TMPL_VAR NAME="ccode" -->" title="<!-- TMPL_VAR
NAME="ccode" -->" /></td>
+<td><!-- TMPL_IF NAME="AmazonContent" --><!-- TMPL_IF NAME="isbn" --><a
href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber"
ESCAPE="URL" -->"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR
name="isbn" -->.01.THUMBZZZ.jpg" alt="Book Cover Image" class="thumbnail"
/></a><!-- /TMPL_IF --><!-- /TMPL_IF --><a
href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber"
-->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
<!-- TMPL_VAR NAME="author" --></span></td>
<td><!-- TMPL_VAR NAME="classification" --></td>
<!-- TMPL_IF NAME="overdue" --><td class="overdue"><!-- TMPL_VAR
NAME="date_due" --></td><!-- TMPL_ELSE --><td><!-- TMPL_VAR NAME="date_due"
--></td><!-- /TMPL_IF -->
@@ -98,7 +98,7 @@
<td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF
--></td>
</tr>
<!-- /TMPL_LOOP -->
-</table></div>
+</table>
<!-- TMPL_ELSE -->
<table>
@@ -113,14 +113,13 @@
<caption>Reserves <span class="count">(<!-- TMPL_VAR NAME="reserves_count" -->
total)</span></caption>
<!-- RESERVES TABLE ROWS -->
<tr>
-<th colspan="2">Title</th>
+<th>Title</th>
<th>Placed On</th>
<th>Pick Up Location</th>
<th>Status</th>
</tr>
<!-- TMPL_LOOP NAME="RESERVES" -->
<tr>
-<td><!-- TMPL_IF NAME="itemtype" --><img src="<!-- TMPL_VAR NAME="themelang"
-->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR
NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /><!-- TMPL_ELSE
--> <!-- /TMPL_IF --></td>
<td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span
class="item-details">
<!-- TMPL_VAR NAME="author" --></span></td>
<td><!-- TMPL_VAR NAME="reservedate" --></td>
@@ -136,6 +135,6 @@
<!-- /TMPL_IF -->
</div>
</div>
-
+</div>
<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
Index: opac-userdetails.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-userdetails.tmpl,v
retrieving revision 1.1.2.1.2.3
retrieving revision 1.1.2.1.2.4
diff -u -b -r1.1.2.1.2.3 -r1.1.2.1.2.4
--- opac-userdetails.tmpl 6 Sep 2006 14:42:07 -0000 1.1.2.1.2.3
+++ opac-userdetails.tmpl 19 Sep 2006 13:13:21 -0000 1.1.2.1.2.4
@@ -2,13 +2,14 @@
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
<!-- TMPL_INCLUDE name="masthead.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
<!--CONTENT-->
+<div id="main_wrapper">
<div id="main">
<div class="content-block">
-<!-- TMPL_INCLUDE name="usermenu.inc" -->
<h2>Personal Details: <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR
NAME="surname" --></h2>
@@ -84,6 +85,6 @@
</form>
</div>
</div>
-
+</div>
<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
Index: opac-userupdate.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-userupdate.tmpl,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -b -r1.1.4.2 -r1.1.4.3
--- opac-userupdate.tmpl 6 Sep 2006 14:42:07 -0000 1.1.4.2
+++ opac-userupdate.tmpl 19 Sep 2006 13:13:21 -0000 1.1.4.3
@@ -2,9 +2,10 @@
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
<!-- TMPL_INCLUDE name="masthead.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
<!--CONTENT-->
-
+<div id="main_wrapper">
<div id="main">
<div class="content-block">
<!-- TMPL_LOOP name="BORROWER_INFO" -->
@@ -37,5 +38,6 @@
<!-- /TMPL_LOOP -->
</div>
</div>
+</div>
<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
- [Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en includes/doc-he... [dev_week],
Owen Leonard <=