[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/masthe... [dev_week]
From: |
Owen Leonard |
Subject: |
[Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en includes/masthe... [dev_week] |
Date: |
Mon, 25 Sep 2006 20:00:43 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Owen Leonard <oleonard> 06/09/25 20:00:43
Modified files:
koha-tmpl/opac-tmpl/npl/en/includes: masthead.inc
opac-layout.css
koha-tmpl/opac-tmpl/npl/en: opac-MARCdetail.tmpl
opac-basket.tmpl
Log message:
- moving book bag link with changes to template and css
- correcting opac-MARCdetail layout framework
- Adding AmazonContent system pref and ccode variable to
opac-basekt.tmpl
- removing unused blank.css from intranet
CVSWeb URLs:
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.12&r2=1.1.2.8.2.13
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.10&r2=1.1.2.4.2.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.8.2.4&r2=1.1.2.8.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.2&r2=1.1.2.3.2.3
Patches:
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.12
retrieving revision 1.1.2.8.2.13
diff -u -b -r1.1.2.8.2.12 -r1.1.2.8.2.13
--- includes/masthead.inc 19 Sep 2006 20:39:08 -0000 1.1.2.8.2.12
+++ includes/masthead.inc 25 Sep 2006 20:00:42 -0000 1.1.2.8.2.13
@@ -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="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="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="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><!--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="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>
@@ -27,13 +27,13 @@
</form></div>
</div>
-<!-- TMPL_IF NAME="opaclanguagesdisplay" --><div id="languages">
+<div id="corner"><!-- TMPL_IF NAME="opacbookbag" --><a class="cart"
href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;"
title="A "shopping cart" for your selections">Cart<span
id="basket"><script language="javascript"
type="text/javascript">if(basketcount){ document.write(basketcount)
};</script></span></a><!-- /TMPL_IF --><!-- TMPL_IF NAME="opaclanguagesdisplay"
--><div id="languages">
<ul>
<!-- 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 -->
+ </ul></div><!-- /TMPL_IF --></div>
<div id="breadcrumbs">
-<!-- TMPL_IF NAME="searchdesc" --><p><!-- TMPL_IF name="total"
--><strong>“<!-- TMPL_VAR NAME="searchdesc" -->”</strong> returned
<!-- TMPL_VAR NAME="total" --> results. Limit to <a href="/search?q=<!--
TMPL_VAR NAME="searchdesc" -->&limit=available">currently available
items.</a><!-- 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_IF NAME="searchdesc" --><p><!-- TMPL_IF name="total"
--><strong>“<!-- TMPL_VAR NAME="searchdesc" --><!-- TMPL_IF
NAME="available" --><i> and available <a href="/search?q=<!-- TMPL_VAR
NAME="searchdesc" -->">X</a></i><!-- /TMPL_IF -->” </strong>returned <!--
TMPL_VAR NAME="total" --> results. <!-- TMPL_IF NAME="available" --><!--
TMPL_ELSE -->Limit to <a href="/search?q=<!-- TMPL_VAR NAME="searchdesc"
-->&limit=available">currently available items.</a><!-- /TMPL_IF --><!--
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" -->
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.10
retrieving revision 1.1.2.4.2.11
diff -u -b -r1.1.2.4.2.10 -r1.1.2.4.2.11
--- includes/opac-layout.css 21 Sep 2006 20:04:27 -0000 1.1.2.4.2.10
+++ includes/opac-layout.css 25 Sep 2006 20:00:42 -0000 1.1.2.4.2.11
@@ -907,13 +907,26 @@
text-align: center;
}
-#languages {
+#corner {
position: absolute;
top: 10px;
right: 5px;
}
+#corner a.cart {
+ background-image : url(../images/cart-small.gif);
+ background-position: left;
+ background-repeat : no-repeat;
+ padding: 0 15px;
+ text-decoration: none;
+}
+
+#languages {
+ display: inline;
+}
+
#languages ul {
+ display : inline;
list-style: none;
margin: 0;
padding : 0;
Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl,v
retrieving revision 1.1.2.8.2.4
retrieving revision 1.1.2.8.2.5
diff -u -b -r1.1.2.8.2.4 -r1.1.2.8.2.5
--- opac-MARCdetail.tmpl 6 Sep 2006 14:42:07 -0000 1.1.2.8.2.4
+++ opac-MARCdetail.tmpl 25 Sep 2006 20:00:42 -0000 1.1.2.8.2.5
@@ -4,6 +4,7 @@
<!--TMPL_INCLUDE NAME="masthead.inc" -->
+<div id="main_wrapper">
<div id="main">
<div class="content-block">
<h2>MARC View</h2>
@@ -13,7 +14,7 @@
<input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber"
-->" />
</form><!-- /TMPL_IF -->
<!-- /TMPL_UNLESS -->
-<!-- Hide from NPL --><form class="inline" action="opac-ISBDdetail.pl"
method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR
name="biblionumber" -->" /><input type="submit" class="icon isbd" value="ISBD"
/></form><!-- /Hide from NPL -->
+<!-- TMPL_IF name="ISBD" --><form class="inline" action="opac-ISBDdetail.pl"
method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR
name="biblionumber" -->" /><input type="submit" class="icon isbd" value="ISBD"
/></form><!-- /TMPL_IF -->
<form class="inline" action="opac-detail.pl" method="get"><input type="hidden"
name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit"
class="icon brief" value="Normal View" /></form>
@@ -265,7 +266,7 @@
</div>
</div>
</div>
-
+</div>
<!-- TMPL_INCLUDE name="navigation.inc" --><script language="JavaScript"
type="text/javascript">
function active(numlayer)
{
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.2
retrieving revision 1.1.2.3.2.3
diff -u -b -r1.1.2.3.2.2 -r1.1.2.3.2.3
--- opac-basket.tmpl 19 Sep 2006 13:13:21 -0000 1.1.2.3.2.2
+++ opac-basket.tmpl 25 Sep 2006 20:00:42 -0000 1.1.2.3.2.3
@@ -22,7 +22,7 @@
<!-- TMPL_IF NAME="verbose" -->
<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><div class="details">
-<h3><a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!--
TMPL_VAR name="biblionumber" -->)"><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF
name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --></a></h3>
+<!-- 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_ELSE --> <!--
/TMPL_IF --><h3><a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest"
-->',<!-- TMPL_VAR name="biblionumber" -->)"><!-- TMPL_VAR NAME="title" --><!--
TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF
--></a></h3>
<table>
<!-- TMPL_UNLESS NAME="print_basket" --><tr><td
colspan="2"><form><label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"><input
type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!--
TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->"
onclick="selRecord(value,checked)"> Select this
Item</label></form></td></tr><!-- /TMPL_UNLESS -->
@@ -71,7 +71,7 @@
<!-- TMPL_ELSE -->
<table><!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
<!-- BIBLIO RECORD TABLE -->
-<tr<!-- TMPL_IF NAME="even" --> class="highlight"<!-- /TMPL_IF
-->><td><form><!-- TMPL_UNLESS NAME="print_basket" --><label for="bib<!--
TMPL_VAR NAME="biblionumber" -->"><img src="<!-- TMPL_VAR NAME="themelang"
-->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR
NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->"
/></label><br><input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber"
-->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR
NAME="biblionumber" -->" onclick="selRecord(value,checked);"><!-- /TMPL_UNLESS
--></form></td><td><p><a href="#" onclick="openBiblio('<!-- TMPL_VAR
name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)"><!-- TMPL_VAR
NAME="title" --></a> <!-- TMPL_VAR NAME="author" -->
+<tr<!-- TMPL_IF NAME="even" --> class="highlight"<!-- /TMPL_IF
-->><td><form><!-- TMPL_UNLESS NAME="print_basket" --><label for="bib<!--
TMPL_VAR NAME="biblionumber" -->"><img src="<!-- TMPL_VAR NAME="themelang"
-->/images/<!-- TMPL_VAR NAME="ccode" -->.gif" alt="<!-- TMPL_VAR NAME="ccode"
-->" title="<!-- TMPL_VAR NAME="ccode" -->" /></label><br><input
type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!--
TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->"
onclick="selRecord(value,checked);"><!-- /TMPL_UNLESS --></form></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_ELSE --> <!--
/TMPL_IF --><p><a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest"
-->',<!-- TMPL_VAR name="biblionumber" -->)"><!-- TMPL_VAR NAME="title" --></a>
<!-- TMPL_VAR NAME="author" -->
<!-- TMPL_IF
name="publishercode" -->- <!-- TMPL_VAR name="publishercode" -->
<!-- TMPL_IF name="place" -->
<!-- TMPL_VAR name="place" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
<!-- TMPL_IF name="pages" --> -
<!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" --> <!-- TMPL_VAR
name="size" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
- [Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en includes/masthe... [dev_week],
Owen Leonard <=