[Koha-cvs] koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmp... [dev_week]
Joshua Ferraro
jmf at kados.org
Tue Jul 11 16:22:53 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Joshua Ferraro <kados> 06/07/11 14:22:53
Modified files:
koha-tmpl/opac-tmpl/css/en: opac-detail.tmpl
opac-dictionary.tmpl opac-main.tmpl
opac-search.tmpl
opac-searchresults.tmpl
koha-tmpl/opac-tmpl/css/en/includes: opac.css
Log message:
sync with rel_2_2
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.15.2.20&r2=1.15.2.20.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/css/en/opac-dictionary.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4&r2=1.1.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.16.2.13&r2=1.16.2.13.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.11.2.12&r2=1.11.2.12.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.20.2.12&r2=1.20.2.12.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css?cvsroot=koha&only_with_tag=dev_week&r1=1.17.2.20&r2=1.17.2.20.2.1
Patches:
Index: opac-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15.2.20
retrieving revision 1.15.2.20.2.1
diff -u -b -r1.15.2.20 -r1.15.2.20.2.1
--- opac-detail.tmpl 7 Apr 2006 11:43:33 -0000 1.15.2.20
+++ opac-detail.tmpl 11 Jul 2006 14:22:53 -0000 1.15.2.20.2.1
@@ -47,7 +47,7 @@
<p>
<!-- TMPL_IF name="publishercode" --><label><b>Published by :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
</p>
- <!-- TMPL_IF name="publicationyear" --><p><label><b>in </b></label><!-- TMPL_VAR NAME="publicationyear" --></p><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="publicationyear" --><p><label><b>in: </b></label><!-- TMPL_VAR NAME="publicationyear" --></p><!-- /TMPL_IF -->
<p>
<label> </label><!-- TMPL_IF name="pages" --> <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" -->
@@ -106,7 +106,7 @@
<!-- /TMPL_IF -->
</div>
<!-- TMPL_IF NAME="AmazonContent" -->
- <!-- TMPL_IF NAME="isbn" -->
+ <!-- TMPL_IF NAME="amazonisbn" -->
<div id="bloc20">
<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" />
Index: opac-dictionary.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-dictionary.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.4.2.1
diff -u -b -r1.1.2.4 -r1.1.2.4.2.1
--- opac-dictionary.tmpl 7 Apr 2006 11:44:11 -0000 1.1.2.4
+++ opac-dictionary.tmpl 11 Jul 2006 14:22:53 -0000 1.1.2.4.2.1
@@ -151,6 +151,9 @@
<!-- /TMPL_IF -->
<script language="JavaScript" type="text/javascript">
function SelectEntry(myentry, myindex, wclose){
+ re = /<.*?>/
+ myentry=myentry.replace(/<.*?>/g,"");
+ myentry=myentry.replace(/<\/.*?>/,"");
if (opener.document.f.value[myindex].value!=""){
opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
} else {
Index: opac-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl,v
retrieving revision 1.16.2.13
retrieving revision 1.16.2.13.2.1
diff -u -b -r1.16.2.13 -r1.16.2.13.2.1
--- opac-main.tmpl 19 Apr 2006 18:36:24 -0000 1.16.2.13
+++ opac-main.tmpl 11 Jul 2006 14:22:53 -0000 1.16.2.13.2.1
@@ -10,6 +10,20 @@
<!-- /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 -->
<title><!--TMPL_VAR name="LibraryName"--></title>
+ <script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
+ <script language="JavaScript" type="text/javascript">
+ function _(s) { return s } // dummy function for gettext
+ //
+ </script>
+ <script type="text/javascript" language="javascript">
+ var MSG_BASKET_EMPTY = _("Basket is empty");
+ var MSG_RECORD_IN_BASKET = _("This biblio is already in the basket");
+ var MSG_RECORD_ADDED = _("Biblio added to the basket");
+ var MSG_NRECORDS_ADDED = _(" Biblio(s) added");
+ var MSG_NRECORDS_IN_BASKET = _("already in the basket");
+ var MSG_NO_RECORD_SELECTED = _("No biblio selected");
+ var MSG_NO_RECORD_ADDED = _("No biblio added");
+ </script>
</head>
<body>
@@ -43,7 +57,6 @@
<form action="/cgi-bin/koha/opac-search.pl">
<p>
<select name="value">
- <option value="">Any item type</option>
<!-- TMPL_LOOP name="itemtypeloop" -->
<option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="description" -->
</option>
Index: opac-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl,v
retrieving revision 1.11.2.12
retrieving revision 1.11.2.12.2.1
diff -u -b -r1.11.2.12 -r1.11.2.12.2.1
--- opac-search.tmpl 7 Apr 2006 11:45:12 -0000 1.11.2.12
+++ opac-search.tmpl 11 Jul 2006 14:22:53 -0000 1.11.2.12.2.1
@@ -181,8 +181,8 @@
<h3>Partial search</h3>
<p>A search is done on every words you enter. Empty words are ignored. If you enter, for example "the two towers" in the title, the result list will contain all the books containing two AND tower in the title. The "the" will be discarded.</p>
<p>If you want to enter a partial word, add a * or a % at the end of the word. For example "two tower*" will retrieve "the two towers", "two white towers", "a tower and two cities"</p>
- <h3>Dictionnary search</h3>
- <p>if you clic on ... on the right of title/author/subject, you can search existing values in the library.</p>
+ <h3>Dictionary search</h3>
+ <p>if you click on ... on the right of title/author/subject, you can search existing values in the library.</p>
</div>
</form>
</div>
Index: opac-searchresults.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.20.2.12
retrieving revision 1.20.2.12.2.1
diff -u -b -r1.20.2.12 -r1.20.2.12.2.1
--- opac-searchresults.tmpl 27 Feb 2006 13:54:50 -0000 1.20.2.12
+++ opac-searchresults.tmpl 11 Jul 2006 14:22:53 -0000 1.20.2.12.2.1
@@ -93,6 +93,7 @@
<!-- TMPL_LOOP name="CN" -->
<p>
<!-- TMPL_VAR name="holdingbranch" --> <!-- TMPL_VAR name="location" -->
+ <!-- TMPL_IF name="cnt" -->(<!-- TMPL_VAR name="cnt" -->)<!--/TMPL_IF-->
<!-- TMPL_IF name="date_due" -->
<i>(On Loan until <!-- TMPL_VAR name="date_due" -->)</i>
<!-- TMPL_ELSE -->
Index: includes/opac.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.20
retrieving revision 1.17.2.20.2.1
diff -u -b -r1.17.2.20 -r1.17.2.20.2.1
--- includes/opac.css 10 Apr 2006 21:46:37 -0000 1.17.2.20
+++ includes/opac.css 11 Jul 2006 14:22:53 -0000 1.17.2.20.2.1
@@ -416,8 +416,8 @@
div.tabs {
width:15px;
display:block;
- margin-top:70px;
- margin-left:40px;
+ margin-top:1px;
+ margin-left:200px;
}
div.tabs a {
@@ -432,11 +432,11 @@
div.tabbloc {
position:absolute;
display:block;
- top:140px;
- left:62px;
+ top:165px;
+ left:230px;
width:80%;
margin-right:0px;
- border: 1px solid black;
+ border: 0px solid black;
background-color:transparent;
}
More information about the Koha-cvs
mailing list