[Koha-patches] [PATCH] Fix for Bug 4534, Box for SQL not visible in Create Report from SQL
Changed style of SQL box and altered markup for a somewhat
cleaner layout
---
.../en/modules/reports/guided_reports_start.tmpl | 11 +++
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
index 5b3c569..7a24859 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
@@ -17,7 +17,7 @@
!-- TMPL_INCLUDE NAME=doc-head-close.inc --
!-- TMPL_INCLUDE NAME=calendar.inc --
style type=text/css
-#sql { width: 90%; height: 9em; border: 1px solid #EEE; }
+#sql { width: 90%; height: 9em;}
/style
script type=text/javascript
//![CDATA[
@@ -69,7 +69,6 @@ $(document).ready(function(){
div id=bd
div id=yui-main
div class=yui-b
-div class=details
!-- TMPL_IF NAME=start --
h2Guided Reports/h2
@@ -477,9 +476,14 @@ NAME=name --!-- TMPL_VAR
NAME=name--/label/tdtd
option value=3 disabled=disabledMatrix/option
/select
/li
-lilabel for=sqlSQL: /labeltextarea id=sql name=sql cols=50
rows=10!-- TMPL_VAR NAME=sql DEFAULT= --/textarea/li
/ol
/fieldset
+fieldset class=rows
+legendSQL:/legend
+div style=margin:1em;
+textarea id=sql name=sql cols=50 rows=10!-- TMPL_VAR NAME=sql
DEFAULT= --/textarea
+/div
+/fieldset
fieldset class=actioninput type=hidden name=phase value=Save Report
/
input type=submit name=submit value=Save Report //fieldset
@@ -578,7 +582,6 @@ Sub report:select name=subreport
/div
/div
-/div
div class=yui-b
!-- TMPL_INCLUDE NAME=guided-reports-view.inc --
/div
--
1.7.0.4
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4529, columns on circ history all screwy
- fix formatting of last renew date
- Add table zebra striping
- Other markup structure changes
- Revised template assumes that issues.branchcode == checkout library and
displays
that value instead of issues.issuingbranch (which is always empty, see Bug
2806)
issues.branchcode seems to reflect the item's holding branch *after* having
been updated as part of the checkout transaction.
---
catalogue/issuehistory.pl |1 +
.../prog/en/modules/catalogue/issuehistory.tmpl| 44 ---
2 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/catalogue/issuehistory.pl b/catalogue/issuehistory.pl
index a6f12c3..0d774ea 100755
--- a/catalogue/issuehistory.pl
+++ b/catalogue/issuehistory.pl
@@ -67,6 +67,7 @@ foreach (@$issues){
$_-{date_due} = format_date($_-{date_due});
$_-{issuedate} = format_date($_-{issuedate});
$_-{returndate} = format_date($_-{returndate});
+ $_-{lastreneweddate} = format_date($_-{lastreneweddate});
}
$template-param(
total= scalar @$issues,
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
index 7ca6c61..6acb4a2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
@@ -15,29 +15,26 @@
div id=yui-main
div class=yui-b
-h1Checkout history for !-- TMPL_VAR NAME=title escape=html -- !--
TMPL_IF NAME=author --(!-- TMPL_VAR NAME=author --)!-- /TMPL_IF --
/h1
+h1Checkout history for !-- TMPL_VAR NAME=title escape=html --/h1
+!-- TMPL_IF NAME=author --h3by !-- TMPL_VAR NAME=author --/h3!--
/TMPL_IF --
div class=searchresults
!-- TMPL_IF NAME=issues --
-pbHas been checked out !-- TMPL_VAR NAME=total -- times/b/p
+h4Checked out !-- TMPL_VAR NAME=total -- times/h4
table
-tr
+theadtr
thPatron/th
thBarcode/th
-thLibrary/th
-thIssuing library/th
+thCheckout out from/th
thRenewed/th
thCheckout on/th
thDue date/th
thCheckin on/th
-/tr
+/tr/thead
+tbody
!-- TMPL_LOOP NAME=issues --
-tr
-td!-- TMPL_IF NAME=issuedate --
-!-- TMPL_VAR NAME=issuedate --
-!-- TMPL_ELSE --
-nbsp;
-!-- /TMPL_IF --/td
+!-- TMPL_UNLESS NAME=__odd__ --tr class=highlight!-- TMPL_ELSE
+--tr!-- /TMPL_UNLESS --
tda
href=/cgi-bin/koha/members/moremember.pl?borrowernumber=!-- TMPL_VAR
NAME=borrowernumber --!-- TMPL_VAR NAME=surname --!-- TMPL_IF
NAME=firstname --, !-- TMPL_VAR NAME=firstname --!-- /TMPL_IF
--/a/td
td!-- TMPL_IF NAME=barcode --
a
href=/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber --amp;itemnumber=!-- TMPL_VAR NAME=itemnumber
--!-- TMPL_VAR NAME=barcode --/a
@@ -49,20 +46,16 @@
!-- TMPL_ELSE --
nbsp;
!-- /TMPL_IF --/td
-td!-- TMPL_IF NAME=issuingbranch --
-!-- TMPL_VAR NAME=issuingbranch --
-!-- TMPL_ELSE --
-nbsp;
-!-- /TMPL_IF --/td
td!-- TMPL_IF NAME=renewals--
-YESbr /
-small
-!-- TMPL_IF NAME=lastreneweddate --
-last on: !-- TMPL_VAR NAME=lastreneweddate
--
+Yes!-- TMPL_IF NAME=lastreneweddate --,
smalllast on: !-- TMPL_VAR NAME=lastreneweddate --/small
!-- /TMPL_IF --
-/small
!-- TMPL_ELSE --
-NO
+No
+!-- /TMPL_IF --/td
+td!-- TMPL_IF NAME=issuedate --
+!-- TMPL_VAR NAME=issuedate --
+!-- TMPL_ELSE --
+nbsp;
!-- /TMPL_IF --/td
td!-- TMPL_IF NAME=date_due --
!-- TMPL_VAR NAME=date_due --
@@ -76,10 +69,11 @@
!-- /TMPL_IF --/td
/tr
!-- /TMPL_LOOP --
+/tbody
/table
!-- TMPL_ELSE --
-p
-b!-- TMPL_VAR NAME=title escape=html --(!-- TMPL_VAR
NAME=author --)/b span class=problemhas never been checked
out./span/p
+div class=dialog messagep
+b!-- TMPL_VAR NAME=title escape=html --!-- TMPL_IF
NAME=author --, by !-- TMPL_VAR NAME=author --!-- /TMPL_IF --/b has
never been checked out./p/div
!-- /TMPL_IF --
/div
--
1.7.0.4
[Koha-patches] [PATCH] Corrected: Fix for Bug 4529, columns on circ history all screwy
- fix formatting of last renew date
- Add table zebra striping
- Other markup structure changes
- Revised template assumes that issues.branchcode == checkout library and
displays
that value instead of issues.issuingbranch (which is always empty, see Bug
2806)
issues.branchcode seems to reflect the item's holding branch *after* having
been updated as part of the checkout transaction.
---
catalogue/issuehistory.pl |1 +
.../prog/en/modules/catalogue/issuehistory.tmpl| 44 ---
2 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/catalogue/issuehistory.pl b/catalogue/issuehistory.pl
index a6f12c3..0d774ea 100755
--- a/catalogue/issuehistory.pl
+++ b/catalogue/issuehistory.pl
@@ -67,6 +67,7 @@ foreach (@$issues){
$_-{date_due} = format_date($_-{date_due});
$_-{issuedate} = format_date($_-{issuedate});
$_-{returndate} = format_date($_-{returndate});
+ $_-{lastreneweddate} = format_date($_-{lastreneweddate});
}
$template-param(
total= scalar @$issues,
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
index 7ca6c61..13b0e07 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
@@ -15,29 +15,26 @@
div id=yui-main
div class=yui-b
-h1Checkout history for !-- TMPL_VAR NAME=title escape=html -- !--
TMPL_IF NAME=author --(!-- TMPL_VAR NAME=author --)!-- /TMPL_IF --
/h1
+h1Checkout history for !-- TMPL_VAR NAME=title escape=html --/h1
+!-- TMPL_IF NAME=author --h3by !-- TMPL_VAR NAME=author --/h3!--
/TMPL_IF --
div class=searchresults
!-- TMPL_IF NAME=issues --
-pbHas been checked out !-- TMPL_VAR NAME=total -- times/b/p
+h4Checked out !-- TMPL_VAR NAME=total -- times/h4
table
-tr
+theadtr
thPatron/th
thBarcode/th
-thLibrary/th
-thIssuing library/th
+thChecked out from/th
thRenewed/th
thCheckout on/th
thDue date/th
thCheckin on/th
-/tr
+/tr/thead
+tbody
!-- TMPL_LOOP NAME=issues --
-tr
-td!-- TMPL_IF NAME=issuedate --
-!-- TMPL_VAR NAME=issuedate --
-!-- TMPL_ELSE --
-nbsp;
-!-- /TMPL_IF --/td
+!-- TMPL_UNLESS NAME=__odd__ --tr class=highlight!-- TMPL_ELSE
+--tr!-- /TMPL_UNLESS --
tda
href=/cgi-bin/koha/members/moremember.pl?borrowernumber=!-- TMPL_VAR
NAME=borrowernumber --!-- TMPL_VAR NAME=surname --!-- TMPL_IF
NAME=firstname --, !-- TMPL_VAR NAME=firstname --!-- /TMPL_IF
--/a/td
td!-- TMPL_IF NAME=barcode --
a
href=/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber --amp;itemnumber=!-- TMPL_VAR NAME=itemnumber
--!-- TMPL_VAR NAME=barcode --/a
@@ -49,20 +46,16 @@
!-- TMPL_ELSE --
nbsp;
!-- /TMPL_IF --/td
-td!-- TMPL_IF NAME=issuingbranch --
-!-- TMPL_VAR NAME=issuingbranch --
-!-- TMPL_ELSE --
-nbsp;
-!-- /TMPL_IF --/td
td!-- TMPL_IF NAME=renewals--
-YESbr /
-small
-!-- TMPL_IF NAME=lastreneweddate --
-last on: !-- TMPL_VAR NAME=lastreneweddate
--
+Yes!-- TMPL_IF NAME=lastreneweddate --,
smalllast on: !-- TMPL_VAR NAME=lastreneweddate --/small
!-- /TMPL_IF --
-/small
!-- TMPL_ELSE --
-NO
+No
+!-- /TMPL_IF --/td
+td!-- TMPL_IF NAME=issuedate --
+!-- TMPL_VAR NAME=issuedate --
+!-- TMPL_ELSE --
+nbsp;
!-- /TMPL_IF --/td
td!-- TMPL_IF NAME=date_due --
!-- TMPL_VAR NAME=date_due --
@@ -76,10 +69,11 @@
!-- /TMPL_IF --/td
/tr
!-- /TMPL_LOOP --
+/tbody
/table
!-- TMPL_ELSE --
-p
-b!-- TMPL_VAR NAME=title escape=html --(!-- TMPL_VAR
NAME=author --)/b span class=problemhas never been checked
out./span/p
+div class=dialog messagep
+b!-- TMPL_VAR NAME=title escape=html --!-- TMPL_IF
NAME=author --, by !-- TMPL_VAR NAME=author --!-- /TMPL_IF --/b has
never been checked out./p/div
!-- /TMPL_IF --
/div
--
1.7.0.4
Re: [Koha-patches] [PATCH] Fix for Bug 4529, columns on circ history all screwy
Please ignore, see corrected follow-up. On Wed, May 19, 2010 at 9:43 AM, Owen Leonard oleon...@myacpl.org wrote: - fix formatting of last renew date - Add table zebra striping - Other markup structure changes - Revised template assumes that issues.branchcode == checkout library and displays that value instead of issues.issuingbranch (which is always empty, see Bug 2806) issues.branchcode seems to reflect the item's holding branch *after* having been updated as part of the checkout transaction. --- catalogue/issuehistory.pl | 1 + .../prog/en/modules/catalogue/issuehistory.tmpl | 44 --- 2 files changed, 20 insertions(+), 25 deletions(-) ... ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4532, Use include file for bibliodefaultview logic
Note that this new include builds only the first half of the
anchor tag (a). Because title and subtitle are output differently
on some pages, rendering of the second half of the tag is left
to individual pages.
Includes fixes for staff client templates.
Change to basket.pl fixes a bug wherein the OPAC's bibliodefaultview
preference was being checked instead of the staff client's.
---
basket/basket.pl |4 ++--
.../prog/en/includes/biblio-default-view.inc |9 +
.../prog/en/modules/catalogue/results.tmpl | 10 +-
.../prog/en/modules/circ/branchoverdues.tmpl |7 +--
.../prog/en/modules/circ/overdue.tmpl |7 +--
.../prog/en/modules/circ/pendingreserves.tmpl | 14 +-
.../prog/en/modules/circ/reserveratios.tmpl|9 +
.../prog/en/modules/circ/transferstoreceive.tmpl |7 +--
.../prog/en/modules/circ/waitingreserves.tmpl |8 +---
.../prog/en/modules/reserve/request.tmpl |2 +-
.../prog/en/modules/virtualshelves/shelves.tmpl|8 +---
11 files changed, 20 insertions(+), 65 deletions(-)
create mode 100644
koha-tmpl/intranet-tmpl/prog/en/includes/biblio-default-view.inc
diff --git a/basket/basket.pl b/basket/basket.pl
index de70a31..ed6e5a4 100755
--- a/basket/basket.pl
+++ b/basket/basket.pl
@@ -102,10 +102,10 @@ foreach my $biblionumber ( @bibs ) {
$dat-{MARCURLS}= $marcurlsarray;
$dat-{HASAUTHORS} = $hasauthors;
-if ( C4::Context-preference(BiblioDefaultView) eq normal ) {
+if ( C4::Context-preference(IntranetBiblioDefaultView) eq normal ) {
$dat-{dest} = /cgi-bin/koha/catalogue/detail.pl;
}
-elsif ( C4::Context-preference(BiblioDefaultView) eq marc ) {
+elsif ( C4::Context-preference(IntranetBiblioDefaultView) eq marc ) {
$dat-{dest} = /cgi-bin/koha/catalogue/MARCdetail.pl;
}
else {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-default-view.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-default-view.inc
new file mode 100644
index 000..deb5dd3
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-default-view.inc
@@ -0,0 +1,9 @@
+!-- TMPL_IF name=BiblioDefaultViewmarc --
+ a class=title
href=/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --
+!-- TMPL_ELSIF NAME=BiblioDefaultViewlabeled_marc --
+ a class=title
href=/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --
+!-- TMPL_ELSIF NAME=BiblioDefaultViewisbd --
+ a class=title
href=/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --
+!-- TMPL_ELSE --
+ a class=title
href=/cgi-bin/koha/catalogue/detail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --
+!-- /TMPL_IF --
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
index 8ad3609..4e758d0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -394,15 +394,7 @@ function GetZ3950Terms(){
/td
td
p!-- TMPL_VAR NAME=result_number --.
-!-- TMPL_IF name=BiblioDefaultViewmarc
--
-a class=title
href=/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --
-!-- TMPL_ELSIF
NAME=BiblioDefaultViewlabeled_marc --
-a class=title
href=/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --
-!-- TMPL_ELSIF
NAME=BiblioDefaultViewisbd --
-a class=title
href=/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --
-!-- TMPL_ELSE --
-a class=title
href=/cgi-bin/koha/catalogue/detail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --
-!-- /TMPL_IF --
+!-- TMPL_INCLUDE
NAME=biblio-default-view.inc --
b!-- TMPL_IF NAME=title
--!-- TMPL_VAR NAME=title ESCAPE=html --!-- TMPL_ELSE --No title!--
/TMPL_IF --/b
/a
!-- TMPL_LOOP NAME=subtitle -- ,
!-- TMPL_VAR NAME=subfield -- !-- /TMPL_LOOP --
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
[Koha-patches] [PATCH] Alternate fix for Bug 2981, removing onclick redirect
---
circ/circulation.pl |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 4b67920..ac00ab0 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -524,7 +524,6 @@ if ($borrowerslist) {
-id = 'borrowernumber',
-values = \...@values,
-labels = \%labels,
- -onclick = window.location =
'/cgi-bin/koha/circ/circulation.pl?borrowernumber=' + this.value;,
-size = 7,
-tabindex = '',
-multiple = 0
--
1.7.0.4
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Correct position of non-sorted table column
---
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
index 1f3f38b..4749985 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
@@ -19,7 +19,7 @@ $.tablesorter.addParser({
dateFormat: 'uk',!-- /TMPL_IF --
widgets : ['zebra'],
sortList: [[0,0]],
- headers: { 0: { sorter: 'articles' },4: { sorter: false
}
+ headers: { 0: { sorter: 'articles' },5: { sorter: false
}
}
});
$(#checkoutst).tablesorter({!-- TMPL_IF
EXPR=dateformat eq 'metric' --
--
1.7.0.4
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 3666, Overriding renewal limit means negative count in OPAC
Setting renewalsleft variable to zero if it comes out negative.
---
C4/Circulation.pm |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index bceee8b..395494f 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2242,6 +2242,7 @@ sub GetRenewCount {
$renewsallowed = $issuingrule-{'renewalsallowed'};
$renewsleft= $renewsallowed - $renewcount;
+if($renewsleft 0){ $renewsleft = 0; }
return ( $renewcount, $renewsallowed, $renewsleft );
}
--
1.7.0.4
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix template errors introduced in my last patch for Bug 4208
Resubmitting after overlap with another patch
---
.../opac-tmpl/prog/en/modules/opac-results.tmpl|2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index aa9f45e..158a1d2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -550,7 +550,7 @@ $(document).ready(function(){
script
src=https://ltfl.librarything.com/forlibraries/widget.js?id=!--TMPL_VAR
NAME=LibraryThingForLibrariesID --amp;systype=koha
type=text/javascript/script
!-- TMPL_ELSE --
script
src=http://ltfl.librarything.com/forlibraries/widget.js?id=!--TMPL_VAR
NAME=LibraryThingForLibrariesID --amp;systype=koha
type=text/javascript/script
-!-- TMPL_ELSE --
+!-- /TMPL_IF --
!-- /TMPL_IF --
!-- TMPL_INCLUDE NAME=opac-bottom.inc --
--
1.7.0.4
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4400, BIBTEX export from OPAC results in empty file
opac-export.pl tries to get two variables from marc2bibtex(),
but it only returns one.
---
opac/opac-export.pl |3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/opac/opac-export.pl b/opac/opac-export.pl
index 0e2d94f..4c53aff 100755
--- a/opac/opac-export.pl
+++ b/opac/opac-export.pl
@@ -39,8 +39,7 @@ if ($op eq export) {
$marc =
marc2ris(MARC::Record-new_from_usmarc($marc));
}
elsif ($format =~ /bibtex/) {
- my $error;
- ($error,$marc) =
marc2bibtex(C4::Biblio::GetMarcBiblio($biblionumber),$biblionumber);
+ $marc =
marc2bibtex(C4::Biblio::GetMarcBiblio($biblionumber),$biblionumber);
}elsif ($format =~ /dc/) {
my $error;
($error,$marc) = marc2dcxml($marc,1);
--
1.7.0.4
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4475, AmazonLocale not used consistently
---
.../opac-tmpl/prog/en/modules/opac-detail.tmpl |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index 7f319e0..b1fdf84 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -756,7 +756,7 @@ YAHOO.util.Event.onContentReady(furtherm, function () {
!-- Amazon Reviews --
div id=amazonreviews
!-- TMPL_IF NAME=amazon_average_rating --
-div class=clearfixh3 style=float: left;Average Rating
(from Amazon.com): /h3span class=starMT style=float: left;span
class=starFull style=float: left; width:!-- TMPL_VAR
EXPR=amazon_average_rating / 2 --px/span/span !-- TMPL_IF
NAME=normalized_isbn --!-- TMPL_IF NAME=OPACURLOpenInNewWindow --a
href=http://www.amazon.com/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8amp;asin=!--
TMPL_VAR NAME=normalized_isbn --amp;store=books target=_blankAdd your
own review/a!-- TMPL_ELSE --a
href=http://www.amazon.com/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8amp;asin=!--
TMPL_VAR NAME=normalized_isbn --amp;store=booksAdd your own
review/a!-- /TMPL_IF --!-- /TMPL_IF --/div
+div class=clearfixh3 style=float: left;Average Rating
(from Amazon!-- TMPL_VAR NAME=AmazonTld --): /h3span class=starMT
style=float: left;span class=starFull style=float: left; width:!--
TMPL_VAR EXPR=amazon_average_rating / 2 --px/span/span !-- TMPL_IF
NAME=normalized_isbn --!-- TMPL_IF NAME=OPACURLOpenInNewWindow --a
href=http://www.amazon!-- TMPL_VAR NAME=AmazonTld
--/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8amp;asin=!--
TMPL_VAR NAME=normalized_isbn --amp;store=books target=_blankAdd your
own review/a!-- TMPL_ELSE --a href=http://www.amazon!-- TMPL_VAR
NAME=AmazonTld
--/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8amp;asin=!--
TMPL_VAR NAME=normalized_isbn --amp;store=booksAdd your own
review/a!-- /TMPL_IF --!-- /TMPL_IF --/div
!-- TMPL_LOOP NAME=AMAZON_CUSTOMER_REVIEWS --
div class=content_set
@@ -768,7 +768,7 @@ YAHOO.util.Event.onContentReady(furtherm, function () {
!-- /TMPL_LOOP --
!-- TMPL_ELSE --
-p Sorry, there are no reviews from this library available for this
title. !-- TMPL_IF NAME=normalized_isbn --!-- TMPL_IF
NAME=OPACURLOpenInNewWindow --a
href=http://www.amazon.com/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8amp;asin=!--
TMPL_VAR NAME=normalized_isbn --amp;store=books target=_blankAdd your
own review/a!-- TMPL_ELSE --a
href=http://www.amazon.com/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8amp;asin=!--
TMPL_VAR NAME=normalized_isbn --amp;store=booksAdd your own
review/a!-- /TMPL_IF --!-- /TMPL_IF --/p
+p Sorry, there are no reviews from this library available for this
title. !-- TMPL_IF NAME=normalized_isbn --!-- TMPL_IF
NAME=OPACURLOpenInNewWindow --a href=http://www.amazon!-- TMPL_VAR
NAME=AmazonTld
--/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8amp;asin=!--
TMPL_VAR NAME=normalized_isbn --amp;store=books target=_blankAdd your
own review/a!-- TMPL_ELSE --a href=http://www.amazon!-- TMPL_VAR
NAME=AmazonTld
--/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8amp;asin=!--
TMPL_VAR NAME=normalized_isbn --amp;store=booksAdd your own
review/a!-- /TMPL_IF --!-- /TMPL_IF --/p
!-- /TMPL_IF --
/div
--
1.7.0.4
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] A couple of CSS and markup corrections
- moving inline style declaration to the default stylesheet
- correcting markup structure on advanced search screen to allow
consistent custom styling
---
koha-tmpl/opac-tmpl/prog/en/css/opac.css |4 +++-
.../opac-tmpl/prog/en/modules/opac-advsearch.tmpl |2 ++
.../opac-tmpl/prog/en/modules/opac-results.tmpl|2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 41bb6ad..5142dd2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -236,8 +236,10 @@ input[type=submit]:active, input[type=button],
input[type=reset] {
border: 1px inset #66;
}
-td.resultscontrol {
+td.resultscontrol,
+.searchresults td.resultscontrol {
background-color : #EEE;
+ border : 1px solid #E8E8E8;
vertical-align : middle;
padding : 3px 3px 5px 5px;
}
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
index 781c30f..52b00e7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
@@ -115,6 +115,7 @@
a href=/cgi-bin/koha/opac-search.pl?do=Clear[New Search]/a
!-- /SEARCH BUTTONS --/div/div
+div class=yui-g
div id=pubrange class=container
fieldset
!-- PUB RANGE OPTION --
@@ -124,6 +125,7 @@
/fieldset
!-- /PUB RANGE OPTION --
/div
+/div
div class=yui-g
!-- /BOOLEAN SEARCH OPTIONS --
div id=advsearch-itemtype class=container
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index 0be9314..d5d87a2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -326,7 +326,7 @@ $(document).ready(function(){
!-- TABLE RESULTS START --
table
- trtd colspan=5 class=resultscontrol style=border : 1px
solid #e8e8e8;
+ trtd colspan=5 class=resultscontrol
div class=resort select id=sort_by name=sort_by
!--TMPL_INCLUDE NAME=resort_form.inc-- /select input type=submit
class=submit clearfix id=sortsubmit value=Go //div
div class=cartlist
!-- checkall, clearall are now needed for placehold --
--
1.7.0.4
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4485, System preferences page uses non-standard warning style
--- .../prog/en/modules/admin/preferences.tmpl |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tmpl index 832be87..80035bb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tmpl @@ -29,12 +29,12 @@ !-- TMPL_IF NAME=jump_not_found -- h2System preferences/h2 -div class=dialog error +div class=dialog alert Could not find a system preference named code!-- TMPL_VAR NAME=jumpfield --/code. /div !-- /TMPL_IF -- !-- TMPL_IF NAME=search_not_found -- -div class=dialog error +div class=dialog alert No system preferences matched your search for strong!-- TMPL_VAR NAME=searchfield --/strong. You can try a different search or a href=/cgi-bin/koha/admin/preferences.pl?tab=!-- TMPL_VAR NAME=last_tab --return to where you were before./a /div !-- /TMPL_IF -- -- 1.7.0.4 ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 2375, Serials holdings data does not display in opac-detail
- Removing markup to display serial data in the holdings table
This functionality (if it worked) would seem to duplicate
the data displayed under the 'Subscriptions' tab
- Revised again to merge item status display changes
---
.../opac-tmpl/prog/en/modules/opac-detail.tmpl |5 -
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index d0967d2..a494f4f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -373,9 +373,6 @@ YAHOO.util.Event.onContentReady(furtherm, function () {
!-- TMPL_IF NAME=itemdata_enumchron --thVol Info/th!--
/TMPL_IF --
!-- TMPL_IF NAME=itemdata_uri --thURL/th!-- /TMPL_IF --
!-- TMPL_IF NAME=itemdata_copynumber --thCopy/th!--
/TMPL_IF --
- !-- TMPL_IF NAME=serial --
- thSerial Data/th
- thPublished/th!-- /TMPL_IF --
thStatus/th
!-- TMPL_IF NAME=itemdata_itemnotes --thNotes/th!--
/TMPL_IF --
thDate Due/th
@@ -388,8 +385,6 @@ YAHOO.util.Event.onContentReady(furtherm, function () {
!-- TMPL_IF NAME=itemdata_enumchron --td!-- TMPL_VAR
NAME=enumchron --/td!-- /TMPL_IF --
!-- TMPL_IF NAME=itemdata_uri --tda href=!-- TMPL_VAR
NAME=uri --!-- TMPL_VAR NAME=uri --/a/td!-- /TMPL_IF --
!-- TMPL_IF NAME=itemdata_copynumber --td!-- TMPL_VAR
NAME=copynumber --/td!-- /TMPL_IF --
- !-- TMPL_IF NAME=serial --td!-- TMPL_VAR
NAME=serialseq -- /td
- td!-- TMPL_VAR NAME=publisheddate -- /td!-- /TMPL_IF
--
td!-- TMPL_INCLUDE NAME=item-status.inc --/td
!-- TMPL_IF NAME=itemdata_itemnotes --td!-- TMPL_VAR
NAME=itemnotes --/td!-- /TMPL_IF --
td!-- TMPL_VAR NAME=datedue --/td
--
1.7.0.4
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4416, renew all and return all buttons too close together
This patch removes the return all button altogether. Returning all items
is a step which one wouldn't take lightly or even regularly. Since the
interface has a means of selecting all checkboxes in the Check in column,
removing the Return all button wouldn't eliminate the means of doing so, it
would just require more deliberation.
---
.../prog/en/modules/circ/circulation.tmpl |5 -
.../prog/en/modules/members/moremember.tmpl|2 --
2 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index de47e20..980d195 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -47,10 +47,6 @@ var allcheckboxes = $(.checkboxed);
$(allcheckboxes).checkCheckboxes(:input[name*=items]);
$(allcheckboxes).unCheckCheckboxes(:input[name*=barcodes]);
});
- $(#return_all).click(function(){
- $(allcheckboxes).checkCheckboxes(:input[name*=barcodes]);
- $(allcheckboxes).unCheckCheckboxes(:input[name*=items]);
- });
$(#CheckAllitems).click(function(){
$(allcheckboxes).checkCheckboxes(:input[name*=items]);
$(allcheckboxes).unCheckCheckboxes(:input[name*=barcodes]);
return false;
@@ -813,7 +809,6 @@ No patron matched span class=ex!-- TMPL_VAR
name=message --/span
!-- /TMPL_IF --
input type=submit name=renew_checked value=Renew or Return
checked items /
input type=submit id=renew_all name=renew_all value=Renew all
/
-input type=submit id=return_all name=return_all value=Return
all /
/fieldset
!-- /TMPL_IF --
/form
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index af3c41c..67e9397 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -37,7 +37,6 @@ $(document).ready(function() {
return confirm(_('Are you sure you want to replace the current patron
image? This cannot be undone.'));
});!-- /TMPL_IF --
$(#renew_all ).click(function(){
$(.checkboxed).checkCheckboxes(:input[name*=items] );
$(.checkboxed).unCheckCheckboxes(:input[name*=barcodes]); });
- $(#return_all ).click(function(){
$(.checkboxed).checkCheckboxes(:input[name*=barcodes]);
$(.checkboxed).unCheckCheckboxes(:input[name*=items] ); });
$(#CheckAllitems ).click(function(){
$(.checkboxed).checkCheckboxes(:input[name*=items] );
$(.checkboxed).unCheckCheckboxes(:input[name*=barcodes]); return false; });
$(#CheckNoitems ).click(function(){
$(.checkboxed).unCheckCheckboxes(:input[name*=items]); return false; });
$(#CheckAllreturns).click(function(){
$(.checkboxed).checkCheckboxes(:input[name*=barcodes]);
$(.checkboxed).unCheckCheckboxes(:input[name*=items]); return false; });
@@ -505,7 +504,6 @@ if (nodename ==barcodes[]){
!-- /TMPL_IF --
input type=submit name=renew_checked value=Renew or Return
checked items /
input type=submit id=renew_all name=renew_all value=Renew all
/
-input type=submit id=return_all name=return_all value=Return
all /
/fieldset
/form!-- TMPL_ELSE --pPatron has nothing checked out./p!--
/TMPL_IF --
/div
--
1.7.0.4
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Further corrections for Bug 4244, Use checkouts instead of issues
---
.../prog/en/modules/circ/overdue.tmpl |2 +-
.../prog/en/modules/reports/issues_avg_stats.tmpl |2 +-
.../prog/en/modules/tools/overduerules.tmpl|2 +-
.../prog/en/modules/tools/viewlog.tmpl |2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
index c199e6f..a056497 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
@@ -229,7 +229,7 @@
!-- /TMPL_LOOP --
/select/li
-li class=radiolabel for=showallShow any items currently issued:/label
+li class=radiolabel for=showallShow any items currently checked
out:/label
!-- TMPL_IF NAME=showall --
input type=checkbox id=showall name=showall value=show
checked=checked /
!-- TMPL_ELSE --
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
index 6655e59..26d671b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
@@ -74,7 +74,7 @@
/thead
tbody
tr class=hilighted
- tdIssue date/td
+ tdCheckout date/td
tdinput type=radio name=Line
value=timestamp //td
tdinput type=radio name=Column
value=timestamp //td
td label for=fromFrom/label input
type=text readonly=readonly size=10 id=from name=Filter /
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
index e27cfe1..176e4cf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
@@ -29,7 +29,7 @@ $(document).ready(function() {
h1Defining !-- TMPL_IF NAME=branch --overdue actions for !--
TMPL_VAR NAME=branch --!-- TMPL_ELSE --default overdue actions!--
/TMPL_IF --/h1
div class=help
-pDelay is the number of days after an issue is due before an
action is triggered. /p
+pDelay is the number of days after an checkout is due before an
action is triggered. /p
pIf you want Koha to trigger an action (send a letter or debar
member), a delay value is required./p
pColumns must be filled left to right: if the first column is
blank, other columns will be ignored. /p
/div
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
index 58d5ede..fa99af2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
@@ -60,7 +60,7 @@
option
value =addAdd/option
option
value =delDelete/option
option
value =modModify/option
- option
value=issueIssue/option
+ option
value=issueCheckout/option
option
value=returnReturn/option
/select
/li
--
1.7.0.4
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4271, Offer choice of destination for save biblio operation
A follow-up to the fix for Bug 4121, the user should be able to control whether
the action of saving a bibliographic record takes them to the add item screen
or the detail screen, independently of whether they are adding or modifying the
record.
The addition of a split button would leave the default action in place if the
user clicked the main part of the button. Clicking on the menu would give the
user specific choices.
---
cataloguing/addbiblio.pl |5 +-
.../prog/en/modules/cataloguing/addbiblio.tmpl | 47
2 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 7a1ed65..fc56047 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -829,6 +829,7 @@ my $z3950 = $input-param('z3950');
my $op= $input-param('op');
my $mode = $input-param('mode');
my $frameworkcode = $input-param('frameworkcode');
+my $redirect = $input-param('redirect');
my $dbh = C4::Context-dbh;
my $userflags = ($frameworkcode eq 'FA') ? fast_cataloging :
edit_catalogue;
@@ -930,13 +931,13 @@ if ( $op eq addbiblio ) {
( $biblionumber, $oldbibitemnum ) = AddBiblio( $record,
$frameworkcode );
}
-if ($mode ne popup !$is_a_modif){
+if (($mode ne popup !$is_a_modif) || $redirect eq items){
print $input-redirect(
/cgi-bin/koha/cataloguing/additem.pl?biblionumber=$biblionumberframeworkcode=$frameworkcode
);
exit;
}
- elsif($is_a_modif){
+ elsif($is_a_modif || $redirect eq view){
my $defaultview =
C4::Context-preference('IntranetBiblioDefaultView');
my $views = { C4::Search::enabled_staff_search_views };
if ($defaultview eq 'isbd' $views-{can_view_ISBD}) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index c3f92a4..a091adc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -41,7 +41,7 @@ function confirmnotdup(){
*
*
*/
-function Check(){
+function Check(dest){
var StrAlert = AreMandatoriesNotOk();
if( ! StrAlert ){
document.f.submit();
@@ -631,6 +631,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is
it used ?
/script
!--TMPL_ELSE--
form method=post name=f id=f
action=/cgi-bin/koha/cataloguing/addbiblio.pl onsubmit=return Check();
+input type=hidden value= id=redirect name=redirect /
input type=hidden value=0 id=confirm_not_duplicate
name=confirm_not_duplicate /
!-- /TMPL_IF --
@@ -643,27 +644,55 @@ function unHideSubfield(index,labelindex) { // FIXME ::
is it used ?
$(document).ready(function() {
$(#z3950searchc).empty();
+$(#savebutton).empty();
yuiToolbar();
});
+var onOption = function () {
+return Check();
+}
+
+function redirect(dest){
+$(#redirect).attr(value,dest);
+return Check();
+}
+
+var savemenu = [
+{ text: _(Save and view record), value: 1, onclick:
{fn:function(){redirect(view);}} },
+{ text: _(Save and edit items), value: 2, onclick:
{fn:function(){redirect(items);}} }
+];
+
+
// YUI Toolbar Functions
function yuiToolbar() {
- new YAHOO.widget.Button(addbiblio);
+ // new YAHOO.widget.Button(addbiblio);
+
+var savesplitmenu = new YAHOO.widget.Button({
+type: split,
+label: _(Save),
+id: addbiblio,
+name: savemenubutton,
+menu: savemenu,
+container: savebutton
+ });
+
+savesplitmenu.on(click, onOption);
+
new YAHOO.widget.Button({
-id: z3950search,
-type: button,
-label: _(Z39.50 Search),
-container: z3950searchc,
-
onclick: {fn:function(){PopupZ3950()}}
-});
+id: z3950search,
+type: button,
+label: _(Z39.50 Search),
+container: z3950searchc,
+ onclick: {fn:function(){PopupZ3950()}}
+});
}
//]]
/script
ul class=toolbar
- liinput id=addbiblio type=submit value=Save
//li
+ li id=savebuttoninput id=addbiblio type=submit
value=Save //li
li id=z3950searchcinput type=button
id=z3950search value=Z39.50 Search onclick=PopupZ3950();
[Koha-patches] [PATCH] Fix for Bug 4424, MARC Framework deletion incorrectly reports usage count
Thanks to Thomas Dukleth for the fix.
---
admin/biblio_framework.pl |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/admin/biblio_framework.pl b/admin/biblio_framework.pl
index f7a7091..f2c147e 100755
--- a/admin/biblio_framework.pl
+++ b/admin/biblio_framework.pl
@@ -91,7 +91,7 @@ if ($op eq 'add_form') {
# called by default form, used to confirm deletion of data in DB
} elsif ($op eq 'delete_confirm') {
# Check both categoryitem and biblioitems, see Bug 199
-my $sth = $dbh-prepare(select count(*) as total from marc_tag_structure
where frameworkcode=?);
+my $sth = $dbh-prepare(select count(*) as total from biblio where
frameworkcode=?);
$sth-execute($frameworkcode);
my $total = $sth-fetchrow_hashref-{total};
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix to enable Amazon cover images in the staff client.
Since this fix enables the previously-missing variable
'AmazonEnabled' in Auth.pm, this will also enable other
Amazon content in the staff client like Product
Descriptions and Amazon Similar Items (See Bug 3863)
---
C4/Auth.pm |2 ++
.../prog/en/modules/catalogue/results.tmpl | 11 +--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/C4/Auth.pm b/C4/Auth.pm
index 94a05fb..387a352 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -354,6 +354,8 @@ sub get_template_and_user {
if ( $in-{'type'} eq intranet ) {
$template-param(
AmazonContent =
C4::Context-preference(AmazonContent),
+AmazonCoverImages =
C4::Context-preference(AmazonCoverImages),
+AmazonEnabled =
C4::Context-preference(AmazonEnabled),
AmazonSimilarItems =
C4::Context-preference(AmazonSimilarItems),
AutoLocation=
C4::Context-preference(AutoLocation),
BiblioDefaultView.C4::Context-preference(IntranetBiblioDefaultView) = 1,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
index b81970a..b9b6a7d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -371,23 +371,22 @@ function GetZ3950Terms(){
!-- /TMPL_IF --
!-- TABLE RESULTS START --
-
table
tr
-!-- TMPL_IF NAME=AmazonEnabled
--thnbsp;/th!-- /TMPL_IF --
+!-- TMPL_IF NAME=AmazonEnabled --!-- TMPL_IF
NAME=AmazonCoverImages --thnbsp;/th!-- /TMPL_IF --!-- /TMPL_IF --
th colspan=2Results/th
thLocation/th
/tr
!-- Actual Search Results --
!-- TMPL_LOOP NAME=SEARCH_RESULTS --
!-- TMPL_IF NAME=__odd__ --tr!-- TMPL_ELSE
--tr class=highlight!-- /TMPL_IF --
-!-- TMPL_IF NAME=AmazonEnabled --
+!-- TMPL_IF NAME=AmazonEnabled --!-- TMPL_IF
NAME=AmazonCoverImages --
td
a class=p1
href=/cgi-bin/koha/catalogue/detail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --
- !--
TMPL_IF NAME=AmazonCoverImages --
-img src=!-- TMPL_IF
NAME=normalized_isbn --http://images.amazon.com/images/P/!-- TMPL_VAR
name=normalized_isbn --.01.TZZZ.jpg!-- TMPL_ELSE
--http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif!--
/TMPL_IF -- alt=image class=thumbnail / !-- /TMPL_IF --
+
+img src=!-- TMPL_IF
NAME=normalized_isbn --http://images.amazon.com/images/P/!-- TMPL_VAR
name=normalized_isbn --.01.TZZZ.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/td
-!-- /TMPL_IF --
+!-- /TMPL_IF --!-- /TMPL_IF --
td
input type=checkbox class=selection
id=bib!-- TMPL_VAR NAME=biblionumber -- name=biblionumber value=!--
TMPL_VAR NAME=biblionumber -- style=display:none /
/td
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] A fix for Bug 4208, Many submit buttons are not translatable in 3.2
Not a fix for a submit button problem, but for a problem with
TMPL_IFs nested inside tags, a practice which will break the
translation script.
---
.../opac-tmpl/prog/en/modules/opac-detail.tmpl | 14 --
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index df0b1db..46eb334 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -71,7 +71,14 @@ YAHOO.util.Event.onContentReady(furtherm, function () {
div id=bookcover
!-- TMPL_IF NAME=OPACAmazonEnabled --!-- TMPL_IF
NAME=OPACAmazonCoverImages --!-- TMPL_IF NAME=OPACURLOpenInNewWindow
--a href=http://www.amazon!-- TMPL_VAR NAME=AmazonTld --/gp/reader/!--
TMPL_VAR NAME=normalized_isbn
--/ref=sib_dp_pt/002-7879865-0184864#reader-link target=_blankimg
border=0 src=http://images.amazon.com/images/P/!-- TMPL_VAR
NAME=normalized_isbn --.01.MZZZ.jpg alt=Cover Image //a!--
TMPL_ELSE --a href=http://www.amazon!-- TMPL_VAR NAME=AmazonTld
--/gp/reader/!-- TMPL_VAR NAME=normalized_isbn
--/ref=sib_dp_pt/002-7879865-0184864#reader-linkimg border=0
src=http://images.amazon.com/images/P/!-- TMPL_VAR NAME=normalized_isbn
--.01.MZZZ.jpg alt=Cover Image //a!-- /TMPL_IF --!-- /TMPL_IF
--!-- /TMPL_IF --
-!-- TMPL_IF NAME=SyndeticsEnabled --!-- TMPL_IF
NAME=SyndeticsCoverImages --!-- TMPL_IF NAME=content_identifier_exists
--!-- TMPL_IF NAME=using_https --img
src=https://secure.syndetics.com/index.aspx?isbn=!-- TMPL_VAR
NAME=normalized_isbn --/!--TMPL_ELSEimg
src=http://www.syndetics.com/index.aspx?isbn=!-- TMPL_VAR
NAME=normalized_isbn --/!-- /TMPL_IF --!-- TMPL_VAR
NAME=SyndeticsCoverImageSize --.GIFamp;client=!-- TMPL_VAR
NAME=SyndeticsClientCode --amp;type=xw10!-- TMPL_IF NAME=normalized_upc
--amp;upc=!-- TMPL_VAR NAME=normalized_upc --!-- /TMPL_IF --!--
TMPL_IF NAME=normalized_oclc --amp;oclc=!-- TMPL_VAR
NAME=normalized_oclc --!-- /TMPL_IF -- alt= class=thumbnail /!--
TMPL_ELSE --span class=no-imageNo cover image available/span!--
/TMPL_IF --!-- /TMPL_IF --!-- /TMPL_IF --
+
+!-- TMPL_IF NAME=SyndeticsEnabled --!-- TMPL_IF
NAME=SyndeticsCoverImages --!-- TMPL_IF NAME=content_identifier_exists
--!-- TMPL_IF NAME=using_https --
+img src=https://secure.syndetics.com/index.aspx?isbn=!-- TMPL_VAR
NAME=normalized_isbn --/!-- TMPL_VAR NAME=SyndeticsCoverImageSize
--.GIFamp;client=!-- TMPL_VAR NAME=SyndeticsClientCode
--amp;type=xw10amp;upc=!-- TMPL_VAR NAME=normalized_upc --amp;oclc=!--
TMPL_VAR NAME=normalized_oclc -- alt= class=thumbnail /
+!--TMPL_ELSE --
+img src=http://www.syndetics.com/index.aspx?isbn=!-- TMPL_VAR
NAME=normalized_isbn --/!-- TMPL_VAR NAME=SyndeticsCoverImageSize
--.GIFamp;client=!-- TMPL_VAR NAME=SyndeticsClientCode
--amp;type=xw10amp;upc=!-- TMPL_VAR NAME=normalized_upc --amp;oclc=!--
TMPL_VAR NAME=normalized_oclc -- alt= class=thumbnail /!-- /TMPL_IF
--
+
+!-- TMPL_ELSE --span class=no-imageNo cover image
available/span!-- /TMPL_IF --!-- /TMPL_IF --!-- /TMPL_IF --
+
!-- TMPL_IF NAME=GoogleJackets --div style=block title=!--
TMPL_VAR NAME=biblionumber ESCAPE=URL -- class=!-- TMPL_VAR
NAME=normalized_isbn -- id=gbs-thumbnail-preview/div!-- /TMPL_IF --
!-- TMPL_IF NAME=BakerTaylorEnabled --!-- TMPL_IF
NAME=normalized_isbn --!-- TMPL_IF NAME=OPACURLOpenInNewWindow --a
href=https://!-- TMPL_VAR NAME=BakerTaylorBookstoreURL ESCAPE=HTML
--!-- TMPL_VAR NAME=normalized_isbn -- target=_blankimg alt=See
Baker amp; Taylor src=!-- TMPL_VAR NAME=BakerTaylorImageURL ESCAPE=HTML
--!-- TMPL_VAR NAME=normalized_isbn -- //a!-- TMPL_ELSE --a
href=https://!-- TMPL_VAR NAME=BakerTaylorBookstoreURL ESCAPE=HTML
--!-- TMPL_VAR NAME=normalized_isbn --img alt=See Baker amp; Taylor
src=!-- TMPL_VAR NAME=BakerTaylorImageURL ESCAPE=HTML --!-- TMPL_VAR
NAME=normalized_isbn -- //a!-- /TMPL_IF --!-- /TMPL_IF --!--
/TMPL_IF --
/div
@@ -299,7 +306,10 @@ YAHOO.util.Event.onContentReady(furtherm, function () {
!-- /TMPL_IF --!-- /TMPL_IF --
!-- TMPL_IF NAME=SyndeticsReviews --!-- TMPL_IF NAME=SYNDETICS_REVIEWS
--
li a href=/cgi-bin/koha/opac-detail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber --#reviewsReviews/a/li
-li !-- TMPL_IF NAME=using_https --script
src=https://www.librarything.com/forlibraries/widget.js?id=!-- TMPL_ELSE
--script src=http://www.librarything.com/forlibraries/widget.js?id=!--
/TMPL_IF --!-- TMPL_VAR NAME=LibraryThingForLibrariesID --
type=text/javascript/scriptnoscriptThis page contains enriched content
visible when JavaScript is enabled or by clicking !-- TMPL_IF
NAME=using_https --a
href=https://www.librarything.com/forlibraries/noscript.php?id=99-274208589amp;accessibility=1;!--
TMPL_ELSE --a
href=http://www.librarything.com/forlibraries/noscript.php?id=99-274208589amp;accessibility=1;!--
/TMPL_IF --here/a./noscript/li
+li !-- TMPL_IF
[Koha-patches] Use CSS3 box-shadow property for Cart tooltip (Bug 4387)
The OPAC Cart tooltip (Your cart is empty, 1 item(s) added to your
Cart) currently uses a jQuery plugin to generate a drop shadow.
This works cross-browser, but has a high failure rate with regard
to hiding the shadow consistently, resulting in an orphan shadow
after the tooltip has been hidden. I propose to instead use the
new CSS3 property box-shadow (-moz-box-shadow and -webkit-box-
shadow for FireFox and Safari/Chrome). Currently Internet Explorer
does not support this property. I think this is an
acceptable tradeoff for more stable functionality.
Patch attached (long lines)
From 9ed6f0eae3dbe34b13519374157898c81a5b4673 Mon Sep 17 00:00:00 2001
From: Owen Leonard oleon...@myacpl.org
Date: Thu, 25 Feb 2010 09:43:15 -0500
Subject: [PATCH] Use CSS3 box-shadow property for Cart tooltip
The OPAC Cart tooltip (Your cart is empty, 1 item(s) added to your
Cart) currently uses a jQuery plugin to generate a drop shadow.
This works cross-browser, but has a high failure rate with regard
to hiding the shadow consistently, resulting in an orphan shadow
after the tooltip has been hidden. I propose to instead use the
new CSS3 property box-shadow (-moz-box-shadow and -webkit-box-
shadow for FireFox and Safari/Chrome). Currently Internet Explorer
does not support this property. I think this is an
acceptable tradeoff for more stable functionality.
---
.../intranet-tmpl/prog/en/css/staff-global.css |5 +++--
.../prog/en/includes/doc-head-close.inc|1 -
.../en/lib/jquery/plugins/jquery.dropshadow-min.js |1 -
koha-tmpl/opac-tmpl/prog/en/css/opac.css |4
.../opac-tmpl/prog/en/includes/doc-head-close.inc |1 -
koha-tmpl/opac-tmpl/prog/en/js/basket.js | 12 +++-
.../en/lib/jquery/plugins/jquery.dropshadow-min.js |1 -
7 files changed, 10 insertions(+), 15 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dropshadow-min.js
delete mode 100644 koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.dropshadow-min.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 190c9da..515f088 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1822,8 +1822,9 @@ h1#xml a {
#cartDetails {
background-color : #FFF;
border: 1px solid #739acf;
- border-right-width : 2px;
- border-bottom-width : 2px;
+ -moz-box-shadow: 1px 1px 3px 0 #666;
+ -webkit-box-shadow: 1px 1px 3px 0 #666;
+ box-shadow: 1px 1px 3px 0 #666;
color : black;
display : none;
margin : 0;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index 845ceeb..1970440 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -29,7 +29,6 @@
script type=text/javascript src=!-- TMPL_VAR name=themelang --/lib/jquery/jquery.js/script
script type=text/javascript src=!-- TMPL_VAR name=themelang --/lib/jquery/plugins/ui.tabs.js/script
script type=text/javascript src=!-- TMPL_VAR name=themelang --/lib/jquery/plugins/jquery.hotkeys.min.js/script
-script type=text/javascript src=!-- TMPL_VAR name=themelang --/lib/jquery/plugins/jquery.dropshadow-min.js/script
script type=text/javascript src=!-- TMPL_VAR name=themelang --/lib/jquery/plugins/jquery.highlight-3.js/script
!-- TMPL_IF NAME=js_libs --
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dropshadow-min.js b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dropshadow-min.js
deleted file mode 100644
index 9b1b1fb..000
--- a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dropshadow-min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(B){var A=1;B.fn.dropShadow=function(C){var D=B.extend({left:4,top:4,blur:2,opacity:0.5,color:black,swap:false},C);var E=B([]);this.not(.dropShadow).each(function(){var N=B(this);var J=[];var G=(D.blur=0)?0:D.blur;var M=(G==0)?D.opacity:D.opacity/(G*8);var O=(D.swap)?A:A+1;var F=(D.swap)?A+1:A;var P;if(this.id){P=this.id+_dropShadow}else{P=ds+(1+Math.floor(*Math.random()))}B.data(this,shadowId,P);B.data(this,shadowOptions,C);N.attr(shadowId,P).css(zIndex,O);if(N.css(position)!=absolute){N.css({position:relative,zoom:1})}bgColor=N.css(backgroundColor);if(bgColor==rgba(0, 0, 0, 0)){bgColor=transparent}if(bgColor!=transparent||N.css(backgroundImage)!=none||this.nodeName==SELECT||this.nodeName==INPUT||this.nodeName==TEXTAREA){J[0]=B(div/div).css(background,D.color)}else{J[0]=N.clone().removeAttr(id).removeAttr(name).removeAttr(shadowId).css(color,D.color)}J[0].addClass(dropShadow).css({height:N.outerHeight(),left:G,opacity:M,position:absolute,top:G,width:N.outerWidth(),zIndex:F});var L=(8*G)+1;for(K=1;KL;K++){J[K]=J[0].clone()}var K=1;var I=G;while(I0){J[K].css({left:I*2,top:0});J[K+1].css({left:I*4,top:I*2});J[K+2].css
[Koha-patches] [PATCH] Improve display of information on Transfers to your library report
- Use GetRecordValue() to show subtitle
- Show author
- Separate branch and call number display for better sorting
- Correct teriminology (reserve - hold)
---
circ/transferstoreceive.pl |5 -
.../prog/en/modules/circ/transferstoreceive.tmpl | 20 +++-
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl
index ddb7f4a..3073c0a 100755
--- a/circ/transferstoreceive.pl
+++ b/circ/transferstoreceive.pl
@@ -91,10 +91,13 @@ foreach my $br ( keys %$branches ) {
$getransf{'datetransfer'} = format_date( $num-{'datesent'} );
$getransf{'itemtype'} = $itemtypeinfo -{'description'};
- foreach (qw(title biblionumber itemnumber barcode
homebranch holdingbranch itemcallnumber)) {
+ foreach (qw(title author biblionumber itemnumber
barcode homebranch holdingbranch itemcallnumber)) {
$getransf{$_} = $gettitle-{$_};
}
+my $record = GetMarcBiblio($gettitle-{'biblionumber'});
+$getransf{'subtitle'} = GetRecordValue('subtitle', $record,
GetFrameworkCode($gettitle-{'biblionumber'}));
+
# we check if we have a reserv for this transfer
my @checkreserv = GetReservesFromItemnumber($num-{'itemnumber'} );
if ( $checkreserv[0] ) {
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
index 8ee68eb..0a5010f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
@@ -15,8 +15,8 @@ $(document).ready(function() {
$.tablesorter.defaults.widgets = ['zebra'];
$(#transferst!-- TMPL_VAR NAME=branchcode --).tablesorter({!--
TMPL_IF =dateformat_metric --
dateFormat: 'uk',!-- /TMPL_IF --
-sortList: [[1,0]],
-headers: { 1: { sorter: 'articles' },4:{sorter:false}}
+sortList: [[0,0]],
+headers: { 1: { sorter: 'articles' }}
});
!-- /TMPL_LOOP --
});
@@ -47,8 +47,9 @@ $(document).ready(function() {
theadtr
thDate of transfer/th
thTitle/th
-thReserved by /th
-thLocation/th
+thOn hold for/th
+thHome library/th
+thCall no./th
/tr/thead
tbody!-- TMPL_LOOP NAME=reserv --
!-- TMPL_IF NAME=messcompa --
@@ -59,12 +60,12 @@ $(document).ready(function() {
tdp!-- TMPL_VAR NAME=datetransfer --/p !--
TMPL_IF NAME=messcompa --span class=errorTransfer is !-- TMPL_VAR
NAME=diff -- days late/span!-- /TMPL_IF --/td
tdspan style=display:none;!-- TMPL_VAR NAME=title
escape=html --/span!-- invisible title for tablesorter --
!-- TMPL_IF name=BiblioDefaultViewmarc --
-a href=/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --!-- TMPL_VAR NAME=title escape=html
--/a
+a href=/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --!-- TMPL_VAR NAME=title escape=html
-- !-- TMPL_IF NAME=subtitle -- !-- TMPL_LOOP NAME=subtitle --!--
TMPL_VAR NAME=subfield --!-- /TMPL_LOOP --!-- /TMPL_IF --/a
!-- TMPL_ELSIF NAME=BiblioDefaultViewisbd --
-a href=/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --!-- TMPL_VAR NAME=title escape=html
--/a
+a href=/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --!-- TMPL_VAR NAME=title escape=html
-- !-- TMPL_IF NAME=subtitle -- !-- TMPL_LOOP NAME=subtitle --!--
TMPL_VAR NAME=subfield --!-- /TMPL_LOOP --!-- /TMPL_IF --/a
!-- TMPL_ELSE --
-a href=/cgi-bin/koha/catalogue/detail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --!-- TMPL_VAR NAME=title escape=html
-- !-- TMPL_VAR NAME=subtitle --/a!-- /TMPL_IF --
-nbsp; (b!-- TMPL_VAR NAME=itemtype --/b)
+a href=/cgi-bin/koha/catalogue/detail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --!-- TMPL_VAR NAME=title escape=html
-- !-- TMPL_IF NAME=subtitle -- !-- TMPL_LOOP NAME=subtitle --!--
TMPL_VAR NAME=subfield --!-- /TMPL_LOOP --!-- /TMPL_IF --/a!--
/TMPL_IF -- !-- TMPL_IF NAME=author --by !-- TMPL_VAR NAME=author
--!-- /TMPL_IF --
+!-- TMPL_IF NAME=itemtype --nbsp; (b!--
TMPL_VAR NAME=itemtype --/b)!-- /TMPL_IF --
br /Barcode: !-- TMPL_VAR NAME=barcode --
/td
td!-- TMPL_IF NAME=borrowername --
@@ -81,7 +82,8 @@ $(document).ready(function() {
pNone/p
!-- /TMPL_IF --
/td
-td!-- TMPL_VAR
Re: [Koha-patches] [PATCH 19/55] (bug #4018) fix coins support in opac detail and xslt
.../opac-tmpl/prog/en/modules/opac-detail.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ... - !-- TMPL_IF NAME=OPACXSLTDetailsDisplay -- + !-- TMPL_IF NAME=XSLTDetailsDisplay -- !-- TMPL_VAR NAME=XSLTBloc -- This change wouldn't affect coins support, it would tie the XSLT display on the OPAC to the system preference which controls the XSLT display in the staff client. That's not something we want. -- Owen -- Web Developer Athens County Public Libraries http://www.myacpl.org ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4301, OPAC RSS feed link doesn't include sort parameter
--- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc |2 +- .../opac-tmpl/prog/en/modules/opac-results.tmpl|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index 63d92b0..878a412 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -171,7 +171,7 @@ /div div id=breadcrumbs class=yui-g !-- TMPL_IF NAME=searchdesc --p!-- TMPL_IF name=total --strongldquo;!-- TMPL_VAR NAME=query_desc ESCAPE=HTML-- !-- TMPL_VAR NAME=limit_desc ESCAPE=HTML--rdquo; /strongreturned !-- TMPL_VAR NAME=total ESCAPE=HTML-- results. !-- TMPL_IF NAME=related -- (related searches: !-- TMPL_LOOP NAME=related --!-- TMPL_VAR NAME=related_search --!-- /TMPL_LOOP --). !-- /TMPL_IF -- -a href=!-- TMPL_VAR NAME=OPACBaseURL --/cgi-bin/koha/opac-search.pl?!-- TMPL_VAR name=query_cgi ESCAPE=HTML --!-- TMPL_VAR NAME=limit_cgi ESCAPE=HTML --amp;format=rss2img src=/opac-tmpl/prog/images/feed-icon-16x16.png alt=Subscribe to this search title=Subscribe to this search border=0 //a +a href=!-- TMPL_VAR NAME=OPACBaseURL --/cgi-bin/koha/opac-search.pl?!-- TMPL_VAR name=query_cgi ESCAPE=HTML --!-- TMPL_VAR NAME=limit_cgi ESCAPE=HTML --!-- TMPL_IF NAME=sort_by --amp;sort_by=!-- TMPL_VAR NAME=sort_by ESCAPE=HTML --!-- /TMPL_IF --amp;format=rss2img src=/opac-tmpl/prog/images/feed-icon-16x16.png alt=Subscribe to this search title=Subscribe to this search border=0 //a !-- TMPL_ELSE -- strongNo Result found!/strong p diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl index 1ea73e5..da21d74 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl @@ -6,7 +6,7 @@ You did not specify any search criteria. !-- /TMPL_IF -- !-- TMPL_INCLUDE NAME=doc-head-close.inc -- -link rel=alternate type=application/rss+xml title=!-- TMPL_VAR NAME=LibraryName -- Search RSS Feed href=!-- TMPL_VAR NAME=OPACBaseURL --/cgi-bin/koha/opac-search.pl?!-- TMPL_VAR name=query_cgi ESCAPE=HTML --!-- TMPL_VAR NAME=limit_cgi ESCAPE=HTML --amp;format=rss2 / +link rel=alternate type=application/rss+xml title=!-- TMPL_VAR NAME=LibraryName -- Search RSS Feed href=!-- TMPL_VAR NAME=OPACBaseURL --/cgi-bin/koha/opac-search.pl?!-- TMPL_VAR name=query_cgi ESCAPE=HTML --!-- TMPL_VAR NAME=limit_cgi ESCAPE=HTML --!-- TMPL_IF NAME=sort_by --amp;sort_by=!-- TMPL_VAR NAME=sort_by ESCAPE=HTML --!-- /TMPL_IF --amp;format=rss2 / script type=text/javascript src=!-- TMPL_VAR name=themelang --/lib/jquery/plugins/jquery.checkboxes.min.js/script -- 1.6.3.3 ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4296, label search printing titles between buttons
- Reformating display for readability
- Converting select/clear all buttons to links to match existing patterns
- Fixing Results x of x display which was broken for single-page sets
---
.../prog/en/modules/labels/result.tmpl | 39 +++-
1 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
index 1168102..53edfe4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
@@ -65,32 +65,20 @@
No results found
!-- /TMPL_IF --
/div
-div id=breadcrumbs
-a
href=/cgi-bin/koha/labels/label-item-search.pl?batch_id=!-- TMPL_VAR
NAME=batch_id --Search for Items for Batch !-- TMPL_VAR NAME=batch_id
--/a rsaquo;
-Search results
-/div
+
form name=resultform class=checkboxed action=
-div style=float: right; margin-top: .5em; margin-left: .7em;
margin-bottom: .7em
-input type=submit class=icon addchecked value=Add
checked onclick=add_item('checked',!-- TMPL_VAR NAME=batch_id --,'!--
TMPL_VAR NAME=type --'); return false /
-input type=button class=close value=Done /
-/div
-div style=float: left; margin-top: .5em; margin-right: .7em;
margin-bottom: .7em
-input id=CheckAll type=submit class=icon checkall
value=Check All onclick=return false /
-!--a id=CheckAll
href=/cgi-bin/koha/labels/label-item-search.plSelect All/a--
-input id=CheckNone type=submit class=icon checknone
value=Clear All onclick=return false /
-!--a id=CheckNone
href=/cgi-bin/koha/labels/label-item-search.plClear All/a--
-/div
-div style=padding-top: 0.7em;
+pa id=CheckAll href=#Select All/a a id=CheckNone
href=#Clear All/a | input type=button value=Add checked
onclick=add_item('checked',!-- TMPL_VAR NAME=batch_id --,'!-- TMPL_VAR
NAME=type --'); return false; /
+input type=button class=close value=Done //p
+
+div id=label-search-results
input type=hidden name=ccl_query value=!-- TMPL_VAR
name=ccl_query -- /
- !-- TMPL_LOOP name=result_set --
- table id=label-search-results frame=border border=2
- tr
- td colspan=5
- label style=font-weight:bold;!-- TMPL_VAR
NAME=title ESCAPE=html --/label
-by !-- TMPL_VAR NAME=author --br /
-[!-- TMPL_VAR NAME=itemtype --], !-- TMPL_IF
name=publishercode --!-- TMPL_VAR name=publishercode -- !-- /TMPL_IF
--!-- TMPL_IF name=place --!-- TMPL_VAR name=place -- !-- /TMPL_IF
--!-- TMPL_IF name=copyrightdate --!-- TMPL_VAR name=copyrightdate --,
!-- /TMPL_IF --!-- TMPL_IF name=pages --!-- TMPL_VAR name=pages
--!-- /TMPL_IF --!-- TMPL_IF name=isbn --, bISBN: /b!-- TMPL_VAR
name=isbn --!-- /TMPL_IF --!-- TMPL_IF name=notes --,br /!--
TMPL_VAR name=notes --!-- /TMPL_IF --
- /td
-/tr
+!-- TMPL_LOOP name=result_set --
+div style=border-bottom:1px solid #CCC;margin: .5em 0;
+ h4!-- TMPL_VAR NAME=title ESCAPE=html
--/h4
+p!-- TMPL_IF NAME=author --by !-- TMPL_VAR
NAME=author --!-- /TMPL_IF --
+[!-- TMPL_VAR NAME=itemtype --], !-- TMPL_IF
name=publishercode --!-- TMPL_VAR name=publishercode -- !-- /TMPL_IF
--!-- TMPL_IF name=place --!-- TMPL_VAR name=place -- !-- /TMPL_IF
--!-- TMPL_IF name=copyrightdate --!-- TMPL_VAR name=copyrightdate --,
!-- /TMPL_IF --!-- TMPL_IF name=pages --!-- TMPL_VAR name=pages
--!-- /TMPL_IF --!-- TMPL_IF name=isbn --, bISBN: /b!-- TMPL_VAR
name=isbn --!-- /TMPL_IF --!-- TMPL_IF name=notes --,br /!--
TMPL_VAR name=notes --!-- /TMPL_IF --/p
+
+table style=margin-bottom:1em;
!-- TMPL_LOOP NAME=item_table --
!-- TMPL_IF NAME=header_fields --
tr
@@ -114,7 +102,8 @@
/tr
!-- /TMPL_IF --
!-- /TMPL_LOOP --
- /table
+/table
+/div
!-- /TMPL_LOOP --
/div
/form
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4251, click on show more in facet drops limit=branch in query
--- .../opac-tmpl/prog/en/includes/opac-facets.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc index aba1e3b..e272906 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc @@ -19,7 +19,7 @@ !-- /TMPL_UNLESS -- ul !-- TMPL_LOOP NAME=facets --lia href=/cgi-bin/koha/opac-search.pl?!-- TMPL_VAR NAME=query_cgi --!-- TMPL_VAR NAME=limit_cgi --!-- TMPL_IF NAME=sort_by --amp;sort_by=!-- TMPL_VAR NAME=sort_by --!-- /TMPL_IF --amp;limit=!-- TMPL_VAR NAME=type_link_value --:!-- TMPL_VAR NAME=facet_link_value -- title=!-- TMPL_VAR NAME=facet_title_value ESCAPE=HTML --!-- TMPL_VAR NAME=facet_label_value --/a !-- (!-- TMPL_VAR NAME=facet_count --) --/li!-- /TMPL_LOOP --!-- TMPL_IF NAME=expandable -- -li class=showmorea href=/cgi-bin/koha/opac-search.pl?!-- TMPL_VAR NAME=query_cgi --amp;expand=!-- TMPL_VAR NAME=expand --#!-- TMPL_VAR NAME=type_id --Show More/a/li +li class=showmorea href=/cgi-bin/koha/opac-search.pl?!-- TMPL_VAR NAME=query_cgi --!-- TMPL_VAR NAME=limit_cgi --!-- TMPL_IF NAME=sort_by --amp;sort_by=!-- TMPL_VAR NAME=sort_by --!-- /TMPL_IF --amp;expand=!-- TMPL_VAR NAME=expand --#!-- TMPL_VAR NAME=type_id --Show More/a/li !-- /TMPL_IF -- /ul/li !-- /TMPL_LOOP -- -- 1.6.3.3 ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4251 in the staff client
--- .../intranet-tmpl/prog/en/includes/facets.inc |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc index 6855411..ff67047 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc @@ -3,7 +3,7 @@ div id=search-facets h4Refine your search/h4 ul - liAvailabilityulli!-- TMPL_IF NAME=available --Showing only strongavailable/strong items. a href=/cgi-bin/koha/catalogue/search.pl?!-- TMPL_VAR NAME=query_cgi --!-- TMPL_VAR NAME=limit_cgi_not_availablity --!-- TMPL_IF NAME=sort_by --sort_by=!-- TMPL_VAR NAME=sort_by --!-- /TMPL_IF --Show all items/a!-- TMPL_ELSE --Limit to a href=/cgi-bin/koha/catalogue/search.pl?!-- TMPL_VAR NAME=query_cgi --!-- TMPL_VAR NAME=limit_cgi --!-- TMPL_IF NAME=sort_by --sort_by=!-- TMPL_VAR NAME=sort_by --!-- /TMPL_IF --amp;limit=availablecurrently available items./a!-- /TMPL_IF --/li/ul + liAvailabilityulli!-- TMPL_IF NAME=available --Showing only strongavailable/strong items. a href=/cgi-bin/koha/catalogue/search.pl?!-- TMPL_VAR NAME=query_cgi --!-- TMPL_VAR NAME=limit_cgi_not_availablity --!-- TMPL_IF NAME=sort_by --amp;sort_by=!-- TMPL_VAR NAME=sort_by --!-- /TMPL_IF --Show all items/a!-- TMPL_ELSE --Limit to a href=/cgi-bin/koha/catalogue/search.pl?!-- TMPL_VAR NAME=query_cgi --!-- TMPL_VAR NAME=limit_cgi --!-- TMPL_IF NAME=sort_by --amp;sort_by=!-- TMPL_VAR NAME=sort_by --!-- /TMPL_IF --amp;limit=availablecurrently available items./a!-- /TMPL_IF --/li/ul !-- TMPL_IF NAME=related -- li(related searches: !-- TMPL_LOOP NAME=related --!-- TMPL_VAR NAME=related_search --!-- /TMPL_LOOP --)/li!-- /TMPL_IF -- /li @@ -17,8 +17,8 @@ !-- TMPL_IF NAME=type_label_Series --Series!-- /TMPL_IF -- !-- TMPL_IF NAME=type_label_Libraries --Libraries!-- /TMPL_IF -- ul -!-- TMPL_LOOP NAME=facets --lia href=/cgi-bin/koha/catalogue/search.pl?!-- TMPL_VAR NAME=query_cgi --!-- TMPL_VAR NAME=limit_cgi --!-- TMPL_IF NAME=sort_by --sort_by=!-- TMPL_VAR NAME=sort_by --!-- /TMPL_IF --amp;limit=!-- 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=showmorea href=/cgi-bin/koha/catalogue/search.pl?!-- TMPL_VAR NAME=query_cgi --amp;expand=!-- TMPL_VAR NAME=expand --#!-- TMPL_VAR NAME=type_id --Show More/a/li +!-- TMPL_LOOP NAME=facets --lia href=/cgi-bin/koha/catalogue/search.pl?!-- TMPL_VAR NAME=query_cgi --!-- TMPL_VAR NAME=limit_cgi --!-- TMPL_IF NAME=sort_by --amp;sort_by=!-- TMPL_VAR NAME=sort_by --!-- /TMPL_IF --amp;limit=!-- 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=showmorea href=/cgi-bin/koha/catalogue/search.pl?!-- TMPL_VAR NAME=query_cgi --!-- TMPL_VAR NAME=limit_cgi --!-- TMPL_IF NAME=sort_by --amp;sort_by=!-- TMPL_VAR NAME=sort_by --!-- /TMPL_IF --amp;expand=!-- TMPL_VAR NAME=expand --#!-- TMPL_VAR NAME=type_id --Show More/a/li !-- /TMPL_IF -- /ul/li !-- /TMPL_LOOP -- -- 1.6.3.3 ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4250, cart missing print button
- Print button was hidden by CSS for some reason (git blame me)
- Print formatting was off because of column mismatch
- Table style modified in print view for clarity
- Redirect from print view corrected by adding missing bib_list
and verbose parameters
---
koha-tmpl/opac-tmpl/prog/en/css/opac.css |1 -
koha-tmpl/opac-tmpl/prog/en/css/print.css | 19 +-
.../opac-tmpl/prog/en/modules/opac-basket.tmpl | 35 +++
opac/opac-basket.pl|1 +
4 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index b590473..bd072fb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -459,7 +459,6 @@ a .term {
#toolbar a.print {
background: transparent url(../../images/print-small.png) 5px 50%
no-repeat;
- display : none;
text-decoration : none;
padding-left : 23px;
}
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/print.css
b/koha-tmpl/opac-tmpl/prog/en/css/print.css
index cdb4d4c..85df351 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/print.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/print.css
@@ -145,13 +145,28 @@ body#basket a {
font-weight : bold;
}
-body#basket table, body#basket td, body#basket th {
+body#basket table {
+ border-top : 1px solid #EEE;
+ border-left : 1px solid #EEE;
+}
+body#basket td,
+body#basket th {
background-color : transparent;
- border : 0;
padding : 2px;
}
body#basket th {
+ background-color : #EEE;
+}
+
+body#basket th,
+body#basket th[scope=col] {
+ text-align : center;
+ vertical-align : middle;
+}
+
+body#basket th[scope=row] {
+ font-size : 89%;
text-align : right;
vertical-align : top;
width : 10%;
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
index 59691c3..9e5d048 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
@@ -4,6 +4,15 @@
meta http-equiv=Content-Type content=text/html; charset=utf-8 /
link rel=shortcut icon href=!-- TMPL_VAR NAME=themelang
--/includes/favicon.ico type=image/x-icon /
meta http-equiv=Content-Language content=en-us /
+script type=text/javascript src=!-- TMPL_VAR name=themelang
--/lib/jquery/jquery.js/script
+script type=text/javascript
+//![CDATA[
+$(document).ready(function(){
+print();
+location.href=/cgi-bin/koha/opac-basket.pl?bib_list=!-- TMPL_VAR
NAME=bib_list --!-- TMPL_IF NAME=verbose --verbose=1!-- /TMPL_IF --;
+});
+//]]
+/script
style type=text/css
@import url(!-- TMPL_VAR NAME=themelang --/css/print.css);
/style
@@ -13,13 +22,11 @@
script type=text/javascript
//![CDATA[
-$(document).ready(function()
-{
-$(#itemst).tablesorter({
-headers: { 0: { sorter: false }}
-});
-}
-);
+$(document).ready(function(){
+$(#itemst).tablesorter({
+headers: { 0: { sorter: false }}
+});
+});
var MSG_NO_TAG_SPECIFIED = _(No tag was specified.);
@@ -117,13 +124,13 @@ function tagAdded() {
/script
!-- /TMPL_IF --
/head
-!-- TMPL_IF NAME=print_basket --body id=basket
onload=print();history.back();!-- TMPL_ELSE --body id=basket!--
/TMPL_IF --
+body id=basket
div id=doc class=yui-t7
div class=container
-!-- TMPL_UNLESS NAME=print_basket --
h1Your Cart/h1
+!-- TMPL_UNLESS NAME=print_basket --
div id=toolbar
ul
li!-- TMPL_IF NAME=verbose --a href=opac-basket.pl
class=brief onclick=showLess(); return false;Brief Display/a!--
TMPL_ELSE --a href=opac-basket.pl class=detail onclick=showMore();
return false;More Details/a!-- /TMPL_IF --/li
@@ -327,11 +334,11 @@ function tagAdded() {
input id=tagsel_button name=tagsel_button class=input
tagsel_button title=tagsel_button type=submit value=Add
style=display:inline/
a href=# id=tagsel_cancel onclick=tagCanceled(); return false;
style=display:inlineCancel/a
/span
-!-- /TMPL_UNLESS --
/p
+!-- /TMPL_UNLESS --
table id=itemst
theadtr
- thnbsp;/th
+ !-- TMPL_UNLESS NAME=print_basket --thnbsp;/th!--
/TMPL_UNLESS --
thTitle/th
thAuthor/th
thYear/th
@@ -377,13 +384,11 @@ function tagAdded() {
/table/form
!-- /TMPL_IF --
-!-- TMPL_IF NAME=print_basket --
-a href=#back class=screenlt;lt; Back to Cart/a
-!-- TMPL_ELSE --
+!-- TMPL_UNLESS NAME=print_basket --
form name=myform action=opac-basket.pl method=get
input type=hidden name=records id=records /
/form
-!-- /TMPL_IF --
+!-- /TMPL_UNLESS --
/div
/div
diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl
index 26e2e17..9562d2f 100755
--- a/opac/opac-basket.pl
+++ b/opac/opac-basket.pl
@@ -115,6
[Koha-patches] [PATCH] Fix for Bug 4214, Your Cart is Currently Empty popup displays underneath News header
---
.../intranet-tmpl/prog/en/css/staff-global.css |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 190c9da..cf72ba8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1830,6 +1830,7 @@ h1#xml a {
padding : 10px;
text-align : center;
width : 180px;
+ z-index : 50;
}
#cartmenulink {
background: transparent url(../../img/cart-small.gif) 0 3px
no-repeat;
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4244, Use checkouts instead of issues
---
.../prog/en/modules/members/member.tmpl|2 +-
.../prog/en/modules/reports/bor_issues_top.tmpl|2 +-
.../prog/en/modules/reports/borrowers_out.tmpl |2 +-
koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tmpl |2 +-
.../opac-tmpl/prog/en/modules/sco/receipt.tmpl |2 +-
.../opac-tmpl/prog/en/modules/sco/sco-main.tmpl|2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index 0cf952a..39dd8f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -37,7 +37,7 @@
thCat/th
thLibrary/th
thExpires on/th
- thOD/Issues/th
+ thOD/Checkouts/th
thFines/th
thCirc note/th
thnbsp;/th
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
index 689d478..b20a2f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
@@ -42,7 +42,7 @@ function Dopop(link) {
tr
!-- TMPL_LOOP NAME=loopcol --
thPatron/th
- thIssues count/th
+ thCheckout count/th
!-- /TMPL_LOOP --
/tr
!-- TMPL_LOOP NAME=looprow --
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
index 4525103..d624f99 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
@@ -58,7 +58,7 @@
!--/TMPL_LOOP --
/select
/li
- lilabel for=toWithout issues since: /label input size=10
id=to name=Filter value= type=text /
+ lilabel for=toNot checked out since: /label input size=10
id=to name=Filter value= type=text /
img src=!-- TMPL_VAR Name=themelang
--/lib/calendar/cal.gif alt=Show Calendar id=openCalendarTo
style=cursor: pointer; border=0 /
script type=text/javascript
Calendar.setup(
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tmpl
index 01abb42..9f594c6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tmpl
@@ -21,7 +21,7 @@ yourself started./p
h3Step Two: Scan the barcode for each item, one at a time/h3
pScan each item and wait for the page to reload before scanning the next
item.
-The checked-out item should appear in your issues list.
+The checked-out item should appear in your checkouts list.
The Submit button only needs to be clicked if you enter the barcode
manually./p
h3Step Three: Click the 'Click here if done' link when done/h3
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tmpl
index d403a20..d4809d2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tmpl
@@ -36,7 +36,7 @@ function closeNow()
!-- begin code Mamata--
!-- TMPL_IF name=todayissues --br
-pbToday's issues/b/p
+pbToday's checkouts/b/p
!-- TMPL_LOOP name=todayissues --br
!-- TMPL_VAR NAME=title escape=html --br
!-- TMPL_VAR NAME=author --br
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tmpl
index 3bfde99..0ac11f5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tmpl
@@ -188,7 +188,7 @@ Sorry, This Self-Checkout Station has lost authentication.
Please contact the a
div id=borrowerdetails
!-- TMPL_IF NAME=issues_count --
- table id=loanTablecaptionIssues for !-- TMPL_VAR
NAME='borrowername' -- span class=count(!-- TMPL_VAR NAME=issues_count
-- total)/span/caption
+ table id=loanTablecaptionCheckouts for !-- TMPL_VAR
NAME='borrowername' -- span class=count(!-- TMPL_VAR NAME=issues_count
-- total)/span/caption
!-- ISSUES TABLE ROWS --
thead
trthTitle/ththCall
[Koha-patches] [PATCH] Fix for Bug 4167, Tag link styled incorrectly on Cart popup
- Removing DOM creation of tag and hold links: if the Cart is working,
the user must have JavaScript enabled. Therefore we can assume
tagging and holds will work
- Conditionally displaying some JavaScript based on whether tagging
or placing holds is allowed
---
.../opac-tmpl/prog/en/modules/opac-basket.tmpl | 33
1 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
index 59691c3..78bb779 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
@@ -21,7 +21,7 @@ $(document).ready(function()
}
);
-
+!-- TMPL_IF NAME=TagsEnabled --
var MSG_NO_TAG_SPECIFIED = _(No tag was specified.);
function tagSelected() {
@@ -67,7 +67,7 @@ function tagAdded() {
KOHA.Tags.add_multitags_button(bibs, tag);
return false;
}
-
+!-- /TMPL_IF --
$(document).ready(function(){
$(#CheckAll).click(function(){
var checked = [];
@@ -87,23 +87,15 @@ function tagAdded() {
);
return false;
});
-!-- TMPL_IF NAME=RequestOnOpac --
-$(.holdsep).text(| );
-$(.hold).text(_(Place Hold));
-!-- /TMPL_IF --
!-- TMPL_IF NAME=TagsEnabled --
-!-- TMPL_IF NAME=TagsInputOnList --
- $(.tagsep).text(| );
- $(#tagsel_tag).text(_(Tag));
$(#tagsel_button).click(function(){
tagAdded();
return false;
});
!-- /TMPL_IF --
-!-- /TMPL_IF --
});
-
+!-- TMPL_IF NAME=RequestOnOpac --
function holdSel() {
var items = document.getElementById('records').value;
if (items) {
@@ -112,7 +104,7 @@ function tagAdded() {
alert(MSG_NO_RECORD_SELECTED);
}
}
-
+!-- /TMPL_IF --
//]]
/script
!-- /TMPL_IF --
@@ -143,10 +135,10 @@ function tagAdded() {
!-- TMPL_IF NAME=loggedinusername --
| a href=# onclick=addSelToShelf(); return false;Add to a list/a
!-- /TMPL_IF --
- span class=holdsep/span
- a href=# onclick=holdSel(); return false;span
class=hold/span/a
- span class=tagsep/span
- a href=# onclick=tagSelected(); return false;span
id=tagsel_tag/span/a
+
+ !-- TMPL_IF NAME=RequestOnOpac --| a href=# onclick=holdSel();
return false;Place hold/a!-- /TMPL_IF --
+ !-- TMPL_IF NAME=TagsEnabled --
+ | a href=# onclick=tagSelected(); return false;Tag/a!-- /TMPL_IF
--
/span
span id=tagsel_form style=display:none
label for=tagsel_new style=display:inlineNewnbsp;Tag:/label
@@ -315,11 +307,12 @@ function tagAdded() {
| bSelected items :/b
span id=tag_hides
a href=# onclick=delSelRecords(); return false;Remove/a
-!-- TMPL_IF NAME=loggedinusername --
+!-- TMPL_IF NAME=virtualshelves --!-- TMPL_IF NAME=loggedinusername --
| a href=# onclick=addSelToShelf(); return false;Add to a list/a
-!-- /TMPL_IF --
- span class=holdsep/spana href=# onclick=holdSel(); return
false;span class=hold/span/a
- span class=tagsep/spana href=# onclick=tagSelected(); return
false;span id=tagsel_tag/span/a
+!-- /TMPL_IF --!-- /TMPL_IF --
+ !-- TMPL_IF NAME=RequestOnOpac --| a href=# onclick=holdSel();
return false;Place hold/a!-- /TMPL_IF --
+ !-- TMPL_IF NAME=TagsEnabled --
+ | a href=# onclick=tagSelected(); return false;Tag/a!-- /TMPL_IF
--
/span
span id=tagsel_form style=display:none
label for=tagsel_new style=display:inlineNewnbsp;Tag:/label
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4235, Date picker broken if placing multiple holds
Also includes minor style change.
---
.../opac-tmpl/prog/en/modules/opac-reserve.tmpl| 11 +--
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index 4e9b022..812c91b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
@@ -304,8 +304,7 @@
!-- TMPL_IF NAME=reserve_in_future --
td
input name=reserve_date_!-- TMPL_VAR
NAME=biblionumber -- id=reserve_date_!-- TMPL_VAR NAME=biblionumber
-- size=10
- !-- img src=!-- TMPL_VAR NAME=themelang
--/lib/calendar/cal.gif alt=Show Calendar border=0
id=CalendarReserveDate!-- TMPL_VAR NAME=biblionumber -- style=cursor:
pointer; / --
- script language=JavaScript type=text/javascript
+ script language=JavaScript type=text/javascript
//![CDATA[
$(#reserve_date_!-- TMPL_VAR NAME=biblionumber
--).attr( 'readonly', 'readonly' );
@@ -344,7 +343,7 @@
!-- /TMPL_IF --
td
input name=expiration_date_!-- TMPL_VAR NAME=biblionumber --
id=expiration_date_!-- TMPL_VAR NAME=biblionumber -- size=10
readonly=readonly /
- img src=!-- TMPL_VAR NAME=themelang --/lib/calendar/cal.gif
alt=Show Calendar border=0 id=CalendarExpirationDate style=cursor:
pointer; /
+ img src=!-- TMPL_VAR NAME=themelang --/lib/calendar/cal.gif
alt=Show Calendar border=0 id=CalendarExpirationDate_!-- TMPL_VAR
NAME=biblionumber -- style=cursor: pointer; /
script language=JavaScript type=text/javascript
//![CDATA[
function validate1(date) {
@@ -362,15 +361,15 @@
{
inputField : expiration_date_!-- TMPL_VAR
NAME=biblionumber --,
ifFormat : !-- TMPL_VAR
NAME=DHTMLcalendar_dateformat --,
- button : CalendarExpirationDate,
+ button : CalendarExpirationDate_!-- TMPL_VAR
NAME=biblionumber --,
disableFunc : validate1,
dateStatusFunc : validate1,
}
);
//]]
/script
- br/
- a href='#'
onclick=document.getElementById('expiration_date_!-- TMPL_VAR
NAME=biblionumber --').value='';Clear Date/a
+ p style=margin:.3em 2em;
+ a href=# style=font-size:85%;text-decoration:none;
onclick=document.getElementById('expiration_date_!-- TMPL_VAR
NAME=biblionumber --').value='';return false;Clear Date/a/p
/td
!-- TMPL_IF NAME=OPACItemHolds --
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Removing bogus style declaration
---
.../prog/en/modules/circ/returns.tmpl |3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index 644f4af..fef7c57 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -1,9 +1,6 @@
!-- TMPL_INCLUDE NAME=doc-head-open.inc --
titleKoha rsaquo; Circulation rsaquo; Check In !-- TMPL_VAR Name=title
escape=html --/title
!-- TMPL_INCLUDE NAME=doc-head-close.inc --
-style type=text/css
-background-color: red;
-/style
script type=text/javascript
//![CDATA[
function Dopop(link) {
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4219, strange artifacts showing on lists in the staff client
Recent change to C4/VirtualShelves/Page.pm caused display of subtitles
to break in the staff client display of lists
---
.../prog/en/modules/virtualshelves/shelves.tmpl|2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index 64f9d67..8be08e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -203,7 +203,7 @@ function placeHold () {
!-- TMPL_ELSE --
a class=title
href=/cgi-bin/koha/catalogue/detail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --
!-- /TMPL_IF --
- !-- TMPL_VAR NAME=title escape=html -- !--
TMPL_VAR NAME=subtitle --/a
+ !-- TMPL_VAR NAME=title escape=html --!--
TMPL_LOOP NAME=subtitle -- !-- TMPL_VAR NAME=subfield --!-- /TMPL_LOOP
--/a
/td
td!-- TMPL_VAR NAME=author --/td
td!-- TMPL_VAR NAME=dateadded --/td
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Changes to further work on Bug 3550, Use GetRecordValue to get the subtitle
- Adding subtitle display to OPAC Cart, lists, and reading record
- Minor tweaks to some displays
---
C4/VirtualShelves/Page.pm | 12 ++--
.../prog/en/modules/catalogue/detail.tmpl |4 ++--
.../opac-tmpl/prog/en/modules/opac-basket.tmpl |6 +++---
.../opac-tmpl/prog/en/modules/opac-detail.tmpl |4 ++--
.../prog/en/modules/opac-readingrecord.tmpl|4 +++-
.../opac-tmpl/prog/en/modules/opac-shelves.tmpl|3 ++-
opac/opac-basket.pl|2 ++
opac/opac-readingrecord.pl |7 +--
8 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 14f9816..ee105f4 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -197,7 +197,7 @@ sub shelfpage ($) {
$this_item-{'dateadded'} = format_date(
$this_item-{'dateadded'} );
$this_item-{'imageurl'} = getitemtypeinfo(
$this_item-{'itemtype'} )-{'imageurl'};
$this_item-{'coins'} = GetCOinSBiblio(
$this_item-{'biblionumber'} );
-$this_item-{'subtitle'} =
C4::Biblio::get_koha_field_from_marc( 'bibliosubtitle', 'subtitle', $record, ''
);
+$this_item-{'subtitle'} = GetRecordValue('subtitle',
$record, GetFrameworkCode($this_item-{'biblionumber'}));
# Getting items infos for location display
my @items_infos = GetItemsInfo(
$this_item-{'biblionumber'}, $type );
@@ -348,10 +348,10 @@ sub shelfpage ($) {
$template-param( seflag = 1 );
}
-#FIXME:This refresh really only needs to happen when there is a
modification of some sort
-# to the shelves, but the above code is so convoluted in its
handling of the various
-# options, it is easier to do this refresh every time
C4::VirtualShelves::Page.pm is
-# called
+#FIXME: This refresh really only needs to happen when there is a
modification of some sort
+# to the shelves, but the above code is so convoluted in its
handling of the various
+# options, it is easier to do this refresh every time
C4::VirtualShelves::Page.pm is
+# called
my ( $total, $pubshelves, $barshelves ) = RefreshShelvesSummary(
$query-cookie(CGISESSID), $loggedinuser, ( $loggedinuser == -1 ? 20 : 10 ) );
@@ -419,4 +419,4 @@ __END__
=back
-=cut
+=cut
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 0f6dac9..3d8a9af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -1,5 +1,5 @@
!-- TMPL_INCLUDE NAME=doc-head-open.inc --
-titleKoha rsaquo; Catalog rsaquo; Details for !-- TMPL_VAR NAME=title
escape=html --/title
+titleKoha rsaquo; Catalog rsaquo; Details for !-- TMPL_VAR NAME=title
escape=html -- !-- TMPL_LOOP NAME=subtitle -- !-- TMPL_VAR
NAME=subfield --!-- /TMPL_LOOP --/title
!-- TMPL_INCLUDE NAME=doc-head-close.inc --script type=text/JavaScript
language=JavaScript
//![CDATA[
// http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html
@@ -44,7 +44,7 @@ function verify_images() {
!-- TMPL_INCLUDE NAME=header.inc --
!-- TMPL_INCLUDE NAME=cat-search.inc --
-div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo; a
href=/cgi-bin/koha/catalogue/search.plCatalog/a rsaquo; Details for
i!-- TMPL_VAR NAME=title escape=html --/i/div
+div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo; a
href=/cgi-bin/koha/catalogue/search.plCatalog/a rsaquo; Details for
i!-- TMPL_VAR NAME=title escape=html -- !-- TMPL_LOOP NAME=subtitle
-- !-- TMPL_VAR NAME=subfield --!-- /TMPL_LOOP --/i/div
div id=doc3 class=yui-t2
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
index 3e2809b..ed47772 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
@@ -161,12 +161,12 @@ function tagAdded() {
h3
!-- TMPL_IF NAME=print_basket --
!-- TMPL_VAR NAME=title escape=html --
-!-- TMPL_IF name=subtitle -- !-- TMPL_VAR NAME=subtitle
--!-- /TMPL_IF --
+!-- TMPL_IF name=subtitle -- !-- TMPL_LOOP
NAME=subtitle --!-- TMPL_VAR NAME=subfield --!-- /TMPL_LOOP --!--
/TMPL_IF --
!-- TMPL_IF name=author -- !-- TMPL_VAR NAME=author
--!-- /TMPL_IF --
!-- TMPL_ELSE --
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_VAR NAME=title escape=html --
-
[Koha-patches] [PATCH] Perltidy of C4/VirtualShelves/Page.pm
---
C4/VirtualShelves/Page.pm | 619 +++--
1 files changed, 316 insertions(+), 303 deletions(-)
diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 658b9ac..14f9816 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -38,328 +38,341 @@ use C4::Csv;
use vars qw($debug @EXPORT @ISA $VERSION);
BEGIN {
- $VERSION = 1.01;
- @ISA = qw(Exporter);
- @EXPORT = qw(shelfpage);
-$debug = $ENV{DEBUG} || 0;
+$VERSION = 1.01;
+@ISA = qw(Exporter);
+@EXPORT = qw(shelfpage);
+$debug = $ENV{DEBUG} || 0;
}
our %pages = (
- intranet = {
- redirect='/cgi-bin/koha/virtualshelves/shelves.pl',
- },
- opac = {
- redirect='/cgi-bin/koha/opac-shelves.pl',
- },
+intranet = { redirect = '/cgi-bin/koha/virtualshelves/shelves.pl', },
+opac = { redirect = '/cgi-bin/koha/opac-shelves.pl', },
);
sub shelfpage ($) {
- my ($type, $query, $template, $loggedinuser, $cookie ) = @_;
- ($pages{$type}) or $type = 'opac';
- $query or die No query;
- $template or die No template;
- $template-param( { loggedinuser = $loggedinuser } );
- my @paramsloop;
- my $totitems;
- my $shelfoff = ($query-param('shelfoff') ? $query-param('shelfoff') :
1);
- my $itemoff = ($query-param('itemoff') ? $query-param('itemoff') : 1);
- my $displaymode = ($query-param('display') ? $query-param('display')
: 'publicshelves');
- my ($shelflimit, $shelfoffset, $shelveslimit, $shelvesoffset);
- # FIXME: These limits should not be hardcoded...
- $shelflimit = 20; # Limits number of items returned for a given
query
- $shelfoffset = ($itemoff - 1) * 20; # Sets the offset to
begin retrieving items at
- $shelveslimit = 20; # Limits number of shelves returned for a given
query (row_count)
- $shelvesoffset = ($shelfoff - 1) * 20; # Sets the offset to
begin retrieving shelves at (offset)
- # getting the Shelves list
- my $category = (($displaymode eq 'privateshelves') ? 1 : 2);
- my ($shelflist, $totshelves) = GetShelves( $category, $shelveslimit,
$shelvesoffset, $loggedinuser );
- #Get a list of private shelves for possible deletion. Only do this when
we've defaulted to public shelves
-my ($privshelflist, $privtotshelves);
-if ($category == 2) {
-($privshelflist, $privtotshelves) = GetShelves( 1, $shelveslimit,
$shelvesoffset, $loggedinuser );
+my ( $type, $query, $template, $loggedinuser, $cookie ) = @_;
+( $pages{$type} ) or $type = 'opac';
+$queryor die No query;
+$template or die No template;
+$template-param( { loggedinuser = $loggedinuser } );
+my @paramsloop;
+my $totitems;
+my $shelfoff= ( $query-param('shelfoff') ? $query-param('shelfoff')
: 1 );
+my $itemoff = ( $query-param('itemoff') ? $query-param('itemoff')
: 1 );
+my $displaymode = ( $query-param('display') ? $query-param('display')
: 'publicshelves' );
+my ( $shelflimit, $shelfoffset, $shelveslimit, $shelvesoffset );
+
+# FIXME: These limits should not be hardcoded...
+$shelflimit= 20;# Limits number of items
returned for a given query
+$shelfoffset = ( $itemoff - 1 ) * 20; # Sets the offset to begin
retrieving items at
+$shelveslimit = 20;# Limits number of shelves
returned for a given query (row_count)
+$shelvesoffset = ( $shelfoff - 1 ) * 20;# Sets the offset to begin
retrieving shelves at (offset)
+# getting the Shelves list
+my $category = ( ( $displaymode eq 'privateshelves' ) ? 1 : 2 );
+my ( $shelflist, $totshelves ) = GetShelves( $category, $shelveslimit,
$shelvesoffset, $loggedinuser );
+
+#Get a list of private shelves for possible deletion. Only do this when
we've defaulted to public shelves
+my ( $privshelflist, $privtotshelves );
+if ( $category == 2 ) {
+( $privshelflist, $privtotshelves ) = GetShelves( 1, $shelveslimit,
$shelvesoffset, $loggedinuser );
+}
+my $op = $query-param('op');
+
+#my $imgdir = getitemtypeimagesrc();
+#my $itemtypes = GetItemTypes();
+
+# the format of this is unindented for ease of diff comparison to the old
script
+# Note: do not mistake the assignment statements below for comparisons!
+
+if ( $query-param('modifyshelfcontents') ) {
+my ( $shelfnumber, $barcode, $item, $biblio );
+if ( $shelfnumber = $query-param('viewshelf') ) {
+if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' )
) {
+if ( $barcode = $query-param('addbarcode') ) {
+if ( $item = GetItem( 0, $barcode ) ) {
+$biblio = GetBiblioFromItemNumber(
[Koha-patches] [PATCH] Additional changes to fix Bug 3920, XSLTdetailDisplay syspref controls both OPAC and Intranet
This patch adds XSLTDetailsDisplay and XSLTResultsDisplay variables
for the staff client, OPACXSLTDetailsDisplay and OPACXSLTResultsDisplay
variables to the OPAC. Note that the XSLTResultsDisplay doesn't actually
do anything because no one has added an XSLT version of search results
to the staff client.
---
C4/Auth.pm |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/C4/Auth.pm b/C4/Auth.pm
index e156474..fe79fe5 100755
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -350,8 +350,8 @@ sub get_template_and_user {
'item-level_itypes' =
C4::Context-preference('item-level_itypes'),
patronimages =
C4::Context-preference(patronimages),
singleBranchMode =
C4::Context-preference(singleBranchMode),
-OPACXSLTDetailsDisplay =
C4::Context-preference(XSLTDetailsDisplay),
-OPACXSLTResultsDisplay =
C4::Context-preference(XSLTResultsDisplay),
+XSLTDetailsDisplay =
C4::Context-preference(XSLTDetailsDisplay),
+XSLTResultsDisplay =
C4::Context-preference(XSLTResultsDisplay),
BranchesLoop = GetBranchesLoop(),
);
@@ -453,6 +453,8 @@ sub get_template_and_user {
virtualshelves= .
C4::Context-preference(virtualshelves),
OPACSerialIssueDisplayCount =
C4::Context-preference(OPACSerialIssueDisplayCount),
OpacAddMastheadLibraryPulldown =
C4::Context-preference(OpacAddMastheadLibraryPulldown),
+OPACXSLTDetailsDisplay =
C4::Context-preference(OPACXSLTDetailsDisplay),
+OPACXSLTResultsDisplay =
C4::Context-preference(OPACXSLTResultsDisplay)
);
}
$template-param(listloop=[{shelfname=Freelist, shelfnumber=110}]);
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 2970, Create a permission for modifying holds priority
Adding two new granular permissions under 'reserveforothers,' place_holds
and modify_holds_priority. If a user does not have modify_holds_priority
permission, the option to change the priority of a hold is hidden.
---
installer/data/mysql/updatedatabase.pl | 13 +
.../prog/en/modules/reserve/request.tmpl | 12 ++--
reserve/request.pl |2 +-
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/installer/data/mysql/updatedatabase.pl
b/installer/data/mysql/updatedatabase.pl
index 32ad48b..dc3fffe 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3445,6 +3445,19 @@ if (C4::Context-preference(Version)
TransformToNum($DBversion)) {
SetVersion ($DBversion);
}
+$DBversion = 3.01.00.XXX;
+if (C4::Context-preference(Version) TransformToNum($DBversion)) {
+$dbh-do(INSERT INTO `permissions` (`module_bit`, `code`, `description`)
VALUES
+(6, 'place_holds', 'Place holds for patrons'));
+$dbh-do(INSERT INTO `permissions` (`module_bit`, `code`, `description`)
VALUES
+(6, 'modify_holds_priority', 'Modify holds priority'));
+$dbh-do(UPDATE `userflags` SET `flagdesc` = 'Place and modify holds for
patrons' WHERE `flag` = 'reserveforothers');
+print Upgrade to $DBversion done (Add granular permission for holds
modification and update description of reserveforothers permission)\n;
+SetVersion ($DBversion);
+}
+
+
+
=item DropAllForeignKeys($table)
Drop all foreign keys of the table $table
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
index 51c4e0a..ffc84b6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -270,7 +270,7 @@ function checkMultiHold() {
/li
!-- TMPL_UNLESS NAME=multi_hold --
li
- span class=labelPriority:/span
+ span class=labelPriority:/span
strong!-- TMPL_VAR Name=fixedRank --/strong
/li
!-- /TMPL_UNLESS --
@@ -463,7 +463,7 @@ function checkMultiHold() {
img src=!-- TMPL_VAR name=imageurl -- alt=!-- TMPL_VAR
NAME=itypename -- title=!-- TMPL_VAR NAME=itypename -- /
/td
!-- /TMPL_UNLESS --
- td!-- TMPL_VAR NAME=rank --/td
+td!-- TMPL_VAR NAME=rank --/td
td
!-- TMPL_IF NAME=alreadyres --
ul
@@ -529,7 +529,7 @@ function checkMultiHold() {
captiona
href=/cgi-bin/koha/catalogue/detail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber --!-- TMPL_VAR NAME=title ESCAPE=html
--/a/caption
!-- /TMPL_IF --
tr
-thPriority/th
+!-- TMPL_IF NAME=CAN_user_reserveforothers_modify_holds_priority
--thPriority/th!-- TMPL_ELSE --thDelete?/th!-- /TMPL_IF --
thPatron/th
thNotes/th
thDate/th
@@ -545,9 +545,9 @@ function checkMultiHold() {
!-- TMPL_IF Name=wait --
option value=W selected=selectedWaiting/option
!-- /TMPL_IF --
- !-- TMPL_LOOP Name=optionloop --
- !-- TMPL_IF Name=selected --option value=!-- TMPL_VAR NAME=num
-- selected=selected!-- TMPL_VAR NAME=num --/option!-- TMPL_ELSE
--option value=!-- TMPL_VAR NAME=num --!-- TMPL_VAR NAME=num
--/option!-- /TMPL_IF --
- !-- /TMPL_LOOP --
+ !-- TMPL_IF NAME=CAN_user_reserveforothers_modify_holds_priority
--!-- TMPL_LOOP Name=optionloop --
+!-- TMPL_IF Name=selected --option value=!-- TMPL_VAR
NAME=num -- selected=selected!-- TMPL_VAR NAME=num --/option!--
TMPL_ELSE --option value=!-- TMPL_VAR NAME=num --!-- TMPL_VAR
NAME=num --/option!-- /TMPL_IF --
+!-- /TMPL_LOOP --!-- TMPL_ELSE --option value=/option!--
/TMPL_IF --
option value=deldel/option
/select
/td
diff --git a/reserve/request.pl b/reserve/request.pl
index 908a626..3c6ac59 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -51,7 +51,7 @@ my ( $template, $borrowernumber, $cookie ) =
get_template_and_user(
query = $input,
type= intranet,
authnotrequired = 0,
-flagsrequired = { reserveforothers = 1 },
+flagsrequired = { reserveforothers = 'place_holds' },
}
);
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 2970, Create a permission for modifying holds priority
Adding two new granular permissions under 'reserveforothers,' place_holds and modify_holds_priority. If a user does not have modify_holds_priority permission, the option to change the priority of a hold is hidden. Revised patch includes changes to mandatory data files including properly translated fr-FR version. --- installer/data/mysql/en/mandatory/userflags.sql|2 +- .../data/mysql/en/mandatory/userpermissions.sql|2 + .../data/mysql/fr-FR/1-Obligatoire/userflags.sql |2 +- .../mysql/fr-FR/1-Obligatoire/userpermissions.sql |2 + installer/data/mysql/pl-PL/mandatory/userflags.sql |2 +- .../data/mysql/pl-PL/mandatory/userpermissions.sql |2 + .../data/mysql/ru-RU/mandatory/user_flags.sql |2 +- .../data/mysql/ru-RU/mandatory/userpermissions.sql |2 + .../data/mysql/uk-UA/mandatory/user_flags.sql |2 +- .../data/mysql/uk-UA/mandatory/userpermissions.sql | 40 .../data/mysql/uk-UA/mandatory/userpermissions.txt |1 + installer/data/mysql/updatedatabase.pl | 13 ++ .../prog/en/modules/reserve/request.tmpl | 12 +++--- reserve/request.pl |2 +- 14 files changed, 74 insertions(+), 12 deletions(-) create mode 100644 installer/data/mysql/uk-UA/mandatory/userpermissions.sql create mode 100644 installer/data/mysql/uk-UA/mandatory/userpermissions.txt diff --git a/installer/data/mysql/en/mandatory/userflags.sql b/installer/data/mysql/en/mandatory/userflags.sql index 9f84d78..e9d9b2e 100644 --- a/installer/data/mysql/en/mandatory/userflags.sql +++ b/installer/data/mysql/en/mandatory/userflags.sql @@ -4,7 +4,7 @@ INSERT INTO `userflags` VALUES(2,'catalogue','View Catalog (Librarian Interface) INSERT INTO `userflags` VALUES(3,'parameters','Set Koha system parameters',0); INSERT INTO `userflags` VALUES(4,'borrowers','Add or modify borrowers',0); INSERT INTO `userflags` VALUES(5,'permissions','Set user permissions',0); -INSERT INTO `userflags` VALUES(6,'reserveforothers','Reserve books for patrons',0); +INSERT INTO `userflags` VALUES(6,'reserveforothers','Place and modify holds for patrons',0); INSERT INTO `userflags` VALUES(7,'borrow','Borrow books',1); INSERT INTO `userflags` VALUES(9,'editcatalogue','Edit Catalog (Modify bibliographic/holdings data)',0); INSERT INTO `userflags` VALUES(10,'updatecharges','Update borrower charges',0); diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/installer/data/mysql/en/mandatory/userpermissions.sql index fc9f305..d737ae6 100644 --- a/installer/data/mysql/en/mandatory/userpermissions.sql +++ b/installer/data/mysql/en/mandatory/userpermissions.sql @@ -1,6 +1,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'), ( 1, 'override_renewals', 'Override blocked renewals'), + ( 6, 'place_holds', 'Place holds for patrons'), + ( 6, 'modify_holds_priority', 'Modify holds priority'), ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'), ( 9, 'fast_cataloging', 'Fast cataloging'), (11, 'vendors_manage', 'Manage vendors'), diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql b/installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql index 2cd644f..68fea6e 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql @@ -6,7 +6,7 @@ INSERT INTO `userflags` VALUES(2,'catalogue','Consultation du catalogue (interfa INSERT INTO `userflags` VALUES(3,'parameters','Définition des paramètres de l''application',0); INSERT INTO `userflags` VALUES(4,'borrowers','Gestion des lecteurs',0); INSERT INTO `userflags` VALUES(5,'permissions','Définition des habilitations',0); -INSERT INTO `userflags` VALUES(6,'reserveforothers','Gestion des réservations',0); +INSERT INTO `userflags` VALUES(6,'reserveforothers','Ajout et modifications des réservations des adhérents',0); INSERT INTO `userflags` VALUES(7,'borrow','Circulation (inutile normalement)',1); INSERT INTO `userflags` VALUES(9,'editcatalogue','fonctions de catalogage',0); INSERT INTO `userflags` VALUES(10,'updatecharges','Gestion des pénalités financières',0); diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql index 4e1902d..364469b 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql @@ -1,6 +1,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'), ( 1, 'override_renewals', 'Override blocked renewals'), + ( 6, 'place_holds', 'Réserver pour des adhérents'), + ( 6, 'modify_holds_priority', 'Modifier la priorité des réservations'), ( 9, 'edit_catalogue',
[Koha-patches] [PATCH] Markup error, closing tag missing
---
.../prog/en/modules/catalogue/detail.tmpl |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index c9c1e97..0f6dac9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -319,7 +319,7 @@ function verify_images() {
tda
href=/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtypeamp;bi=!-- TMPL_VAR
NAME=biblioitemnumber --amp;item=!-- TMPL_VAR NAME=itemtype --Fix
Itemtype/a/td
!-- /TMPL_IF --
!-- TMPL_IF NAME=SpineLabelShowPrintOnBibDetails --
- tda
href=/cgi-bin/koha/labels/spinelabel-print.pl?barcode=!-- TMPL_VAR
NAME=barcode -- Print Label/td
+ tda
href=/cgi-bin/koha/labels/spinelabel-print.pl?barcode=!-- TMPL_VAR
NAME=barcode -- Print Label/a/td
!-- /TMPL_IF --
/tr
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4136, Invalid XHTML in spinelabel-print view
---
.../prog/en/modules/labels/spinelabel-print.tmpl | 31 ---
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl
index 1530f43..d7c1da5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl
@@ -1,26 +1,33 @@
-html
- head
- titleKoha rsaquo; Tools rsaquo; Spine Labels/title
- link rel=stylesheet type=text/css href=!-- TMPL_VAR
name=themelang --/css/spinelabel.css /
+!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;
+html lang=!-- TMPL_VAR NAME=lang -- xml:lang=!-- TMPL_VAR NAME=lang
-- !-- TMPL_IF NAME=bidi --dir=!-- TMPL_VAR NAME=bidi --!--
/TMPL_IF -- xmlns=http://www.w3.org/1999/xhtml;
+head
+ titleKoha rsaquo; Tools rsaquo; Spine Labels/title
+ meta http-equiv=Content-Type content=text/html; charset=utf-8 /
+ link rel=stylesheet type=text/css href=!-- TMPL_VAR
name=themelang --/css/spinelabel.css /
- style type=text/css
- @media print {
- .noprint { display: none; }
- }
- /style
- /head
+ style type=text/css
+ @media print {
+ .noprint { display: none; }
+ }
+ /style
+/head
!-- TMPL_IF NAME=BarcodeNotFound --
body
pThe barcode !-- TMPL_VAR NAME=Barcode -- was not
found./p
pa href=spinelabel-home.plReturn To Spine Label
Printer/a/p
/body
!-- TMPL_ELSE --
- body !-- TMPL_IF NAME=autoprintonLoad=window.print()!--
/TMPL_IF
+ !-- TMPL_IF NAME=autoprint --
+ body onLoad=window.print()
+ !-- TMPL_ELSE --
+ body
+ !-- /TMPL_IF --
span id=spinelabel class=label
!-- TMPL_VAR NAME=content --
/span
span id=print_button class=noprint
- forminput type=button value=Print This
Label onClick=window.print() //form
+ button onclick=window.print()Print This
Label/button
/span
/body
!-- /TMPL_IF --
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
Re: [Koha-patches] [PATCH] Fix for Bug 2869, 'do not delete' marc framework tag - reverts to 'default' framework
On Thu, Dec 24, 2009 at 9:35 PM, Owen Leonard oleon...@myacpl.org wrote: - Do not delete form was missing hidden framework code input. - Also added details to breadcrumb navigation --- .../prog/en/modules/admin/marctagstructure.tmpl | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) This patch still applies and the bug is still valid. Can this be pushed? Thanks, Owen -- Web Developer Athens County Public Libraries http://www.myacpl.org ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4093, OPAC Suggestions List has extra column
- This code was added to opac-suggestions.pl at one point by
Garry Collum and was subsequently removed. Adding it back.
---
opac/opac-suggestions.pl |9 +
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl
index 12eea5f..f22d06e 100755
--- a/opac/opac-suggestions.pl
+++ b/opac/opac-suggestions.pl
@@ -103,6 +103,15 @@ foreach my $support(@$supportlist){
delete $$support{'imageurl'}
}
}
+
+foreach my $suggestion(@$suggestions_loop) {
+if($suggestion-{'suggestedby'} == $borrowernumber) {
+$suggestion-{'showcheckbox'} = $borrowernumber;
+} else {
+$suggestion-{'showcheckbox'} = 0;
+}
+}
+
$template-param(
%$suggestion,
itemtypeloop= $supportlist,
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4138, Adding or deleting suggestions in the OPAC does not properly refresh the page
- Using redirect() and adding URL parameter to enable the display of
messages on the screen confirming the action.
- Also correcting for JavaScript error in form validation routine.
---
.../prog/en/modules/opac-suggestions.tmpl |6 +-
opac/opac-suggestions.pl |9 +++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
index 263e3ae..27019ea 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
@@ -52,7 +52,7 @@ $.tablesorter.addParser({
}
if (_alertString.length==0) {
- document.Aform.submit();
+ f.submit();
} else {
alertString2 = _(Form not submitted because of the
following problem(s)\n);
alertString2 +=
\n\n;
@@ -100,6 +100,10 @@ $.tablesorter.addParser({
!-- TMPL_IF name=op_else --
h1!-- TMPL_UNLESS NAME=OPACViewOthersSuggestions --!-- TMPL_IF
NAME=loggedinusername --My !-- /TMPL_IF --!-- /TMPL_UNLESS --Purchase
Suggestions/h1
+
+!-- TMPL_IF NAME=deleted --div class=dialog messageThe selected
suggestions have been deleted./div!-- /TMPL_IF --
+!-- TMPL_IF NAME=submitted --div class=dialog messageYour
suggestion has been submitted./div!-- /TMPL_IF --
+
!-- TMPL_IF NAME=suggestions_loop --
!-- TMPL_IF NAME=OPACViewOthersSuggestions --
form action=/cgi-bin/koha/opac-suggestions.pl method=get
diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl
index f22d06e..e11cd0b 100755
--- a/opac/opac-suggestions.pl
+++ b/opac/opac-suggestions.pl
@@ -35,7 +35,8 @@ delete $$suggestion{$_} foreach qwop suggestedbyme;
$op = 'else' unless $op;
my ( $template, $borrowernumber, $cookie );
-
+my $deleted = $input-param('deleted');
+my $submitted = $input-param('submitted');
if ( C4::Context-preference(AnonSuggestions) ) {
( $template, $borrowernumber, $cookie ) = get_template_and_user(
@@ -84,6 +85,8 @@ if ( $op eq add_confirm ) {
SearchSuggestion( $suggestion );
}
$op = 'else';
+print
$input-redirect(/cgi-bin/koha/opac-suggestions.pl?op=elsesubmitted=1);
+exit;
}
if ( $op eq delete_confirm ) {
@@ -92,6 +95,8 @@ if ( $op eq delete_confirm ) {
DelSuggestion( $borrowernumber, $delete_field );
}
$op = 'else';
+print
$input-redirect(/cgi-bin/koha/opac-suggestions.pl?op=elsedeleted=1);
+exit;
}
map{
$_-{'branchcodesuggestedby'}=GetBranchInfo($_-{'branchcodesuggestedby'})-[0]-{'branchname'}}
@$suggestions_loop;
my $supportlist=GetSupportList();
@@ -118,7 +123,7 @@ $template-param(
suggestions_loop = $suggestions_loop,
showall= $allsuggestions,
op_$op = 1,
- suggestionsview = 1
+suggestionsview = 1,
);
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
Re: [Koha-patches] [PATCH] Bugfix: Enabling guide box configuration parameter
input type=radio name=page_side id=page_side value=F checked / This is invalid. It needs to be input type=radio name=page_side id=page_side value=F checked=checked / -- Owen -- Web Developer Athens County Public Libraries http://www.myacpl.org ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
Re: [Koha-patches] [PATCH] Bug 3663 screen changes to OPAC advanced search
This looks like the patch referred to as the solution to Bug 3663: http://bugs.koha.org/cgi-bin/bugzilla3/show_bug.cgi?id=3663 -- Owen ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4121, Cataloging record modification should obey IntranetBiblioDefaultView pref
- Re-used redirect logic found in search.pl
---
cataloguing/addbiblio.pl | 14 +++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 3828950..4832584 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -936,9 +936,17 @@ if ( $op eq addbiblio ) {
exit;
}
elsif($is_a_modif){
- print $input-redirect(
-
/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumberframeworkcode=$frameworkcode
-);
+my $defaultview =
C4::Context-preference('IntranetBiblioDefaultView');
+my $views = { C4::Search::enabled_staff_search_views };
+if ($defaultview eq 'isbd' $views-{can_view_ISBD}) {
+print
$input-redirect(/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=$biblionumber);
+} elsif ($defaultview eq 'marc' $views-{can_view_MARC}) {
+print
$input-redirect(/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumberframeworkcode=$frameworkcode);
+} elsif ($defaultview eq 'labeled_marc'
$views-{can_view_labeledMARC}) {
+print
$input-redirect(/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=$biblionumber);
+} else {
+print
$input-redirect(/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber);
+}
exit;
}else {
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4113, Failed renewal from circulation screen results in malformed table
Renewal failure message should appear in renewal checkbox column just like it does in moremember.tmpl --- .../prog/en/modules/circ/circulation.tmpl | 19 ++- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl index 9e30d92..7bbdffa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -660,6 +660,9 @@ No patron matched span class=ex!-- TMPL_VAR name=message --/span td!-- TMPL_VAR NAME=itemcallnumber --/td td!-- TMPL_VAR NAME=charge --/td td!-- TMPL_VAR NAME=replacementprice --/td + !-- TMPL_IF NAME=renew_failed -- +td class=problemRenewal Failed/td + !-- TMPL_ELSE -- tdspan style=padding: 0 1em;!-- TMPL_VAR NAME=renewals --/span !-- TMPL_IF NAME=can_renew -- input type=checkbox name=all_items[] value=!-- TMPL_VAR NAME=itemnumber -- checked=checked style=display: none; / @@ -690,6 +693,7 @@ No patron matched span class=ex!-- TMPL_VAR name=message --/span !-- /TMPL_IF -- !-- /TMPL_IF -- /td +!-- /TMPL_IF -- !-- TMPL_IF NAME=return_failed -- td class=problemCheckin Failed/td !--TMPL_ELSE-- @@ -697,9 +701,6 @@ No patron matched span class=ex!-- TMPL_VAR name=message --/span input type=checkbox name=all_barcodes[] value=!-- TMPL_VAR NAME=barcode -- checked=checked style=display: none; / /td !-- /TMPL_IF -- - !-- TMPL_IF NAME=renew_failed -- - tdRenewal Failed/td - !-- /TMPL_IF -- /tr !-- /TMPL_LOOP -- !-- /loop todayissues -- !-- /if todayissues --!-- /TMPL_IF -- @@ -725,6 +726,9 @@ No patron matched span class=ex!-- TMPL_VAR name=message --/span td!-- TMPL_VAR NAME=itemcallnumber --/td td!-- TMPL_VAR NAME=charge --/td td!-- TMPL_VAR NAME=replacementprice --/td + !-- TMPL_IF NAME=renew_failed -- +td class=problemRenewal Failed/td + !-- TMPL_ELSE -- tdspan style=padding: 0 1em;!-- TMPL_IF NAME=renewals --!-- TMPL_VAR NAME=renewals --!-- TMPL_ELSE --0!-- /TMPL_IF --/span !-- TMPL_IF NAME=can_renew -- input type=checkbox name=all_items[] value=!-- TMPL_VAR NAME=itemnumber -- checked=checked style=display: none; / @@ -755,17 +759,14 @@ No patron matched span class=ex!-- TMPL_VAR name=message --/span !-- /TMPL_IF -- !-- /TMPL_IF -- /td - !-- TMPL_IF NAME=return_failed -- +!-- /TMPL_IF -- + !-- TMPL_IF NAME=return_failed -- td class=problemCheckin Failed/td - !--TMPL_ELSE-- +!--TMPL_ELSE-- tdinput type=checkbox name=barcodes[] value=!-- TMPL_VAR NAME=barcode -- onclick=uncheck_sibling(this); / input type=checkbox name=all_barcodes[] value=!-- TMPL_VAR NAME=barcode -- checked=checked style=display: none; / /td !-- /TMPL_IF -- - !-- TMPL_IF NAME=renew_failed -- - tdRenewal Failed/td - !-- /TMPL_IF -- - /tr !-- /loop previssues --!-- /TMPL_LOOP -- !--/if previssues --!-- /TMPL_IF -- -- 1.6.3.3 ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Style correction
- Use div class=dialog alert for warnings, not dialog error
---
.../prog/en/modules/circ/returns.tmpl | 38 ++--
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index bfd22bf..631052e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -51,7 +51,7 @@ function Dopop(link) {
div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo; a
href=/cgi-bin/koha/circ/circulation-home.plCirculation/a rsaquo; Check
In/div
div id=doc class=yui-t7
-
+
div id=bd
div id=yui-main
@@ -67,7 +67,7 @@ function Dopop(link) {
!-- /TMPL_IF --
!-- case of a mistake in transfer loop --
!-- TMPL_IF Name=WrongTransfer --div class=dialog message!--
WrongTransfer --h3Please return a
href=/cgi-bin/koha/catalogue/detail.pl?type=intraamp;biblionumber=!--
TMPL_VAR NAME=itembiblionumber --!-- TMPL_VAR Name=title escape=html
--/a to !-- TMPL_VAR Name=TransferWaitingAt --/h3
-!-- TMPL_IF Name=wborcnum--h5Hold for:/h5
+!-- TMPL_IF Name=wborcnum--h5Hold for:/h5
ullia
href=/cgi-bin/koha/members/moremember.pl?borrowernumber=!-- TMPL_VAR
NAME=borrowernumber --
!-- TMPL_VAR Name=borsurname --, !-- TMPL_VAR
Name=borfirstname --/a (!-- TMPL_VAR Name=borcnum --)/li
li!-- TMPL_VAR Name=wboraddress --!-- TMPL_IF
NAME=wboraddress2 --br /
@@ -76,7 +76,7 @@ function Dopop(link) {
!-- TMPL_IF NAME=wborphone --li!-- TMPL_VAR Name=wborphone
--/li!-- /TMPL_IF --
!-- TMPL_IF NAME=wboremail --lia id=boremail
href=mailto:!-- TMPL_VAR NAME=wboremail --!-- TMPL_VAR NAME=wboremail
--/a/li!-- /TMPL_IF --
/ul
-
+
form method=post action=returns.pl class=confirm
input type=hidden name=WT-itemNumber value=!-- TMPL_VAR
Name=WrongTransferItem -- /
input type=hidden name=WT-waitingAt value=!-- TMPL_VAR
Name=TransferWaitingAt -- /
@@ -170,27 +170,27 @@ function Dopop(link) {
!-- transfer: item with no reservation, must be returned to its
homebranch --
div class=dialog message
h3Please return a
href=/cgi-bin/koha/catalogue/detail.pl?type=intraamp;biblionumber=!--
TMPL_VAR NAME=itembiblionumber --!-- TMPL_VAR NAME=title escape=html
DEFAULT=item --/a to !-- TMPL_VAR NAME=homebranch DEFAULT=homebranch
--/h3/div!-- /TMPL_IF --
-
+
!-- TMPL_IF Name=needstransfer --
!-- needstransfer --
div class=dialog messageh3 This item needs to be transfered to
!-- TMPL_VAR Name=homebranch --/h3
Transfer Now?br /
-form method=post action=returns.pl name=mainform id=mainform
+form method=post action=returns.pl name=mainform id=mainform
input type=submit name=dotransfer value=Yes class=submit /
input type=submit name=notransfer value=No class=submit /
input type=hidden name=tobranch value=!-- TMPL_VAR
NAME=homebranch -- /
input type=hidden name=transferitem value=!-- TMPL_VAR
NAME=itemnumber -- /
input type=hidden name=exemptfine value=!-- TMPL_VAR
Name=exemptfine -- /
input type=hidden name=dropboxmode value=!-- TMPL_VAR
Name=dropboxmode -- /
- !--TMPL_LOOP Name=inputloop --
- input type=hidden name=ri-!-- TMPL_VAR Name=counter --
value=!-- TMPL_VAR Name=barcode -- /
- input type=hidden name=dd-!-- TMPL_VAR Name=counter --
value=!-- TMPL_VAR Name=duedate -- /
- input type=hidden name=bn-!-- TMPL_VAR Name=counter --
value=!-- TMPL_VAR Name=bornum -- /
- !-- /TMPL_LOOP --
- input type=hidden name=barcode value=0 /
+ !--TMPL_LOOP Name=inputloop --
+ input type=hidden name=ri-!-- TMPL_VAR Name=counter --
value=!-- TMPL_VAR Name=barcode -- /
+ input type=hidden name=dd-!-- TMPL_VAR Name=counter --
value=!-- TMPL_VAR Name=duedate -- /
+ input type=hidden name=bn-!-- TMPL_VAR Name=counter --
value=!-- TMPL_VAR Name=bornum -- /
+ !-- /TMPL_LOOP --
+ input type=hidden name=barcode value=0 /
/form /div
!-- /TMPL_IF --
-
+
!-- TMPL_IF Name=diffbranch --
!-- diffbranch --
h3Item Consigned:/h3
@@ -212,8 +212,8 @@ function Dopop(link) {
input type=hidden name=barcode value=0 /
/form
!-- /TMPL_IF --
-
-
+
+
!-- case of simple return no issue or transfer but with a reservation --
!-- TMPL_IF Name=reserved --
!-- reserved --
@@ -263,7 +263,7 @@ function Dopop(link) {
!-- TMPL_ELSE --
!-- TMPL_IF NAME=errmsgloop --
-div class=dialog error
+div class=dialog alert
!-- TMPL_LOOP Name=errmsgloop --
!-- TMPL_IF Name=badbarcode --
p class=problemNo Item with barcode: !-- TMPL_VAR
Name=msg --/p
@@ -311,8
Re: [Koha-patches] [PATCH] Bug 3691: Invalid XHTML in about.tmpl
On Sat, Oct 3, 2009 at 1:11 PM, Garry Collum gcol...@gmail.com wrote: Fixes several missing closing html tags. --- koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) This patch never made it into HEAD but still applies cleanly. Please approve! -- Owen -- Web Developer Athens County Public Libraries http://www.myacpl.org ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fixes for Bug 3089, Date entry fields should indicate required date format
- Added include, date-format.inc, which shows format, e.g. (DD/MM/)
- Hint shows expected date format based on system preference
- Removing calendar.inc include from templates which don't use it
---
.../intranet-tmpl/prog/en/css/staff-global.css |6 ++-
.../intranet-tmpl/prog/en/includes/date-format.inc |1 +
.../prog/en/modules/acqui/histsearch.tmpl |2 +
.../prog/en/modules/acqui/parcels.tmpl |3 +-
.../prog/en/modules/admin/aqbudgetperiods.tmpl |2 +
.../prog/en/modules/admin/aqbudgets.tmpl |1 -
.../prog/en/modules/admin/aqcontract.tmpl |2 +
.../prog/en/modules/circ/circulation.tmpl |6 +-
.../prog/en/modules/labels/search.tmpl |2 +
.../prog/en/modules/members/memberentrygen.tmpl|3 +
.../prog/en/modules/members/moremember.tmpl|1 +
.../en/modules/reports/acquisitions_stats.tmpl |4 ++
.../prog/en/modules/reports/bor_issues_top.tmpl|4 +-
.../prog/en/modules/reports/borrowers_stats.tmpl |2 +-
.../prog/en/modules/reports/cat_issues_top.tmpl|4 +-
.../prog/en/modules/reports/dictionary.tmpl|2 +
.../en/modules/reports/guided_reports_start.tmpl |2 +
.../prog/en/modules/reports/issues_avg_stats.tmpl |4 +-
.../prog/en/modules/reports/issues_stats.tmpl |2 +-
.../prog/en/modules/serials/checkexpiration.tmpl |3 +-
.../prog/en/modules/serials/claims.tmpl|2 +-
.../intranet-tmpl/prog/en/modules/tags/review.tmpl |4 +-
.../prog/en/modules/tools/batchMod-del.tmpl|1 -
.../prog/en/modules/tools/batchMod-edit.tmpl |1 -
.../prog/en/modules/tools/batchMod.tmpl|1 -
.../prog/en/modules/tools/cleanborrowers.tmpl |4 +-
.../prog/en/modules/tools/inventory.tmpl |2 +
.../prog/en/modules/tools/koha-news.tmpl |2 +
.../prog/en/modules/tools/scheduler.tmpl |2 +-
.../prog/en/modules/tools/viewlog.tmpl | 49
30 files changed, 71 insertions(+), 53 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 5efd709..190c9da 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -509,9 +509,13 @@ fieldset.brief ol, fieldset.brief li {
list-style-type : none;
}
-fieldset.brief div.hint, fieldset.rows div.hint, div.yui-u div.hint {
+.hint {
color : #99;
font-size : 95%;
+}
+
+fieldset.brief div.hint, fieldset.rows div.hint, div.yui-u div.hint {
+ font-size : 95%;
margin-bottom : .4em;
}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc
new file mode 100644
index 000..2d90220
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc
@@ -0,0 +1 @@
+!-- TMPL_IF NAME=dateformat_us --(MM/DD/)!-- TMPL_ELSIF
NAME=dateformat_metric --(DD/MM/)!-- TMPL_ELSE --(/MM/DD)!--
/TMPL_IF --
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
index 3b29414..d83516b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
@@ -25,6 +25,7 @@
lilabel for=fromFrom: /label
input type=text size=10 id=from name=from
value=!-- TMPL_VAR name=from_placed_on -- /
img src=!-- TMPL_VAR Name=themelang
--/lib/calendar/cal.gif id=openCalendarFrom style=cursor: pointer;
alt=Show Calendar /
+ div class=hint!-- TMPL_INCLUDE
NAME=date-format.inc --/div
/li
lilabel for=toTo: /label
input type=text size=10 id=to name=to
value=!-- TMPL_VAR name=to_placed_on -- /
@@ -48,6 +49,7 @@
dateStatusFunc : disable_to
});
/script
+ div class=hint!-- TMPL_INCLUDE
NAME=date-format.inc --/div
/li
/ol
/fieldset
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
index f74c647..a3bae10 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
@@ -111,7 +111,8 @@
ifFormat : !-- TMPL_VAR NAME=DHTMLcalendar_dateformat --,
button : datereceived_button }
);
- /script/li
+ /script
+ div class=hint!--
[Koha-patches] [PATCH] Fix for Bug 4086, categorycode on patron search confusing
- Changed 'categorycode' to 'category'
- Formatted additional options to be more compact
- Returning patron search page to wide layout following
removal of patron filter from the sidebar
- Corrected some other markup that was causing validation errors
---
.../prog/en/includes/patron-search.inc | 26 ++--
.../prog/en/includes/patron-toolbar.inc|8 +++---
.../prog/en/modules/members/member.tmpl| 21 +++
3 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 47063a2..4a9aa47 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -32,7 +32,7 @@ YAHOO.util.Event.onContentReady(header_search, function() {
this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
this.oACDS.maxCacheEntries = 60;
this.oACDS.queryMatchSubset = true;
-
+
// Instantiate first AutoComplete
var myInput = document.getElementById('findborrower');
var myContainer = document.getElementById('yborrowercontainer');
@@ -41,7 +41,7 @@ YAHOO.util.Event.onContentReady(header_search, function() {
//this.oAutoComp.queryDelay = 1;
this.oAutoComp.formatResult = this.fnCustomFormatter;
}
-});
+});
//]]
/script!-- /TMPL_IF --!-- /TMPL_IF --
div id=header_search
@@ -50,29 +50,29 @@ YAHOO.util.Event.onContentReady(header_search, function()
{
form action=/cgi-bin/koha/members/member.pl method=post
input id=searchmember size=25 class=focus name=member type=text
value=!--TMPL_VAR Name=member--/
!--TMPL_IF Name=branchloop--
- span class=filteraction id=filteraction_off a href=#
onClick=$('#filters').toggle();$('.filteraction').toggle();[-]/a/span
- span class=filteraction id=filteraction_on a href=#
onClick=$('#filters').toggle();$('.filteraction').toggle();[+]/a/span
+ span class=filteraction id=filteraction_off a href=#
onclick=$('#filters').toggle();$('.filteraction').toggle();[-]/a/span
+ span class=filteraction id=filteraction_on a href=#
onclick=$('#filters').toggle();$('.filteraction').toggle();[+]/a/span
!--/TMPL_IF --
order by:
select name=orderby id=searchorderby
option value=surname,1Surname/option
-option value=cardnumber,1Cardnumber/option
+option value=cardnumber,1Card number/option
/select
input value=Search class=submit type=submit /
!--TMPL_IF Name=branchloop--
- div id=filters label for=branchcode Library :/labelselect
name=branchcode id=branchcode
+ p id=filters label for=branchcodeLibrary: /labelselect
name=branchcode id=branchcode
option value=Any/option!-- TMPL_LOOP name=branchloop --
!-- TMPL_IF NAME=selected --
option value=!-- TMPL_VAR name=value --
selected=selected!-- TMPL_VAR name=branchname --/option!-- TMPL_ELSE
--
option value=!-- TMPL_VAR name=value --!-- TMPL_VAR
name=branchname --/option!-- /TMPL_IF --
- !-- /TMPL_LOOP --/selectbr /
- label for=categorycode categorycode :/labelselect
name=categorycode id=categorycode
+ !-- /TMPL_LOOP --/select
+ label for=categorycodeCategory: /labelselect
name=categorycode id=categorycode
option value=Any/option!-- TMPL_LOOP name=categoryloop --
!-- TMPL_IF NAME=selected --
option value=!-- TMPL_VAR name=categorycode --
selected=selected!-- TMPL_VAR name=description --/option!-- TMPL_ELSE
--
option value=!-- TMPL_VAR name=categorycode --!-- TMPL_VAR
name=description --/option!-- /TMPL_IF --
!-- /TMPL_LOOP --/select
- /div
+ /p
!--/TMPL_IF --
/form
/div
@@ -110,13 +110,13 @@ YAHOO.util.Event.onContentReady(header_search,
function() {
lia
href=/cgi-bin/koha/members/members-home.pl#patron_searchSearch
Patrons/a/li
!-- TMPL_IF NAME=CAN_user_circulate --lia
href=/cgi-bin/koha/circ/circulation.pl#circ_searchCheck Out/a/li!--
/TMPL_IF --
!-- TMPL_IF NAME=CAN_user_catalogue --lia
href=/cgi-bin/koha/catalogue/search.pl#catalog_searchSearch the
Catalog/a/li!-- /TMPL_IF --
- /ul
+ /ul
/div
script type=text/javascript//![CDATA[
$(document).ready(function() {
- $(#filters).toggle();
- $(#filteraction_off).toggle();
-});
+ $(#filters).toggle();
+ $(#filteraction_off).toggle();
+});
//]]
/script
!-- End Patrons Resident Search Box --
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
index e1b46a5..d7c87c4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
+++
[Koha-patches] [PATCH] Fixes for Bug 2600, HTML tags in titles not escaped in many places
---
.../prog/en/modules/catalogue/MARCdetail.tmpl | 30 ++--
.../prog/en/modules/catalogue/results.tmpl | 42
.../prog/en/modules/reserve/request.tmpl | 50 ++--
.../prog/en/modules/opac-addbybiblionumber.tmpl|4 +-
.../prog/en/modules/opac-readingrecord.tmpl|2 +-
.../opac-tmpl/prog/en/modules/opac-results.tmpl| 32 ++--
.../prog/en/modules/opac-search-history.tmpl |4 +-
7 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index 9e6f733..8fa7d1b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -21,23 +21,23 @@ function Changefwk(FwkList) {
!-- TMPL_INCLUDE NAME=header.inc --
!-- TMPL_INCLUDE NAME=cat-search.inc --
-div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo; a
href=/cgi-bin/koha/catalogue/search.plCatalog/a rsaquo; MARC Details for
i!-- TMPL_VAR NAME=bibliotitle --/i/div
+div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo; a
href=/cgi-bin/koha/catalogue/search.plCatalog/a rsaquo; MARC Details for
i!-- TMPL_VAR NAME=bibliotitle ESCAPE=html --/i/div
div id=doc3 class=yui-t2
-
+
div id=bd
div id=yui-main
div class=yui-b
!-- TMPL_INCLUDE NAME=cat-toolbar.inc --
!-- TMPL_UNLESS name=popup --
-h1MARC biblio : !-- TMPL_VAR NAME=biblionumber -- ( !-- TMPL_VAR
NAME=bibliotitle -- )/h1
-
+h1MARC biblio : !-- TMPL_VAR NAME=biblionumber -- ( !-- TMPL_VAR
NAME=bibliotitle ESCAPE=html -- )/h1
+
!-- /TMPL_UNLESS --
pbWith Framework :!--TMPL_VAR Name=framework --/b/p
-
+
div id=bibliotabs class=toptabs numbered
ul
!-- TMPL_IF name=0XX --
@@ -103,7 +103,7 @@ function Changefwk(FwkList) {
/div !-- class='tag' --
!-- /TMPL_LOOP --
/div
-
+
div id=tab1XX
!-- TMPL_LOOP NAME=1XX --
!-- TMPL_IF name=tag --
@@ -133,7 +133,7 @@ function Changefwk(FwkList) {
/div
!-- /TMPL_LOOP --
/div
-
+
div id=tab2XX
!-- TMPL_LOOP NAME=2XX --
!-- TMPL_IF name=tag --
@@ -163,7 +163,7 @@ function Changefwk(FwkList) {
/div
!-- /TMPL_LOOP --
/div
-
+
div id=tab3XX
!-- TMPL_LOOP NAME=3XX --
!-- TMPL_IF name=tag --
@@ -193,7 +193,7 @@ function Changefwk(FwkList) {
/div
!-- /TMPL_LOOP --
/div
-
+
div id=tab4XX
!-- TMPL_LOOP NAME=4XX --
!-- TMPL_IF name=tag --
@@ -223,7 +223,7 @@ function Changefwk(FwkList) {
/div
!-- /TMPL_LOOP --
/div
-
+
div id=tab5XX
!-- TMPL_LOOP NAME=5XX --
!-- TMPL_IF name=tag --
@@ -253,7 +253,7 @@ function Changefwk(FwkList) {
/div
!-- /TMPL_LOOP --
/div
-
+
div id=tab6XX
!-- TMPL_LOOP NAME=6XX --
!-- TMPL_IF name=tag --
@@ -283,7 +283,7 @@ function Changefwk(FwkList) {
/div
!-- /TMPL_LOOP --
/div
-
+
div id=tab7XX
!-- TMPL_LOOP NAME=7XX --
!-- TMPL_IF name=tag --
@@ -313,7 +313,7 @@ function Changefwk(FwkList) {
/div
!-- /TMPL_LOOP --
/div
-
+
div id=tab8XX
!-- TMPL_LOOP NAME=8XX --
!-- TMPL_IF name=tag --
@@ -343,7 +343,7 @@ function Changefwk(FwkList) {
/div
!-- /TMPL_LOOP --
/div
-
+
div id=tab9XX
!-- TMPL_LOOP NAME=9XX --
!-- TMPL_IF name=tag --
@@ -373,7 +373,7 @@ function Changefwk(FwkList) {
/div
!-- /TMPL_LOOP --
/div
-
+
!-- TMPL_IF name=10XX --
div id=tab10XX
table
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
index d62fcd3..09d6339 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -27,9 +27,9 @@ $(window).load(function() {
verify_images();
});
!-- /TMPL_IF --
-function Dopop(link) {
+function Dopop(link) {
newin=window.open(link,'popup','width=500,height=500,toolbar=false,scrollbars=yes,resizeable=yes');
-}
+}
$(document).ready(function() {
$('#sortbyform').find(input:submit).hide();
$('#sort_by').change(function() {
@@ -62,19 +62,19 @@ $(.addtocart).show();
});
$(#tagsel_span).html(input id=\tagsel_tag\ class=\submit\
type=\submit\ value=\Tag\/);
-
+
function cartList(){
if($(#addto).find(option:selected).attr(value)
== addtolist){
[Koha-patches] [PATCH] Fix for Bug 4089, tools menu floating to bottom of CSV Profiles, and others
- Moving nested TMPL_IFs out of option tags (breaks translator)
- Fixing markup to match conventions for form structure
- Removing duplicate form fields (bad merge?)
---
.../prog/en/modules/tools/csv-profiles.tmpl| 337 ++--
1 files changed, 175 insertions(+), 162 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tmpl
index 1b21c05..982f991 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tmpl
@@ -46,231 +46,244 @@ function reloadPage(p) {
!-- TMPL_ELSE --
li
!-- /TMPL_IF --
- a href=csv-profiles.pl#csveditEdit profile/a/li !-- /TMPL_IF
--
+ a href=csv-profiles.pl#csveditEdit existing profile/a/li !--
/TMPL_IF --
/ul
div id=csvnew
h3New CSV export profile/h3
form
action=/cgi-bin/koha/tools/csv-profiles.pl method=post
- fieldset class=brief
- ollilabel
for=profile_name class=requiredProfile name :/label
+ fieldset class=rows
+ ollilabel
for=profile_name class=requiredProfile name: /label
input type=text
id=profile_name name=profile_name //li
- lilabel
for=profile_descriptionProfile description :/label
+ lilabel
for=profile_descriptionProfile description: /label
textarea cols=50
rows=2 name=profile_description id=profile_description/textarea/li
- label for=csvCSV
separator :/label
- select
name=csv_separator
- option value=;Colon
(:)/option
+ lilabel
for=new_csv_separatorCSV separator: /label
+ select
name=csv_separator id=new_csv_separator
+ option value=:Colon
(:)/option
option value=,
selected=selectedComma (,)/option
option value=|Pipe
(|)/option
option
value=;Semi-colon (;)/option
option value=#Sharp
(#)/option
option value= Space
( )/option
option
value=\tTabulation (\t)/option
- /select
- br /br /
+ /select/li
- label
for=field_separatorField separator :/label
- select
name=field_separator
- option value=;Colon
(:)/option
+ lilabel
for=new_field_separatorField separator: /label
+ select
name=field_separator id=new_field_separator
+ option value=:Colon
(:)/option
option value=,Comma
(,)/option
option value=|Pipe
(|)/option
option
value=;Semi-colon (;)/option
option value=#
selected=selectedSharp (#)/option
option value= Space
( )/option
option
value=\tTabulation (\t)/option
- /select
- br /br /
+ /select/li
- label
for=subfield_separatorSubfield separator :/label
- select
name=subfield_separator
- option value=;Colon
(:)/option
+ lilabel
for=new_subfield_separatorSubfield separator: /label
+ select
[Koha-patches] [PATCH] Fix for Bug 4092, suggestion date missing from manage suggestions
Date was missing because of incorrect variable name in opac-suggestions.pl
Thanks to HDL for the fix.
---
.../prog/en/modules/suggestion/suggestion.tmpl | 24 ++--
opac/opac-suggestions.pl | 10
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
index 35eeb10..0e23cfb 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
@@ -10,10 +10,10 @@
new YAHOO.widget.Button(newsuggestion);
}
$.tablesorter.addParser({
-id: 'articles',
-is: function(s) {return false; },
-format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,'');
},
-type: 'text'
+id: 'articles',
+is: function(s) {return false; },
+format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
+type: 'text'
});
/**
* displayOther.
@@ -72,7 +72,7 @@ $(document).ready(function() {
$(h4.collapse a).click(function(){
$(this).parent().parent().find(ol).toggle();
});
-});
+});
// ]]
/script
style type=text/css
@@ -81,7 +81,7 @@ h4.collapse a { font-size : 80%; text-decoration: none; }
fieldset.brief ol { di
/style
!--/TMPL_IF--
/head
-body
+body
!-- TMPL_INCLUDE name=header.inc --
!-- TMPL_INCLUDE NAME=cat-search.inc --
div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo; a
href=/cgi-bin/koha/acqui/acqui-home.plAcquisitions/a rsaquo; !-- TMPL_IF
name=op_save -- a
href=/cgi-bin/koha/suggestion/suggestion.plSuggestions/a rsaquo; !--
TMPL_IF name=suggestionid --Suggestion edit #!-- TMPL_VAR
name=suggestionid --!--TMPL_ELSE--New purchase suggestion!-- /TMPL_IF
--!--TMPL_ELSE--Suggestions Management!-- /TMPL_IF -- /div
@@ -95,9 +95,9 @@ h4.collapse a { font-size : 80%; text-decoration: none; }
fieldset.brief ol { di
!-- TMPL_IF name=suggestionid --
h1Edit purchase suggestion #!-- TMPL_VAR name=suggestionid
--/h1
input type=hidden name=suggestionid value=!-- TMPL_VAR
name=suggestionid --/
-!--TMPL_ELSE--
+!--TMPL_ELSE--
h1Enter a new purchase suggestion/h1
-!--/TMPL_IF--
+!--/TMPL_IF--
fieldset class=rows legendBibliographic information/legendol
lilabel for=titleTitle:/labelinput type=text id=title
name=title size=50 maxlength=80 value=!--TMPL_VAR
Name=title--//li
lilabel for=authorAuthor:/labelinput type=text id=author
name=author size=50 maxlength=80 value=!--TMPL_VAR
Name=author--//li
@@ -148,7 +148,7 @@ h4.collapse a { font-size : 80%; text-decoration: none; }
fieldset.brief ol { di
/table/li/ol
/fieldset
fieldset class=rows legendAcquisition information/legendol
-lilabel for=branchcodeBranchcode:/label
+lilabel for=branchcodeBranchcode:/label
select name=branchcode id=branchcode
option value=Any/option!-- TMPL_LOOP name=branchloop
--
!-- TMPL_IF NAME=selected --option value=!-- TMPL_VAR
name=value -- selected=selected!-- TMPL_VAR name=branchname
--/option!-- TMPL_ELSE --option value=!-- TMPL_VAR name=value
--!-- TMPL_VAR name=branchname --/option!-- /TMPL_IF --!--
/TMPL_LOOP --
@@ -174,7 +174,7 @@ h4.collapse a { font-size : 80%; text-decoration: none; }
fieldset.brief ol { di
h1Suggestions Management/h1
-!--TMPL_UNLESS Name=notabs--
+!--TMPL_UNLESS Name=notabs--
div id=sorting class=overlaySorting.../div
div id=loadingtab class=overlayLoading tab.../div
div id=suggestiontabs class=toptabs
@@ -184,7 +184,7 @@ h4.collapse a { font-size : 80%; text-decoration: none; }
fieldset.brief ol { di
!--/TMPL_LOOP --
/ul
/div
-!--/TMPL_UNLESS --
+!--/TMPL_UNLESS --
!--TMPL_LOOP Name=suggestions--
div id=!--TMPL_VAR Name=suggestiontype--
@@ -219,7 +219,7 @@ h4.collapse a { font-size : 80%; text-decoration: none; }
fieldset.brief ol { di
/td
td
!--TMPL_IF Name=emailsuggestedby--a href=mailto:!--
TMPL_VAR name=emailsuggestedby --!--/TMPL_IF--!-- TMPL_VAR
name=surnamesuggestedby --!-- TMPL_IF name=firstnamesuggestedby --, !--
TMPL_VAR name=firstnamesuggestedby --!-- /TMPL_IF -- !--TMPL_IF
Name=emailsuggestedby--/a!--/TMPL_IF--
-!--TMPL_IF Name=suggesteddate--br/!-- TMPL_VAR
name=suggesteddate --!--/TMPL_IF--
+!--TMPL_IF Name=suggesteddate-- / !-- TMPL_VAR
name=suggesteddate --!--/TMPL_IF--
/td
td
!--TMPL_IF Name=emailmanagedby--a href=mailto:!--
TMPL_VAR name=emailmanagedby --!--/TMPL_IF--!-- TMPL_VAR
name=surnamemanagedby --!-- TMPL_IF name=firstnamemanagedby --, !--
TMPL_VAR name=firstnamemanagedby --!-- /TMPL_IF -- !--TMPL_IF
[Koha-patches] [PATCH] Fix for Bug 4073, Add globally template variable for dateformat setting
---
C4/Auth.pm | 12
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/C4/Auth.pm b/C4/Auth.pm
index f0be27c..206231d 100755
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -323,6 +323,18 @@ sub get_template_and_user {
}
}
+if(C4::Context-preference('dateformat')){
+if(C4::Context-preference('dateformat') eq metric){
+$template-param(dateformat_metric = 1);
+} elsif(C4::Context-preference('dateformat') eq us){
+$template-param(dateformat_us = 1);
+} else {
+$template-param(dateformat_iso = 1);
+}
+} else {
+$template-param(dateformat_iso = 1);
+}
+
# these template parameters are set the same regardless of $in-{'type'}
$template-param(
BiblioDefaultView.C4::Context-preference(BiblioDefaultView)
= 1,
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Change to correct layout problem when OpacNav is empty.
---
.../prog/en/modules/opac-full-serial-issues.tmpl |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
index 9b1480b..9995cc5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
@@ -139,7 +139,7 @@ function showlayer(numlayer){
/style
/head
body id=opac-full-serial-issues
-!-- TMPL_IF NAME=OpacNav --div id=doc3 class=yui-t1!-- TMPL_ELSE
--div id=doc3 class=yui-t7!-- /TMPL_IF --
+div id=doc3 class=yui-t1
div id=bd
!-- TMPL_INCLUDE name=masthead.inc --
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 3838, Download List Pop Up Needs Margins
--- .../prog/en/modules/basket/downloadcart.tmpl | 26 --- .../en/modules/virtualshelves/downloadshelf.tmpl | 21 +++ .../prog/en/modules/opac-downloadcart.tmpl | 21 +--- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tmpl index d05e2a2..bec6fbe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tmpl @@ -1,11 +1,16 @@ -!-- TMPL_INCLUDE NAME=doc-head-open.inc --Download shelf!-- TMPL_INCLUDE NAME=doc-head-close.inc -- +!-- TMPL_INCLUDE NAME=doc-head-open.inc -- +titleKoha rsaquo; Download cart/title +!-- TMPL_INCLUDE NAME=doc-head-close.inc -- /head -body +body style=padding:1em; !-- TMPL_IF NAME=format -- -Your Download should automatically start +pYour download should begin automatically./p !-- TMPL_ELSE -- -div id=export class=detailtagcellform method=post action=/cgi-bin/koha/basket/downloadcart.pl - label for=formatDownload cart:/label +form method=post action=/cgi-bin/koha/basket/downloadcart.pl +fieldset class=rows + legendDownload cart/legend + olli + label for=formatFormat:/label select name=format id=format option value=-- Choose Format --/option option value=iso2709iso2709/option @@ -15,14 +20,15 @@ option value=!-- TMPL_VAR NAME=export_format_id --CSV - !-- TMPL_VAR NAME=profile --/option !-- /TMPL_LOOP -- - /select + /select/li + /ol + /fieldset + fieldset class=action input type=hidden name=bib_list value=!-- TMPL_VAR NAME=bib_list -- / - input type=submit name=save value=Go / + input type=submit name=save value=Save / a class=cancel close href=#Cancel/a + /fieldset /form -pa class=button href=# onclick=javascript:window.close()Close this window/a/p -/div - !-- /TMPL_IF -- /body /html diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tmpl index 52ae03d..5ed72ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tmpl @@ -1,14 +1,15 @@ !-- TMPL_INCLUDE NAME=doc-head-open.inc -- -titleDownload shelf/title +titleKoha rsaquo; Download shelf/title !-- TMPL_INCLUDE NAME=doc-head-close.inc -- /head -body +body style=padding:1em; !-- TMPL_IF NAME=format -- -Your Download should automatically start +pYour download should begin automatically./p !-- TMPL_ELSE -- -div id=export class=detailtagcellform method=post action=/cgi-bin/koha/virtualshelves/downloadshelf.pl - fieldset class=row +form method=post action=/cgi-bin/koha/virtualshelves/downloadshelf.pl + fieldset class=rows legendDownload Shelf/legend + olli label for=formatFormat : /label select name=format id=format option value=-- Choose Format --/option @@ -18,16 +19,14 @@ !-- TMPL_LOOP NAME=csv_profiles -- option value=!-- TMPL_VAR NAME=export_format_id --CSV - !-- TMPL_VAR NAME=profile --/option !-- /TMPL_LOOP -- - /select - input type=hidden name=shelfid value=!-- TMPL_VAR NAME=shelfid -- / - input type=submit name=save value=Go / + /li/ol + /fieldset + fieldset class=actioninput type=hidden name=shelfid value=!-- TMPL_VAR NAME=shelfid -- / + input type=submit name=save value=Save / a class=cancel close href=#Cancel/a /fieldset /form -pa class=button href=# onclick=javascript:window.close()Close this window/a/p -/div - !-- /TMPL_IF -- /body /html diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tmpl index 0a01cba..75adf24 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tmpl @@ -1,11 +1,12 @@ -!-- TMPL_INCLUDE NAME=doc-head-open.inc --Download shelf!-- TMPL_INCLUDE NAME=doc-head-close.inc -- +!-- TMPL_INCLUDE NAME=doc-head-open.inc --!-- TMPL_IF NAME=LibraryNameTitle --!-- TMPL_VAR NAME=LibraryNameTitle --!-- TMPL_ELSE --Koha Online!-- /TMPL_IF -- Catalog rsaquo; Download cart!-- TMPL_INCLUDE NAME=doc-head-close.inc -- /head -body id=opac-downloadcart -!-- TMPL_IF NAME=format -- -Your Download should automatically start +body id=opac-downloadcart style=padding:1em; +div class=container!-- TMPL_IF NAME=format -- +pYour download should begin automatically./p !-- TMPL_ELSE -- -div id=export class=detailtagcellform method=post action=/cgi-bin/koha/opac-downloadcart.pl - label for=formatDownload
[Koha-patches] [biblibre/3.2_community] Fix for Bug 4065, patron extended attributes error
---
.../prog/en/modules/members/memberentrygen.tmpl|5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index e56ec0b..63d9c45 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -26,7 +26,7 @@
function clear_entry(node) {
var original = node.parentNode.parentNode;
-$(input, original).attr('value', '');
+$(input[type=text], original).attr('value', '');
$(select, original).attr('value', '');
}
@@ -936,8 +936,7 @@
td!-- TMPL_VAR NAME=code -- (!-- TMPL_VAR
NAME=description --)
/td
td
-input type=hidden id=!-- TMPL_VAR NAME=form_id
--_code name=!-- TMPL_VAR NAME=form_id --_code
- value=!-- TMPL_VAR NAME=code ESCAPE=HTML -- /
+input type=hidden id=!-- TMPL_VAR NAME=form_id
--_code name=!-- TMPL_VAR NAME=form_id --_code value=!-- TMPL_VAR
NAME=code ESCAPE=HTML -- /
!-- TMPL_IF NAME=use_dropdown --
select id=!-- TMPL_VAR NAME=form_id -- name=!--
TMPL_VAR NAME=form_id --
option value= /
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [biblibre/3.2_community] Fix for Bug 3984, Confusing note on transfers to receive
- Changing 'check this transfer' message to more informative
'Transfer is XX days late'
- Adding note in the case of late transfers: 'Transfers are
considered late after XX [TransfersMaxDaysWarning] days.'
---
circ/transferstoreceive.pl | 10 --
.../prog/en/modules/circ/transferstoreceive.tmpl |5 +++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl
index 88ae91d..ddb7f4a 100755
--- a/circ/transferstoreceive.pl
+++ b/circ/transferstoreceive.pl
@@ -58,6 +58,7 @@ my $default = C4::Context-userenv-{'branch'};
# get the all the branches for reference
my $branches = GetBranches();
my @branchesloop;
+my $latetransfers;
foreach my $br ( keys %$branches ) {
my @transferloop;
my %branchloop;
@@ -78,15 +79,18 @@ foreach my $br ( keys %$branches ) {
C4::Context-preference('TransfersMaxDaysWarning'));
my $calcDate = Date_to_Days( $sent_year, $sent_month, $sent_day );
my $today= Date_to_Days(Today);
+ my $diff = $today - $calcDate;
if ($today $calcDate) {
+ $latetransfers = 1;
$getransf{'messcompa'} = 1;
+ $getransf{'diff'} = $diff;
}
my $gettitle = GetBiblioFromItemNumber( $num-{'itemnumber'} );
-my $itemtypeinfo = getitemtypeinfo( $gettitle-{'itemtype'} );
+my $itemtypeinfo = getitemtypeinfo(
(C4::Context-preference('item-level_itypes')) ? $gettitle-{'itype'} :
$gettitle-{'itemtype'} );
$getransf{'datetransfer'} = format_date( $num-{'datesent'} );
-$getransf{'itemtype'} = $itemtypeinfo-{'description'};
+$getransf{'itemtype'} = $itemtypeinfo -{'description'};
foreach (qw(title biblionumber itemnumber barcode
homebranch holdingbranch itemcallnumber)) {
$getransf{$_} = $gettitle-{$_};
}
@@ -114,6 +118,8 @@ $template-param(
branchesloop = \...@branchesloop,
show_date= format_date(C4::Dates-today('iso')),
'dateformat_' . (C4::Context-preference(dateformat) || '') = 1,
+ TransfersMaxDaysWarning =
C4::Context-preference('TransfersMaxDaysWarning'),
+ latetransfers = $latetransfers ? 1 : 0,
);
output_html_with_http_headers $input, $cookie, $template-output;
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
index 6a7e902..6b036af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
@@ -35,9 +35,10 @@ $(document).ready(function() {
div id=yui-main
div class=yui-g
- h1Transfers made to your library on : !-- TMPL_VAR NAME=show_date
--/h1
+ h1Transfers made to your library as of !-- TMPL_VAR NAME=show_date
--/h1
!-- TMPL_IF name=branchesloop --
pYour library is the destination for the following transfer(s)/p
+ !-- TMPL_IF NAME=latetransfers --pTransfers are span
class=errorconsidered late/span after !-- TMPL_VAR
NAME=TransfersMaxDaysWarning -- days./p!-- /TMPL_IF --
div id=resultlist
!-- TMPL_LOOP NAME=branchesloop --
!-- TMPL_IF NAME=branchcode --
@@ -55,7 +56,7 @@ $(document).ready(function() {
!-- TMPL_ELSE --
tr
!-- /TMPL_IF --
-tdp!-- TMPL_VAR NAME=datetransfer --/p !--
TMPL_IF NAME=messcompa --check this transfer!-- /TMPL_IF --/td
+tdp!-- TMPL_VAR NAME=datetransfer --/p !--
TMPL_IF NAME=messcompa --span class=errorTransfer is !-- TMPL_VAR
NAME=diff -- days late/span!-- /TMPL_IF --/td
tdspan style=display:none;!-- TMPL_VAR NAME=title
escape=html --/span!-- invisible title for tablesorter --
!-- TMPL_IF name=BiblioDefaultViewmarc --
a href=/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --!-- TMPL_VAR NAME=title escape=html
--/a
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [biblibre/3.2_community] Fixes for Bug 3958, Standardize vendor/supplier/bookseller terminology
Changing instances of supplier or bookseller to vendor. --- .../prog/en/modules/acqui/addorderiso2709.tmpl |6 +++--- .../prog/en/modules/acqui/basket.tmpl |4 ++-- .../prog/en/modules/acqui/basketgroup.tmpl |8 .../prog/en/modules/acqui/basketheader.tmpl|2 +- .../prog/en/modules/acqui/neworderempty.tmpl |2 +- .../prog/en/modules/admin/aqcontract.tmpl | 14 +++--- .../prog/en/modules/help/serials/claims.tmpl |6 +++--- .../en/modules/reports/acquisitions_stats.tmpl |2 +- .../prog/en/modules/reports/serials_stats.tmpl |4 ++-- .../prog/en/modules/serials/claims.tmpl|8 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl index 16d490a..e5756a4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl @@ -40,7 +40,7 @@ /td td!-- TMPL_VAR name=overlay_status--/td - tda href=/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=!--TMPL_VAR name=booksellerid --basketno=!-- TMPL_VAR name=basketno --booksellerid=!-- TMPL_VAR name=booksellerid --breedingid=!-- TMPL_VAR name=import_record_id --import_batch_id=!-- TMPL_VAR name=import_batch_id --Add order/a/td + tda href=/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=!--TMPL_VAR name=booksellerid --amp;basketno=!-- TMPL_VAR name=basketno --amp;booksellerid=!-- TMPL_VAR name=booksellerid --amp;breedingid=!-- TMPL_VAR name=import_record_id --amp;import_batch_id=!-- TMPL_VAR name=import_batch_id --Add order/a/td /tr !-- TMPL_IF name=match_biblionumber -- tr @@ -60,7 +60,7 @@ !-- TMPL_IF name=current_page -- span class=current!-- TMPL_VAR name=page_number --/span !-- TMPL_ELSE -- - a class=nav href=!-- TMPL_VAR name=script_name --?import_batch_id=!-- TMPL_VAR name=import_batch_id --offset=!-- TMPL_VAR name=offset --!-- TMPL_VAR name=page_number --/a + a class=nav href=!-- TMPL_VAR name=script_name --?import_batch_id=!-- TMPL_VAR name=import_batch_id --amp;offset=!-- TMPL_VAR name=offset --!-- TMPL_VAR name=page_number --/a !-- /TMPL_IF -- !-- /TMPL_LOOP -- !-- /TMPL_IF -- @@ -82,7 +82,7 @@ td!-- TMPL_VAR name=import_status --/td td!-- TMPL_VAR name=upload_timestamp --/td td!-- TMPL_VAR name=num_biblios --/td - tda href=!-- TMPL_VAR name=scriptname --?import_batch_id=!-- TMPL_VAR name=import_batch_id --basketno=!-- TMPL_VAR name=basketno --booksellerid=!-- TMPL_VAR name=booksellerid --Add orders/a/td + tda href=!-- TMPL_VAR name=scriptname --?import_batch_id=!-- TMPL_VAR name=import_batch_id --amp;basketno=!-- TMPL_VAR name=basketno --amp;booksellerid=!-- TMPL_VAR name=booksellerid --Add orders/a/td /tr !-- /TMPL_LOOP -- /table diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl index a174e5e..5124441 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl @@ -113,7 +113,7 @@ !-- /TMPL_UNLESS -- !-- TMPL_IF NAME=NO_BOOKSELLER -- -h2Supplier Not Found/h2 +h2Vendor not found/h2 !-- TMPL_ELSE -- !-- TMPL_IF NAME=delete_confirmed -- h3Basket deleted/h3 @@ -138,7 +138,7 @@ div id=acqui_basket_summary class=yui-g h2Basket details/h2 !-- TMPL_IF NAME=basketnote --pInternal note: !-- TMPL_VAR NAME=basketnote --/p!-- /TMPL_IF -- -!-- TMPL_IF NAME=basketbooksellernote --pBookseller note: !-- TMPL_VAR NAME=basketbooksellernote --/p!-- /TMPL_IF -- +!-- TMPL_IF NAME=basketbooksellernote --pVendor note: !-- TMPL_VAR NAME=basketbooksellernote --/p!-- /TMPL_IF -- !-- TMPL_IF NAME=basketcontractno -- pContract number: !-- TMPL_VAR NAME=basketcontractno --/p pContract name: a href=../admin/aqcontract.pl?op=add_formamp;contractnumber=!-- TMPL_VAR NAME=basketcontractno --!-- TMPL_VAR NAME=basketcontractname --/a/p diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl index bb8a1dd..baca750 100755 ---
[Koha-patches] [biblibre/3.2_community] Improve behavior of manual history checkbox behavior.
---
.../prog/en/modules/serials/subscription-add.tmpl | 15 +++
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
index f8cadf8..a590255 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
@@ -918,9 +918,16 @@ $(document).ready(function() {
init_pattern();
!--TMPL_IF Name=history--
$(#subscription_form_history).show();!--/TMPL_IF--
-
+ $(#cancel_manual_history).click(function(){
+ $(#subscription_form_history).hide();
+ $(#manuallist).attr(checked,);
+ });
$(#manuallist).click( function(){
- $(#subscription_form_history).toggle();
+ if($(this).attr(checked)){
+ $(#subscription_form_history).show();
+ } else {
+ $(#subscription_form_history).hide();
+ }
}
);
// $(.widelabel).attr(width, 300px); // labels stay skinny in IE7
anyway.
@@ -1068,8 +1075,8 @@ $(document).ready(function() {
/div
div id=subscription_form_history class=yui-u style=display:none
-h2Subscription history/h2
-pHint : you can update the serial history manually. This can be
useful for an old subscription or to clean the existing history. Modify these
fields with care, as future serial receive will continue to update them
automatically./p
+divh3 style=display:inlineSubscription history/h3 a href=#
id=cancel_manual_history[cancel manual history]/a/div
+pHint: you can update the serial history manually. This can be
useful for an old subscription or to clean the existing history. Modify these
fields with care, as future serial receive will continue to update them
automatically./p
fieldset class=rows
ol
li
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [biblibre/3.2_community] Markup tweaks to better style the patron search filter
---
.../prog/en/modules/members/member.tmpl|2 +-
.../prog/en/modules/members/search.tmpl| 20 +---
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index bae8781..05b4747 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -18,7 +18,7 @@ $(document).ready(function() {
div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo;
!-- TMPL_IF NAME=searching --a
href=/cgi-bin/koha/members/members-home.plPatrons/a rsaquo; Search
Results!-- TMPL_ELSE --Patrons!-- /TMPL_IF --/div
-div id=doc3 class=yui-t3
+div id=doc3 class=yui-t2
div id=bd
div id=yui-main
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl
index 090fbeb..094e375 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl
@@ -1,23 +1,21 @@
form action=!--TMPL_VAR Name=actionname-- method=get
fieldset class=brief
- h3 Filter :/h3
- input type=hidden name=surname value=!--
TMPL_VAR name=surname-- /
- input type=text name=member value=!--
TMPL_VAR name=member-- /br/
- !-- TMPL_IF NAME=subscriptionid --
- input type=hidden name=subscriptionid
value=!-- TMPL_VAR NAME=subscriptionid --
- !-- /TMPL_IF --
-label for=branchcode Library :/labelselect
name=branchcode id=branchcode
+ h4Refine results/h4
+ input type=hidden name=surname value=!-- TMPL_VAR
name=surname-- /
+ ol
+ lilabel for=memberName:/label input type=text id=member
name=member value=!-- TMPL_VAR name=member-- /!-- TMPL_IF
NAME=subscriptionid --input type=hidden name=subscriptionid value=!--
TMPL_VAR NAME=subscriptionid --!-- /TMPL_IF --/li
+ lilabel for=branchcode Library: /labelselect name=branchcode
id=branchcode
option value=Any/option!-- TMPL_LOOP name=branchloop --
!-- TMPL_IF NAME=selected --
option value=!-- TMPL_VAR name=value --
selected=selected!-- TMPL_VAR name=branchname --/option!-- TMPL_ELSE
--
option value=!-- TMPL_VAR name=value --!-- TMPL_VAR
name=branchname --/option!-- /TMPL_IF --
- !-- /TMPL_LOOP --/selectbr /
- label for=categorycode Patron Category :/labelselect
name=categorycode id=categorycode
+ !-- /TMPL_LOOP --/select/li
+ lilabel for=categorycodeCategory: /labelselect name=categorycode
id=categorycode
option value=Any/option!-- TMPL_LOOP name=categoryloop --
!-- TMPL_IF NAME=selected --
option value=!-- TMPL_VAR name=categorycode --
selected=selected!-- TMPL_VAR name=description --/option!-- TMPL_ELSE
--
option value=!-- TMPL_VAR name=categorycode --!-- TMPL_VAR
name=description --/option!-- /TMPL_IF --
- !-- /TMPL_LOOP --/select br /
-input type=submit value=Search /
+ !-- /TMPL_LOOP --/select /li
+fieldset class=actioninput type=submit value=Search
//fieldset
/fieldset
/form
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [biblibre/3.2_community] Fix for Bugs 3998, 3968. Includes other markup corrections and reformats
Bug 3998: Confusing warning on budget add page
Bug 3968: Empty Blue Box Pop Up
- Removed warning, made budget amount a required field.
- Added conditional logic to prevent display of tooltip when there is no content
- Moved filter form into sidebar
- Changed Budgets.pm to pass an ID to a form field
- Improvements to breadcrumbs and title tags
- Restructured budgets admin toolbar to match existing toolbar patterns:
new, edit, etc.
---
C4/Budgets.pm |1 +
.../intranet-tmpl/prog/en/css/staff-global.css | 21 +-
.../prog/en/includes/budgets-admin-toolbar.inc | 111 ++
.../prog/en/includes/budgets-admin.inc | 126 --
.../prog/en/modules/admin/aqbudgetperiods.tmpl | 18 +-
.../prog/en/modules/admin/aqbudgets.tmpl | 408 ++--
.../prog/en/modules/admin/aqplan.tmpl |5 +-
7 files changed, 338 insertions(+), 352 deletions(-)
create mode 100644
koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin.inc
diff --git a/C4/Budgets.pm b/C4/Budgets.pm
index 3c3c4c3..8ef85ed 100644
--- a/C4/Budgets.pm
+++ b/C4/Budgets.pm
@@ -318,6 +318,7 @@ sub GetBudgetPermDropbox {
$labels{'1'} = 'Owner';
$labels{'2'} = 'Library';
my $radio = CGI::scrolling_list(
+ -id = 'budget_permission',
-name = 'budget_permission',
-values= [ '0', '1', '2' ],
-default = $perm,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 83ef418..d672bff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -239,7 +239,6 @@ table.invis tr,table.invis td {
border : white;
}
-
td, th {
border-bottom : 1px solid #BCBCBC;
border-left : 1px solid #BCBCBC;
@@ -255,6 +254,12 @@ td.borderless {
border : 0 none;
}
+td.data,
+th.data {
+ font-family : Courier New, Courier, monospace;
+ text-align : right;
+}
+
th {
background-color : #E8E8E8;
font-weight : bold;
@@ -523,6 +528,16 @@ div.yui-b fieldset.brief ol {
div.yui-b fieldset.brief select {
width: 12em;
}
+div.yui-b fieldset.brief li.radio {
+ padding : .7em 0;
+}
+div.yui-b fieldset.brief li.radio label {
+ display : inline;
+}
+
+div.yui-b fieldset.brief li.radio input {
+ padding:0.3em 0;
+}
fieldset.rows {
border-width : 1px;
@@ -808,7 +823,7 @@ fieldset.rows .inputnote {
visibility:visible; /* you propably don't need to change this one */
display:block;
}
-#newbiblio a, #addchild a, #newentry a, #newshelf a, #newmenuc .first-child,
#newsupplier .first-child, #newlabel a, #newtemplate a, #newlabelbatch a,
#newpatroncardbatch a, #newprofile a, #newsubscription a, #newdictionary a,
#newbasket a {
+#newbiblio a, #addchild a, #newentry a, #newshelf a, #newmenuc .first-child,
#newsupplier .first-child, #newlabel a, #newtemplate a, #newlabelbatch a,
#newpatroncardbatch a, #newprofile a, #newsubscription a, #newdictionary a,
#newbasket a, #newrootbudget-button, #budgets_menuc .first-child,
#periods_menuc .first-child {
padding-left : 34px;
background-image: url(../../img/toolbar-new.gif);
background-position : center left;
@@ -904,7 +919,7 @@ fieldset.rows .inputnote {
background-repeat : no-repeat;
}
-#editmenuc .first-child, #deleteshelf .first-child,#newmenuc .first-child,
#addbiblio .first-child, #z3950search .first-child, #printmenuc .first-child,
#newsupplier .first-child, #savemenuc .first-child {
+#editmenuc .first-child, #deleteshelf .first-child,#newmenuc .first-child,
#addbiblio .first-child, #z3950search .first-child, #printmenuc .first-child,
#newsupplier .first-child, #savemenuc .first-child, #budgets_menuc
.first-child, #periods_menuc .first-child {
padding-left : 15px;
}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
new file mode 100644
index 000..b364dab
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
@@ -0,0 +1,111 @@
+div id=toolbarscript type=text/javascript
+ //![CDATA[
+
+ // prepare DOM for YUI Toolbar
+$(document).ready(function() {
+$(#periods_menuc).empty();
+$(#budgets_menuc).empty();
+$(#newrootbudgetc).empty();
+
+// IF THERE IS NO BUDGETS DEFINED YET, THEN DISPLAY PERIOD BUTTON *ONLY*
+!-- TMPL_UNLESS NAME=period_button_only --
+$(#planning_menuc).empty();
+!-- /TMPL_UNLESS --
+
+ yuiToolbar();
+});
+
+ // YUI Toolbar Functions
+
+ function yuiToolbar() {
+!-- TMPL_IF NAME=budget_period_id --
+
[Koha-patches] [biblibre/3.2_community] Revised for biblibre/3.2_community: Putting CSV export sections into tabs
---
.../prog/en/modules/tools/csv-profiles.tmpl| 73 +++
1 files changed, 42 insertions(+), 31 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tmpl
index 2b10860..e84f783 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tmpl
@@ -1,16 +1,15 @@
-!-- TMPL_INCLUDE NAME=doc-head-open.inc --
-
- titleKoha rsaquo; Catalog rsaquo; Profile for CSV export/title
-
- !-- TMPL_INCLUDE NAME=doc-head-close.inc --
-
-script language=Javascript type=text/javascript
+!-- TMPL_INCLUDE NAME=doc-head-open.inc --titleKoha rsaquo; Tools
rsaquo; CSV export profiles/title!-- TMPL_INCLUDE NAME=doc-head-close.inc
--
+script type=text/javascript
+//![CDATA[
function reloadPage(p) {
var id = p.value;
if (id != 0) { document.location =
/cgi-bin/koha/tools/csv-profiles.pl?id= + id; }
}
+ $(document).ready(function() {
+$('#csvexporttabs ul').tabs();
+ });
+//]]
/script
-
/head
body
@@ -20,7 +19,7 @@ function reloadPage(p) {
div id=breadcrumbs
a href=/cgi-bin/koha/mainpage.plHome/a
rsaquo; a href=/cgi-bin/koha/tools/tools-home.plTools/a
- rsaquo; New profile for CSV export
+ rsaquo; CSV export profiles
/div
div id=doc3 class=yui-t2
@@ -38,56 +37,68 @@ function reloadPage(p) {
!-- TMPL_IF EXPR=action eq 'delete' --p class=errorThe
CSV profile has not been deleted./p!-- /TMPL_IF --
!-- /TMPL_IF --
!-- /TMPL_IF --
-
- h1New profile for CSV export/h1
+div id=csvexporttabs class=toptabs
+ul
+ lia href=csv-profiles.pl#csvnewNew profile/a/li
+ !-- TMPL_IF NAME=existing_profiles --
+ !-- TMPL_IF NAME=selected_profile_id --
+ li class=ui-tabs-selected
+ !-- TMPL_ELSE --
+ li
+!-- /TMPL_IF --
+ a href=csv-profiles.pl#csveditEdit profile/a/li !-- /TMPL_IF
--
+/ul
+ div id=csvnew
+ h3New CSV export profile/h3
form
action=/cgi-bin/koha/tools/csv-profiles.pl method=post
fieldset class=brief
- label
for=profile_nameProfile name :/label
- input type=text
id=profile_name name=profile_name /br /br /
+ ollilabel
for=profile_name class=requiredProfile name :/label
+ input type=text
id=profile_name name=profile_name //li
- label
for=profile_descriptionProfile description :/label
- textarea cols=50
rows=2 name=profile_description id=profile_description/textareabr
/br /
+ lilabel
for=profile_descriptionProfile description :/label
+ textarea cols=50
rows=2 name=profile_description id=profile_description/textarea/li
- label
for=profile_contentProfile marcfields :/label
+ lilabel
for=profile_content class=requiredProfile marcfields :/label
textarea cols=50
rows=2 name=profile_content id=profile_content/textarea
- pYou have to define which
fields or subfields you want to export, separated by pipes.br /
- Examplenbsp;:
200|210$a|301
- /p
+ pDefine which fields or
subfields you want to export, separated by pipes.br /
+ For example:
200|210$a|301
+ /p/li/ol
/fieldset
input type=hidden
name=action value=create /
- input type=submit /
+ input type=submit
value=Submit /
/form
-
+/div
!-- TMPL_IF NAME=existing_profiles
--
- br /br /
- h1Modify or delete an existing
profile/h1
+div id=csvedit
+ h3Modify or delete a CSV export
profile/h3
[Koha-patches] [biblibre/3.2_community] Revised for biblibre/3.2_community: Fix for Bug 3780, various OPAC pages have no unique body id
---
.../opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl |2 +-
.../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl |2 +-
.../prog/en/modules/opac-alert-subscribe.tmpl |2 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl |2 +-
.../prog/en/modules/opac-authorities-home.tmpl |2 +-
.../prog/en/modules/opac-authoritiesdetail.tmpl|2 +-
.../modules/opac-authoritiessearchresultlist.tmpl |2 +-
.../opac-tmpl/prog/en/modules/opac-browser.tmpl|2 +-
.../opac-tmpl/prog/en/modules/opac-detail.tmpl |2 +-
.../prog/en/modules/opac-downloadcart.tmpl |2 +-
.../prog/en/modules/opac-downloadshelf.tmpl|2 +-
.../prog/en/modules/opac-full-serial-issues.tmpl |2 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl |2 +-
.../opac-tmpl/prog/en/modules/opac-reserve.tmpl|2 +-
.../prog/en/modules/opac-search-history.tmpl |2 +-
.../prog/en/modules/opac-serial-issues.tmpl|2 +-
.../opac-tmpl/prog/en/modules/opac-showmarc.tmpl |2 +-
.../prog/en/modules/opac-showreviews.tmpl |2 +-
.../prog/en/modules/opac-tags_subject.tmpl |2 +-
.../opac-tmpl/prog/en/modules/opac-topissues.tmpl |2 +-
20 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
index 1a58b38..5f591b1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
@@ -16,7 +16,7 @@
link href=/opac-tmpl/prog/en/lib/greybox/gb_styles.css rel=stylesheet
type=text/css /
!-- /TMPL_IF --
/head
-body
+body id=opac-isbddetail
div id=doc3 class=yui-t7
div id=bd
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
index 939fcfd..7393904 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
@@ -9,7 +9,7 @@
link href=/opac-tmpl/prog/en/lib/greybox/gb_styles.css rel=stylesheet
type=text/css /
!-- /TMPL_IF --
/head
-body
+body id=opac-marcdetail
div id=doc3 class=yui-t7
div id=bd
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tmpl
index ab0813d..66d9db6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tmpl
@@ -1,7 +1,7 @@
!-- TMPL_INCLUDE NAME=doc-head-open.inc --!-- TMPL_IF
NAME=LibraryNameTitle --!-- TMPL_VAR NAME=LibraryNameTitle --!--
TMPL_ELSE --Koha Online!-- /TMPL_IF -- Catalog rsaquo; Serials
!-- TMPL_INCLUDE NAME=doc-head-close.inc --
/head
-body
+body id=opac-alert-subscribe
!-- TMPL_INCLUDE name=masthead.inc --
div id=doc3 class=yui-t1
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
index f8fca57..f598c20 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
@@ -6,7 +6,7 @@
!-- /TMPL_IF --
!-- TMPL_INCLUDE NAME=doc-head-close.inc --
/head
-body
+body id=opac-auth
div id=doc3 class=yui-t7
div id=bd
!-- TMPL_INCLUDE name=masthead.inc --
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
index 4039ca9..2b07471 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
@@ -1,7 +1,7 @@
!-- TMPL_INCLUDE NAME=doc-head-open.inc --!-- TMPL_IF
NAME=LibraryNameTitle --!-- TMPL_VAR NAME=LibraryNameTitle --!--
TMPL_ELSE --Koha Online!-- /TMPL_IF -- Catalog rsaquo; Authority Search
!-- TMPL_INCLUDE NAME=doc-head-close.inc --
/head
-body
+body id=opac-authorities
!-- TMPL_IF NAME=OpacNav --div id=doc3 class=yui-t1!-- TMPL_ELSE
--div id=doc3 class=yui-t7!-- /TMPL_IF --
div id=bd
!-- TMPL_INCLUDE name=masthead.inc --
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
index 2c04327..5f41371 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
@@ -26,7 +26,7 @@ function showChildren(mynumber) {
/script
!--/TMPL_IF--
/head
-body
+body id=opac-authoritiesdetail
div id=doc3 class=yui-t1
div id=bd
diff --git
a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
index 457ae65..012ef9f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
@@ -1,7 +1,7
[Koha-patches] [biblibre/3.2_community] Revised for biblibre/3.2_community: Reformat of suggestions management interface (Bug 3844)
Changes and fixes include:
- Moving filters forms into left-hand sidebar
- Making filter forms collapsed by default (click to show)
- Converting check all to text link to match similar controls on other pages
- Correcting case of tab labels
- Fixing display of custom reason field
- Converting radio buttons to drop-down for more compact display
- Table-sorter column exclusions
- Markup corrections
---
.../prog/en/modules/suggestion/suggestion.tmpl | 268 +++-
suggestion/suggestion.pl |9 +-
2 files changed, 150 insertions(+), 127 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
index aad488a..35eeb10 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
@@ -1,7 +1,8 @@
-!-- TMPL_INCLUDE NAME=doc-head-open.inc --title!-- TMPL_IF
NAME=LibraryNameTitle --!-- TMPL_VAR NAME=LibraryNameTitle --!--
TMPL_ELSE --Koha Online!-- /TMPL_IF -- Catalog rsaquo;
-!-- TMPL_IF name=op_save --!-- TMPL_IF name=suttesionid --Edit
purchase suggestion #!-- TMPL_VAR name=suggestionid --!--TMPL_ELSE--Enter
a new purchase suggestion!-- /TMPL_IF --!--TMPL_ELSE--Suggestions!--
/TMPL_IF --/title
+!-- TMPL_INCLUDE NAME=doc-head-open.inc --titleKoha rsaquo;
Acquisitions rsaquo;
+!-- TMPL_IF name=op_save --!-- TMPL_IF name=suttesionid --Edit
purchase suggestion #!-- TMPL_VAR name=suggestionid --!--TMPL_ELSE--Enter
a new purchase suggestion!-- /TMPL_IF --!--TMPL_ELSE--Suggestions
Management!-- /TMPL_IF --/title
!-- TMPL_INCLUDE NAME=doc-head-close.inc --
!--TMPL_IF Name=op_else-- script type=text/javascript src=!--
TMPL_VAR name=themelang
--/lib/jquery/plugins/jquery.tablesorter.min.js/script
+script type=text/javascript src=!-- TMPL_VAR name=themelang
--/lib/jquery/plugins/jquery.checkboxes.min.js/script
script type=text/JavaScript
// ![CDATA[
@@ -18,7 +19,10 @@ $.tablesorter.addParser({
* displayOther.
* This function display the select or an textaera to write a reason.
*/
-function displayOther(id,show,hide) {$(#+hide+id).hide();
$(#+show+id).show(); }
+function displayOther(id,show,hide){
+ $(#+hide+id).hide();
+ $(#+show+id).show();
+}
$(document).ready(function() {
yuiToolbar();
$('#suggestiontabs ul').tabs({
@@ -32,40 +36,57 @@ $(document).ready(function() {
$.tablesorter.defaults.widgets = ['zebra'];
!--TMPL_LOOP Name=suggestions--
+// functions for !--TMPL_VAR Name=suggestiontype-- interactions
$(#!--TMPL_VAR Name=suggestiontype--t).tablesorter({!-- TMPL_IF
EXPR=dateformat eq 'metric' --
dateFormat: 'uk',!-- /TMPL_IF --
-headers: {0:{sorter: false}, 1: { sorter: 'articles' },2:{sorter:
false},5:{sorter: false},6:{sorter: false},7:{sorter: false}, 8:{sorter:
false},9:{sorter: false},10:{sorter: false}}
+headers: {0:{sorter: false}, 1: { sorter: 'articles' },5:{sorter:
false},6:{sorter: false},7:{sorter: false}, 8:{sorter: false},9:{sorter:
false},10:{sorter: false}}
});
$(#CheckAll!--TMPL_VAR Name=suggestiontype--).click(function(){
-$(#!--TMPL_VAR Name=suggestiontype--t :checkbox).attr('checked',
$(#CheckAll!--TMPL_VAR Name=suggestiontype--).is(':checked'));
+ $(#!--TMPL_VAR Name=suggestiontype--t).checkCheckboxes();
});
-$(div[id*=other_reason!--TMPL_VAR Name=suggestiontype--]).hide();
+$(#UncheckAll!--TMPL_VAR Name=suggestiontype--).click(function(){
+ $(#!--TMPL_VAR
Name=suggestiontype--t).unCheckCheckboxes();
+ });
+ $(#other_reason!--TMPL_VAR Name=suggestiontype--).hide();
$(input[name*=other_reason!--TMPL_VAR
Name=suggestiontype--]).focus(function(){ $(this).val(); });
-$(select[name*=reason!--TMPL_VAR
Name=suggestiontype--]).change(function(){
-if($(this).children([selected]).val() == other){
-
displayOther($(this).attr(name).replace(/reason/,),other_reason!--TMPL_VAR
Name=suggestiontype--,select-reason!--TMPL_VAR
Name=suggestiontype--);
+$(#reason!--TMPL_VAR Name=suggestiontype--).change(function(){
+ if($(this).val() == other){
+ $(this).hide();
+ $(#other_reason!-- TMPL_VAR NAME=suggestiontype
--).show();
}
});
+ $(#!-- TMPL_VAR NAME=suggestiontype --delete).change(function(){
+ if(this.checked){
+ $(form[name='f!-- TMPL_VAR NAME=suggestiontype
--'] input[name=op]).attr(value,delete);
+ } else {
+ $(form[name='f!-- TMPL_VAR NAME=suggestiontype
--'] input[name=op]).attr(value,change);
+ }
+ });
+
!--/TMPL_LOOP--
$(a[href*=back]).click(function(){
var sid = $(this).attr(href).replace(/#back/,);
-displayOther(sid,select-reason,other_reason);
-$(#reason+sid).find(option[value='']).attr(selected,selected);
[Koha-patches] [biblibre/3.2_community] Fix for Bug 3951, Menu a mess in WebKit browsers
- removing inline image in favor of CSS background (inline image
is used in the OPAC to better work with cart button css
- adding display:none to more menu. visibility:hidden by
itself creates unwanted whitespace in WebKit browsers
- adding explicit width to toplevelmenu to correct display
problem in WebKit browsers
---
.../intranet-tmpl/prog/en/css/staff-global.css | 14 --
.../intranet-tmpl/prog/en/includes/header.inc |2 +-
koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js |1 +
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 83ef418..548c169 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1546,6 +1546,7 @@ a.yuimenuitemlabel:hover {
#toplevelnav {
float : left;
margin-left : .5em;
+ width : 30em;
}
ul#toplevelmenu {
@@ -1829,15 +1830,16 @@ h1#xml a {
text-align : center;
width : 180px;
}
+#cartmenulink {
+background: transparent url(../../img/cart-small.gif) 0 3px
no-repeat;
+padding-left : 15px;
+}
#cartmenulink span#basketcount span {
display : inline;
font-size : 90%;
font-weight : normal;
padding : 0;
}
-
-#cartmenulink img {
- background-image : none;
- display : inline;
- padding : 3px 6px 0 0;
-}
\ No newline at end of file
+#moremenu {
+display : none;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 8e0320f..95ce8dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -7,7 +7,7 @@
!-- TMPL_IF NAME=CAN_user_borrowers --lia
href=/cgi-bin/koha/members/members-home.plPatrons/a/li!-- /TMPL_IF --
!-- TMPL_IF NAME=CAN_user_catalogue --lia
href=/cgi-bin/koha/catalogue/search.plSearch/a/li!-- /TMPL_IF --
!-- TMPL_IF NAME=intranetbookbag --
-lia href=# id=cartmenulinkimg
src=/intranet-tmpl/prog/img/cart-small.gif alt= border=0 /Cartspan
id=basketcount/span/a/li
+lia href=# id=cartmenulinkCartspan
id=basketcount/span/a/li
!-- /TMPL_IF --
!-- TMPL_VAR name=IntranetNav --
li class=more
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
index 7810bef..93a1d2b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
@@ -31,6 +31,7 @@ function _(s) { return s } // dummy function for gettext
function onShowMoreClick(p_oEvent) {
// Position and display the menu
positionoMoremenu();
+$(#moremenu).show();
oMoremenu.show();
// Stop propagation and prevent the default click
behavior
YAHOO.util.Event.stopEvent(p_oEvent);
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [biblibre/3.2_community] Fixes for Bug 3376, Serials Display in OPAC
- Formatting links to different subscription views as tabs like the links to
MARC view, ISBD, etc.
- Styling display of brief subscription view for better clarity
- Moving filter form on full subscription view to sidebar
- jQuery-fying some full subscription view scripts
- Adding branch name to output of full subscription information
- Styling year links for visibility and clarity (I'm not styling them as
standard tabs because
they wouldn't wrap well with many many years' worth of subscriptions)
---
C4/Serials.pm |2 +
koha-tmpl/opac-tmpl/prog/en/css/opac.css |4 +-
.../prog/en/modules/opac-full-serial-issues.tmpl | 139 ++--
.../prog/en/modules/opac-serial-issues.tmpl| 23 ++--
4 files changed, 87 insertions(+), 81 deletions(-)
diff --git a/C4/Serials.pm b/C4/Serials.pm
index 03d2e5e..0b70099 100644
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -24,6 +24,7 @@ use POSIX qw(strftime);
use C4::Suggestions;
use C4::Koha;
use C4::Biblio;
+use C4::Branch;
use C4::Items;
use C4::Search;
use C4::Letters;
@@ -460,6 +461,7 @@ sub PrepareSerialsData {
? format_date( $subs-{'publisheddate'} )
: XXX
);
+$subs-{'branchname'} = GetBranchName( $subs-{'branchcode'} );
$subs-{'planneddate'} = format_date(
$subs-{'planneddate'} );
$subs-{ status . $subs-{'status'} } = 1;
$subs-{checked} = $subs-{'status'} =~
/1|3|4|7/;
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 088f5ea..eb02f10 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -1777,7 +1777,7 @@ span.view {
margin-top : .5em;
}
-a#MARCview, span#MARCview, a#MARCviewPop, a#ISBDview, span#ISBDview,
a#Normalview, span#Normalview {
+a#MARCview, span#MARCview, a#MARCviewPop, a#ISBDview, span#ISBDview,
a#Normalview, a#Briefhistory, span#Normalview, a#Fullhistory, span#Fullhistory,
span#Briefhistory {
background-position : 5px 3px;
background-repeat : no-repeat;
font-size : 87%;
@@ -1803,7 +1803,7 @@ a#Normalview, span#Normalview {
padding-left : 15px;
}
-a#MARCview, a#MARCviewPop, a#ISBDview, a#Normalview {
+a#MARCview, a#MARCviewPop, a#ISBDview, a#Normalview, a#Fullhistory,
a#Briefhistory {
background-color : #F3F3F3;
border-left : 1px solid #E8E8E8;
}
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
index 5102a3c..88dc969 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
@@ -1,16 +1,32 @@
-!-- TMPL_INCLUDE NAME=doc-head-open.inc --!-- TMPL_IF
NAME=LibraryNameTitle --!-- TMPL_VAR NAME=LibraryNameTitle --!--
TMPL_ELSE --Koha Online!-- /TMPL_IF -- Catalog rsaquo; Serials
+!-- TMPL_INCLUDE NAME=doc-head-open.inc --!-- TMPL_IF
NAME=LibraryNameTitle --!-- TMPL_VAR NAME=LibraryNameTitle --!--
TMPL_ELSE --Koha Online!-- /TMPL_IF -- Catalog rsaquo; Subscription
information for !-- TMPL_VAR name=bibliotitle --
!-- TMPL_INCLUDE NAME=doc-head-close.inc --
script type=text/javascript language=javascript
//![CDATA[
$(document).ready(function(){
-initFilters();
-
+ showlayer(!-- TMPL_VAR name=yearmin --);
+ $(a.tabsubs:first).addClass(currentsubtab);
+ $(#filterform).submit(function(){
+ filterByLibrary();
+ return false;
+ });
+ $(#libraryfilter).change(function(){
+ filterByLibrary();
+ });
+ $(#subscriptionidfilter).change(function(){
+ filterBySubscriptionId();
+ });
+ $(#reset).click(function(){
+ clearFilters();
+ });
+ $(a.tabsubs).click(function(){
+ $(a.tabsubs).removeClass(currentsubtab);
+ $(this).addClass(currentsubtab);
+ });
});
// Filters initialization
function initFilters() {
-
// Deleting everything from the library filter
$(#libraryfilter option).remove();
@@ -101,71 +117,64 @@ function clearFilters(keeplibrary) {
if (keeplibrary != true) {
// Reinit library options
initFilters();
- $(#libraryfilter opti...@value=all]).attr(selected, selected);
+ $(#libraryfilter option[value=all]).attr(selected, selected);
}
}
-
+function showlayer(numlayer){
+ $(.yeardata).each(function(){
+ ong = $(this).attr(id);
+ if(ong == show+numlayer){
+ $(this).show();
+ currentYear = ong;
+ } else {
+ $(this).hide();
+ }
+ });
+clearFilters();
+}
//]]
/script
-
+style type=text/css
+ #search-facets fieldset { border: 0; margin:
Re: [Koha-patches] [biblibre/3.2_community] Fixes for Bug 3376, Serials Display in OPAC
This patch is an update to a previously-sent patch for HEAD, now built against biblibre/3.2_community. -- Owen -- Web Developer Athens County Public Libraries http://www.myacpl.org ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
Re: [Koha-patches] [PATCH] Bugfix: Adding missing package to Makefile.PL
Chris Cormack submitted a similar patch recently. I think it must be still lost in the pile of pending patches. -- Owen -- Web Developer Athens County Public Libraries http://www.myacpl.org ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 4024, Search history template problems, and other fixes.
- Markup corrections
- Removing TMPL EXPR
- Converting delete link to FORM (destructive actions shouldn't be links)
- Adding search history link to logged-in user's sidebar menu
---
koha-tmpl/opac-tmpl/prog/en/css/opac.css |5 +--
koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 12 +-
koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc |3 +
.../prog/en/modules/opac-search-history.tmpl | 47 +--
opac/opac-search-history.pl|3 +
5 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 9e30270..17093e7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -611,15 +611,12 @@ body#advsearch #listsmenulink {
text-decoration : none;
}
-#members li:first-child {
- border-right : 1px solid black;
-}
-
#members li:last-child {
border-right : 0;
}
#members li {
+ border-right : 1px solid black;
display : inline;
list-style : none;
margin : 0;
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 0112166..f3916e6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -1,6 +1,16 @@
div id=header-wrapperdiv id=members
!-- TMPL_IF NAME=opacuserlogin --
- ul!-- TMPL_IF NAME=loggedinusername --lispan
class=membersWelcome, a href=/cgi-bin/koha/opac-user.plspan
class=loggedinusername!-- TMPL_LOOP NAME=USER_INFO --!-- TMPL_VAR
NAME=title -- !-- TMPL_VAR NAME=firstname -- !-- TMPL_VAR
NAME=surname --!-- /TMPL_LOOP --/span/a/span/li!-- TMPL_IF
NAME=ShowOpacRecentSearchLink --lia
href=/cgi-bin/koha/opac-search-history.pl title=View your search
historySearch history/a [a
href=/cgi-bin/koha/opac-search-history.pl?action=delete title=Delete your
search history onclick=javascript:return confirm(_('Are you sure you want to
delete your search history?'));x/a]/li !-- /TMPL_IF --lia
class=logout id=logout href=/cgi-bin/koha/opac-main.pl?logout.x=1Log
Out/a/li!-- TMPL_ELSE --lia href=/cgi-bin/koha/opac-user.plLog in
to Your Account/a/li!-- /TMPL_IF --
+ ul
+!-- TMPL_UNLESS NAME=loggedinusername --
+ lia href=/cgi-bin/koha/opac-user.plLog in to Your
Account/a/li!-- /TMPL_UNLESS --
+!-- TMPL_IF NAME=loggedinusername --
+lispan class=membersWelcome, a
href=/cgi-bin/koha/opac-user.plspan class=loggedinusername!-- TMPL_LOOP
NAME=USER_INFO --!-- TMPL_VAR NAME=title -- !-- TMPL_VAR
NAME=firstname -- !-- TMPL_VAR NAME=surname --!-- /TMPL_LOOP
--/span/a/span/li
+
+!-- /TMPL_IF --
+!-- TMPL_IF NAME=ShowOpacRecentSearchLink --
+lia href=/cgi-bin/koha/opac-search-history.pl title=View
your search historySearch history/a [a class=logout
href=/cgi-bin/koha/opac-search-history.pl?action=delete title=Delete your
search history onclick=return confirm(_('Are you sure you want to delete your
search history?'));x/a]/li
+!-- /TMPL_IF --
+ !-- TMPL_IF NAME=loggedinusername --lia
class=logout id=logout href=/cgi-bin/koha/opac-main.pl?logout.x=1Log
Out/a/li!-- /TMPL_IF --
/ul
!-- /TMPL_IF --
/div
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
index 5d1c50f..26bf502 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
@@ -12,6 +12,9 @@
!-- TMPL_IF NAME=OpacPasswordChange --
!-- TMPL_IF NAME=passwdview --li class=active!-- TMPL_ELSE
--li!-- /TMPL_IF --a href=/cgi-bin/koha/opac-passwd.plchange my
password/a/li
!-- /TMPL_IF --
+ !-- TMPL_IF NAME=ShowOpacRecentSearchLink --
+ !-- TMPL_IF NAME=searchhistoryview --li class=active!-- TMPL_ELSE
--li!-- /TMPL_IF --a href=/cgi-bin/koha/opac-search-history.plmy
search history/a/li
+ !-- /TMPL_IF --
!-- TMPL_IF NAME=opacreadinghistory --
!-- TMPL_IF NAME=readingrecview --li class=active!-- TMPL_ELSE
--li!-- /TMPL_IF --a href=/cgi-bin/koha/opac-readingrecord.plmy
reading history/a/li
!-- /TMPL_IF --
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl
index 2823501..90fc569 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl
@@ -8,7 +8,8 @@
// We show table ordered by descending dates by default
// (so that the more recent query is shown first)
$.tablesorter.defaults.sortList = [[0,1]];
-$(#historyt).tablesorter({!-- TMPL_IF EXPR=dateformat eq
'metric' --
+$(.historyt).tablesorter({
+
[Koha-patches] [PATCH] Adding inline edit links for additem table. Suggested for Bug 2534
---
koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css |5 +
.../prog/en/modules/cataloguing/additem.tmpl | 15 +--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css
b/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css
index 6683617..0377cca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css
@@ -127,3 +127,8 @@ a.tagnum {
.mandatory_marker {
color: red;
}
+.linktools { display: block; white-space: nowrap; }
+.linktools a { font-size : 75%; display:block;text-decoration:none;}
+.linktools a {margin:0
2px;padding:2px;background-color:#FFF;text-align:center; }
+.linktools a:first-child { border-bottom: 1px solid #DDD; }
+.linktools a:hover { background-color: #FFC; }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
index 5b43114..9d2d864 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
@@ -5,6 +5,17 @@
//![CDATA[
$(document).ready(function(){
$(fieldset.rows input).keydown(function(e){ return
checkEnter(e); });
+ /* Inline edit/delete links */
+ var biblionumber =
$(input[name='biblionumber']).attr(value);
+ $(td).click(function(event){
+ var $tgt = $(event.target);
+
if($tgt.is(a)||$tgt.is(:first-child)||$tgt.is(:nth-child(2))){ return
true; } else {
+ var rowid = $(this).parent().attr(id);
+ num_rowid = rowid.replace(row,);
+ $(.linktools).remove();
+ $(this).append(span class=\linktools\a
href=\/cgi-bin/koha/cataloguing/additem.pl?op=edititemframeworkcode=!--
TMPL_VAR NAME=frameworkcode --biblionumber=!-- TMPL_VAR
NAME=biblionumber --itemnumber=+num_rowid+#edititem\Edit Item/a a
href=\/cgi-bin/koha/cataloguing/additem.pl?op=delitemframeworkcode=!--
TMPL_VAR NAME=frameworkcode --biblionumber=!-- TMPL_VAR
NAME=biblionumber --itemnumber=+num_rowid+\
onclick=\confirm_deletion(!-- TMPL_VAR NAME=biblionumber
--,+num_rowid+); return false;\Delete Item/a/span);
+ }
+ });
});
function active(numlayer)
{
@@ -195,7 +206,7 @@ function set_to_today(id, force) {
/tr
!-- TMPL_LOOP NAME=item_loop --
tr id=row!-- TMPL_VAR NAME=itemnumber --
-!-- TMPL_IF Name=nomod-- td
colspan=2nbsp;/td!--TMPL_ELSE--tda
href=additem.pl?op=edititemamp;biblionumber=!-- TMPL_VAR NAME=biblionumber
--amp;itemnumber=!-- TMPL_VAR NAME=itemnumber --Edit/a/td
+!-- TMPL_IF Name=nomod-- td
colspan=2nbsp;/td!--TMPL_ELSE--tda
href=additem.pl?op=edititemamp;biblionumber=!-- TMPL_VAR NAME=biblionumber
--amp;itemnumber=!-- TMPL_VAR NAME=itemnumber --#edititemEdit/a/td
tda class=delete
href=/cgi-bin/koha/cataloguing/additem.pl?op=delitemamp;biblionumber=!--
TMPL_VAR NAME=biblionumber --amp;itemnumber=!-- TMPL_VAR NAME=itemnumber
-- onclick=confirm_deletion(!-- TMPL_VAR NAME=biblionumber --,!--
TMPL_VAR NAME=itemnumber --); return false;Delete/a/td!--/TMPL_IF--
!-- TMPL_LOOP NAME=item_value --
td!-- TMPL_VAR ESCAPE=HTML NAME=field --/td
@@ -214,7 +225,7 @@ function set_to_today(id, force) {
!-- TMPL_IF name=opisadd --
h2 id=additemaAdd Item/h2
!-- TMPL_ELSE --
-h2Edit Item #!-- TMPL_VAR NAME=itemnumber --/h2
+h2 id=edititemEdit Item #!-- TMPL_VAR NAME=itemnumber --/h2
!-- /TMPL_IF --
fieldset class=rows
ol
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Moving some list functions into the standard toolbar.
- Adding download functions to menu button
- Some markup corrections
---
C4/VirtualShelves/Page.pm |2 +
.../prog/en/includes/virtualshelves-toolbar.inc| 85 +---
.../en/modules/virtualshelves/sendshelfform.tmpl |6 +-
.../prog/en/modules/virtualshelves/shelves.tmpl| 32 +++
4 files changed, 93 insertions(+), 32 deletions(-)
diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 9e618c5..d80c72c 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -33,6 +33,7 @@ use C4::Output;
use C4::Dates qw/format_date/;
use Exporter;
use Data::Dumper;
+use C4::Csv;
use vars qw($debug @EXPORT @ISA $VERSION);
@@ -317,6 +318,7 @@ $template-param(
shelvesloopall = [(@shelvesloop, @shelveslooppriv)],
numberCanManage = $numberCanManage,
BiblioDefaultView.C4::Context-preference(BiblioDefaultView) = 1,
+csv_profiles = GetCsvProfilesLoop()
);
if ($template-param('viewshelf') or
$template-param( 'shelves' ) or
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
index 5ad8bb9..f05764d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
@@ -5,32 +5,95 @@
// prepare DOM for YUI Toolbar
$(document).ready(function() {
- $(#deleteshelfc).empty();
+ $(#editlistc).empty();
+ $(#deletelistc).remove();
+ $(#sendlistc).empty();
+ $(#downloadlistc).empty();
+ $(#printlistc).empty();
+ $(#sendlistc).before(li id=\downloadmenuc\\/li);
yuiToolbar();
});
+
+ !-- TMPL_IF NAME=viewshelf -- function sendList(){
+ open(CGIBIN+'virtualshelves/sendshelf.pl?shelfid=!-- TMPL_VAR
NAME=shelfnumber
--','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100');
+}
+
+function downloadList(){
+ open(CGIBIN+'virtualshelves/downloadshelf.pl?shelfid=!--
TMPL_VAR NAME=shelfnumber
--','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100');
+}!-- /TMPL_IF --
// YUI Toolbar Functions
function yuiToolbar() {
newshelfButton = new YAHOO.widget.Button(newshelf);
- editshelfButton = new YAHOO.widget.Button(editshelf);
- deleteshelfButton = new YAHOO.widget.Button({
-id: deleteshelf,
+ !-- TMPL_IF NAME=viewshelf --!-- TMPL_IF
name=manageshelf --editshelfButton = new YAHOO.widget.Button(editshelf);
+
+ var editmenu = [
+ { text: _(Edit list), url:
/cgi-bin/koha/virtualshelves/shelves.pl?shelfnumber=!-- TMPL_VAR
NAME=shelfnumber --amp;op=modif },
+ { text: _(Delete list), onclick:
{fn:function(){confirmDelete(_(Are you sure you want to delete this list?))}}}
+ ];
+
+ var downloadmenu = [
+ { text: _(iso2709), url:
/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=iso2709shelfid=!--
TMPL_VAR NAME=shelfnumber -- },
+ { text: _(RIS), url:
/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=risshelfid=!-- TMPL_VAR
NAME=shelfnumber -- },
+ { text: _(BibTex), url:
/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=bibtexshelfid=!--
TMPL_VAR NAME=shelfnumber -- },
+!-- TMPL_LOOP NAME=csv_profiles --
+ { text: _(CSV - !-- TMPL_VAR NAME=profile --), url:
/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=!-- TMPL_VAR
NAME=export_format_id --shelfid=!-- TMPL_VAR NAME=shelfnumber -- },
+!-- /TMPL_LOOP --
+ ];
+
+ new YAHOO.widget.Button({
+ type: menu,
+ label: _(Download list),
+ name: downloadmenubutton,
+ menu: downloadmenu,
+ container: downloadmenuc
+ });
+
+ new YAHOO.widget.Button({
+ type: menu,
+ label: _(Edit),
+ name: editmenubutton,
+ menu: editmenu,
+ container: editlistc
+ });
+
+!-- /TMPL_IF --
+ downloadlistButton = new YAHOO.widget.Button({
+id: downloadlist,
type: button,
-label: _(Delete List),
-container: deleteshelfc,
-
onclick: {fn:function(){confirmDelete(_(Are you sure you want to
delete this shelf?))}}
+
[Koha-patches] [PATCH] Interface corrections and improvements to OPAC lists
- improving behavior for users with no javascript
- style improvements to list toolbar
- adding new toolbar icons
- adding display of subtitle to lists
---
C4/VirtualShelves/Page.pm |2 +
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 258
.../prog/en/modules/opac-downloadshelf.tmpl| 31 ++-
.../prog/en/modules/opac-sendshelfform.tmpl|8 +-
.../opac-tmpl/prog/en/modules/opac-shelves.tmpl| 66 +++---
koha-tmpl/opac-tmpl/prog/images/download.png | Bin 0 - 369 bytes
koha-tmpl/opac-tmpl/prog/images/empty-small.png| Bin 0 - 474 bytes
.../opac-tmpl/prog/images/place-hold-small.png | Bin 0 - 430 bytes
koha-tmpl/opac-tmpl/prog/images/print-small.png| Bin 0 - 507 bytes
koha-tmpl/opac-tmpl/prog/images/send.png | Bin 0 - 472 bytes
koha-tmpl/opac-tmpl/prog/images/tags-small.png | Bin 0 - 361 bytes
11 files changed, 216 insertions(+), 149 deletions(-)
create mode 100644 koha-tmpl/opac-tmpl/prog/images/download.png
create mode 100644 koha-tmpl/opac-tmpl/prog/images/empty-small.png
create mode 100644 koha-tmpl/opac-tmpl/prog/images/place-hold-small.png
create mode 100644 koha-tmpl/opac-tmpl/prog/images/print-small.png
create mode 100644 koha-tmpl/opac-tmpl/prog/images/send.png
create mode 100644 koha-tmpl/opac-tmpl/prog/images/tags-small.png
diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 9e618c5..76b575f 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -181,6 +181,7 @@ SWITCH: {
}
($items, $totitems) = GetShelfContents($shelfnumber,
$shelflimit, $shelfoffset);
for my $this_item (@$items) {
+ my $record =
GetMarcBiblio($this_item-{'biblionumber'});
# the virtualshelfcontents table does not store
these columns nor are they retrieved from the items
# and itemtypes tables, so I'm commenting them
out for now to quiet the log -crn
#$this_item-{imageurl} =
$imgdir./.$itemtypes-{ $this_item-{itemtype} }-{'imageurl'};
@@ -188,6 +189,7 @@ SWITCH: {
$this_item-{'dateadded'} =
format_date($this_item-{'dateadded'});
$this_item-{'imageurl'} =
getitemtypeinfo($this_item-{'itemtype'})-{'imageurl'};
$this_item-{'coins'} =
GetCOinSBiblio($this_item-{'biblionumber'});
+ $this_item-{'subtitle'} =
C4::Biblio::get_koha_field_from_marc('bibliosubtitle', 'subtitle', $record, '');
}
push @paramsloop, {display = 'privateshelves'} if
$category == 1;
$showadd = 1;
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 9e30270..0b68fdc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -389,11 +389,50 @@ a .term {
padding : .3em 0;
}
-#action a, #toolbar a {
+#action a {
background-position : 5px center;
background-repeat : no-repeat;
text-decoration : none;
- padding-left : 26px;
+ padding-left : 35px;
+}
+
+#action a.print {
+ background-image:url(../../images/print.gif);
+}
+
+#action a#furthersearches {
+ background : transparent url(../../images/menu-arrow.gif) no-repeat
right center;
+ border : 1px solid #F3F3F3;
+ margin-left : 5px;
+ padding : 2px 26px 2px 10px;
+ text-decoration : none;
+}
+
+#action a#furthersearches:hover {
+ border-top : 1px solid #FFF;
+ border-left : 1px solid #FFF;
+ border-right : 1px solid #979797;
+ border-bottom : 1px solid #979797;
+}
+
+#action a.reserve,
+.searchresults a.reserve {
+ background-image:url(../../images/placereserve.gif);
+}
+
+#action a.addtoshelf, #toolbar a.addtoshelf {
+ background-image:url(../../images/addtoshelf.gif);
+}
+
+#action a.addtocart, #toolbar a.addtocart {
+ background-image:url(../../images/cart2.gif);
+}
+
+/* toolbar buttons */
+
+#toolbar a,
+#toolbar input {
+ white-space : nowrap;
}
#toolbar ul {
@@ -413,82 +452,147 @@ a .term {
border-left : 0;
}
-#action a.reserve, #toolbar a.reserve, .searchresults a.reserve {
- background-image:url(../../images/placereserve.gif);
+
+#toolbar a.print {
+ background: transparent url(../../images/print-small.png) 5px 50%
no-repeat;
+ display : none;
+ text-decoration : none;
+ padding-left : 23px;
}
-.searchresults a.highlight_toggle {
- background : transparent url(../../images/highlight.gif) -4px center
no-repeat;
- display: none;
- font-weight: normal;
- padding : 0 10px 0 21px;
+#toolbar a.brief {
+ background: transparent url(../../images/brief.gif) 5px 50% no-repeat;
+
[Koha-patches] [PATCH] Fix for Bug 2743, Z39.50, not z39.50
---
.../intranet-tmpl/prog/en/includes/cat-toolbar.inc |4 +-
.../prog/en/includes/cataloging-toolbar.inc|4 +-
.../prog/en/modules/admin/z3950servers.tmpl| 22 ++--
.../prog/en/modules/catalogue/results.tmpl |4 +-
.../prog/en/modules/cataloguing/addbiblio.tmpl |4 +-
.../en/modules/help/cataloguing/addbiblio.tmpl |2 +-
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index b26bc57..56fe023 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -124,7 +124,7 @@ function confirm_items_deletion() {
new YAHOO.widget.Button({
id: z3950search,
type: button,
- label: _(z39.50 Search),
+ label: _(Z39.50 Search),
container: z3950searchc,
onclick: {fn:function(){PopupZ3950()}}
});
@@ -171,7 +171,7 @@ function confirm_items_deletion() {
!-- TMPL_UNLESS name=bi_notforloan --
!-- TMPL_UNLESS NAME=norequests --lia id=placehold
href=/cgi-bin/koha/reserve/request.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber --Place Hold/a/li!-- /TMPL_UNLESS --!--
/TMPL_UNLESS --
!-- /TMPL_IF --
- !-- TMPL_IF NAME=CAN_user_editcatalogue_edit_catalogue --li
id=z3950searchcinput type=button id=z3950search value=z39.50 Search
onclick=PopupZ3950(); return false; //li!-- /TMPL_IF --
+ !-- TMPL_IF NAME=CAN_user_editcatalogue_edit_catalogue --li
id=z3950searchcinput type=button id=z3950search value=Z39.50 Search
onclick=PopupZ3950(); return false; //li!-- /TMPL_IF --
/ul
/form
/div
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
index d20789e..a555bab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
@@ -55,7 +55,7 @@
new YAHOO.widget.Button({
id: z3950search,
type: button,
-label: _(z39.50 Search),
+label: _(Z39.50 Search),
container: newmenuc,
onclick: {fn:function(){PopupZ3950()}}
});
@@ -79,7 +79,7 @@
/select
input type=submit value=Add Record Without Search
/
/form
-a id=z3950search onclick=PopupZ3950(); return false;z39.50
Search/a
+a id=z3950search onclick=PopupZ3950(); return false;Z39.50
Search/a
!-- /TMPL_IF --
/div
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
index 9a628a0..93b498c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
@@ -1,9 +1,9 @@
!-- TMPL_INCLUDE NAME=doc-head-open.inc --
-titleKoha rsaquo; Administration rsaquo; !-- TMPL_IF NAME=else
--z39.50 Servers!-- /TMPL_IF --
-!-- TMPL_IF NAME=add_form -- z39.50 Servers rsaquo; !-- TMPL_IF
NAME=searchfield --Modify z39.50 Server !-- TMPL_VAR NAME=searchfield
--!-- TMPL_ELSE --New z39.50 Server!-- /TMPL_IF --!-- /TMPL_IF --
-!-- TMPL_IF NAME=delete_confirm --z39.50 Servers rsaquo; Confirm
Deletion!-- /TMPL_IF --
-!-- TMPL_IF NAME=add_validate --z39.50 Servers rsaquo; z39.50 Server
Added!-- /TMPL_IF --
-!-- TMPL_IF NAME=delete_confirmed --z39.50 Servers rsaquo; z39.50 Server
Deleted!-- /TMPL_IF --/title
+titleKoha rsaquo; Administration rsaquo; !-- TMPL_IF NAME=else
--Z39.50 Servers!-- /TMPL_IF --
+!-- TMPL_IF NAME=add_form -- Z39.50 Servers rsaquo; !-- TMPL_IF
NAME=searchfield --Modify Z39.50 Server !-- TMPL_VAR NAME=searchfield
--!-- TMPL_ELSE --New Z39.50 Server!-- /TMPL_IF --!-- /TMPL_IF --
+!-- TMPL_IF NAME=delete_confirm --Z39.50 Servers rsaquo; Confirm
Deletion!-- /TMPL_IF --
+!-- TMPL_IF NAME=add_validate --Z39.50 Servers rsaquo; Z39.50 Server
Added!-- /TMPL_IF --
+!-- TMPL_IF NAME=delete_confirmed --Z39.50 Servers rsaquo; Z39.50 Server
Deleted!-- /TMPL_IF --/title
!-- TMPL_INCLUDE NAME=doc-head-close.inc --
!-- TMPL_IF NAME=add_form --
@@ -71,11 +71,11 @@
!-- TMPL_INCLUDE NAME=header.inc --
!-- TMPL_INCLUDE NAME=z3950-admin-search.inc --
-div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo; a
href=/cgi-bin/koha/admin/admin-home.plAdministration/a rsaquo; !--
TMPL_IF NAME=else --z39.50 Servers!-- /TMPL_IF --
-!-- TMPL_IF NAME=add_form -- a
href=/cgi-bin/koha/admin/z3950servers.plz39.50 Servers/a rsaquo; !--
TMPL_IF NAME=searchfield --Modify z39.50 Server !-- TMPL_VAR
NAME=searchfield --!-- TMPL_ELSE --New z39.50 Server!-- /TMPL_IF --!--
[Koha-patches] [PATCH] Fix for Bug 2869, 'do not delete' marc framework tag - reverts to 'default' framework
- Do not delete form was missing hidden framework code input.
- Also added details to breadcrumb navigation
---
.../prog/en/modules/admin/marctagstructure.tmpl|4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
index 31e757d..34153ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
@@ -43,8 +43,10 @@ $(document).ready(function() {
!-- TMPL_ELSIF name=else --
rsaquo; a href=/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=!--
TMPL_VAR NAME=frameworkcode --!-- TMPL_VAR NAME=frameworktext -- (!--
TMPL_VAR NAME=frameworkcode --)/a
!-- TMPL_ELSIF name=delete_confirm --
+rsaquo; a href=/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=!--
TMPL_VAR NAME=frameworkcode --!-- TMPL_VAR NAME=frameworktext -- (!--
TMPL_VAR NAME=frameworkcode --)/a
rsaquo; Confirm Deletion of Tag '!-- TMPL_VAR name=searchfield --'
!-- TMPL_ELSIF name=delete_confirmed --
+rsaquo; a href=/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=!--
TMPL_VAR NAME=frameworkcode --!-- TMPL_VAR NAME=frameworktext -- (!--
TMPL_VAR NAME=frameworkcode --)/a
rsaquo; Data Deleted
!-- /TMPL_IF --
/div
@@ -94,7 +96,7 @@ $(document).ready(function() {
input type=hidden name=searchfield value=!-- TMPL_VAR
NAME=searchfield -- /input type=hidden name=frameworkcode value=!--
TMPL_VAR NAME=frameworkcode -- /
input type=submit class=approve value=Yes, Delete this Tag
//form
- form action=!-- TMPL_VAR NAME=script_name -- method=getinput
type=submit value=No, Do Not Delete class=deny //form/div
+ form action=!-- TMPL_VAR NAME=script_name -- method=getinput
type=hidden name=frameworkcode value=!-- TMPL_VAR NAME=frameworkcode
-- /input type=submit value=No, Do Not Delete class=deny
//form/div
!-- /TMPL_IF --
!-- TMPL_IF NAME=delete_confirmed --
--
1.5.6.5
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 3991, Circulation search submit button wrapping in WebKit browsers
If CircAutocompl is ON, the circ search form has a hidden div for use in
displaying live search results. For some reason WebKit browsers (Safari and
Chrome) treat this hidden element as a something that should create a line
break like any other block-level element. Moving the submit button to
before that hidden div fixes the problem without disrupting the display
of the live search results.
---
.../prog/en/includes/patron-search-box.inc |3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
index 93a5efc..e014be2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
@@ -48,9 +48,8 @@ YAHOO.util.Event.onContentReady(header_search, function() {
!-- TMPL_IF NAME=CircAutocompl --
div class=autocomplete
div id=borrowerautocomplete class=autocomplete
-input autocomplete=off id=findborrower
name=findborrower size=40 class=focus type=text /
+input autocomplete=off id=findborrower
name=findborrower size=40 class=focus type=text / input
id=ysearchsubmit type=submit class=submit value=Submit /
div id=yborrowercontainer/div
-input id=ysearchsubmit type=submit class=submit
value=Submit /
input name=branch value=!-- TMPL_VAR name=branch --
type=hidden /
input name=printer value= type=hidden /
!-- TMPL_IF NAME=stickyduedate --
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bugs 3998, 3968. Includes other markup corrections and reformats.
Bug 3998: Confusing warning on budget add page
Bug 3968: Empty Blue Box Pop Up
- Removed warning, made budget amount a required field.
- Added conditional logic to prevent display of tooltip when there is no content
- Moved filter form into sidebar
- Changed Budgets.pm to pass an ID to a form field
---
C4/Budgets.pm |1 +
.../intranet-tmpl/prog/en/css/staff-global.css | 17 ++-
.../prog/en/modules/admin/aqbudgets.tmpl | 216 ++--
3 files changed, 124 insertions(+), 110 deletions(-)
diff --git a/C4/Budgets.pm b/C4/Budgets.pm
index 3c3c4c3..8ef85ed 100644
--- a/C4/Budgets.pm
+++ b/C4/Budgets.pm
@@ -318,6 +318,7 @@ sub GetBudgetPermDropbox {
$labels{'1'} = 'Owner';
$labels{'2'} = 'Library';
my $radio = CGI::scrolling_list(
+ -id = 'budget_permission',
-name = 'budget_permission',
-values= [ '0', '1', '2' ],
-default = $perm,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 313e36b..5e18b5f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -239,7 +239,6 @@ table.invis tr,table.invis td {
border : white;
}
-
td, th {
border-bottom : 1px solid #BCBCBC;
border-left : 1px solid #BCBCBC;
@@ -255,6 +254,12 @@ td.borderless {
border : 0 none;
}
+td.data,
+th.data {
+ font-family : Courier New, Courier, monospace;
+ text-align : right;
+}
+
th {
background-color : #E8E8E8;
font-weight : bold;
@@ -514,6 +519,16 @@ div.yui-b fieldset.brief ol {
div.yui-b fieldset.brief select {
width: 12em;
}
+div.yui-b fieldset.brief li.radio {
+ padding : .7em 0;
+}
+div.yui-b fieldset.brief li.radio label {
+ display : inline;
+}
+
+div.yui-b fieldset.brief li.radio input {
+ padding:0.3em 0;
+}
fieldset.rows {
border-width : 1px;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
index a7c64c9..ca8cd4f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
@@ -1,11 +1,12 @@
+!-- TMPL_INCLUDE NAME=doc-head-open.inc --
+titleKoha rsaquo; Administration rsaquo; Budgets/title
!-- TMPL_INCLUDE NAME=doc-head-close.inc --
!-- TMPL_INCLUDE NAME=calendar.inc --
-script type=text/javascript src=!-- TMPL_VAR NAME='themelang'
--/js/acq.js/script
+script type=text/javascript src=!-- TMPL_VAR NAME=themelang
--/js/acq.js/script
!-- TMPL_IF name=add_form --
script type=text/javascript
//![CDATA[
- //
var actTotal =;
@@ -21,11 +22,15 @@
// var actTotal =;
if (!(isNotNull(f.budget_code,1))) {
- _alertString += _(- Budget code missing\n);
+ _alertString += _(- Budget code cannot be blank\n);
}
if (!(isNotNull(f.budget_name,1))) {
- _alertString += _(- Budget name missing\n);
+ _alertString += _(- Budget name cannot be blank\n);
+ }
+
+ if (!(isNotNull(f.budget_amount,1))) {
+ _alertString += _(- Budget amount cannot be blank\n);
}
var budgetId;
@@ -79,46 +84,48 @@
//]]
/script
!-- TMPL_ELSE --
-link href=!-- TMPL_VAR NAME='themelang'
--/lib/jquery/plugins/treetable/stylesheets/jquery.treeTable.css
rel=stylesheet type=text/css /
+link href=!-- TMPL_VAR NAME=themelang
--/lib/jquery/plugins/treetable/stylesheets/jquery.treeTable.css
rel=stylesheet type=text/css /
-script type=text/javascript src=!-- TMPL_VAR NAME='themelang'
--/lib/jquery/plugins/jquery.tablesorter.min.js/script
-script type=text/javascript src=!-- TMPL_VAR NAME='themelang'
--/lib/jquery/plugins/treetable/jquery.treeTable.min.js/script
-script type=text/javascript src=!-- TMPL_VAR NAME='themelang'
--/lib/jquery/plugins/jquery.qtip.js/script
+script type=text/javascript src=!-- TMPL_VAR NAME=themelang
--/lib/jquery/plugins/jquery.tablesorter.min.js/script
+script type=text/javascript src=!-- TMPL_VAR NAME=themelang
--/lib/jquery/plugins/treetable/jquery.treeTable.min.js/script
+script type=text/javascript src=!-- TMPL_VAR NAME=themelang
--/lib/jquery/plugins/jquery.qtip.js/script
script type=text/javascript
//![CDATA[
//
$(document).ready(function() {
+ var tooltipcontent = $(.tooltipcontent);
+ tooltipcontent.hide();
- $('.tooltiped').each(function (){
- contentelem = $(this).children().filter('.tooltipcontent');
+ $(.tooltiped td).each(function (){
+ contentelem =
[Koha-patches] [PATCH] Re-patching: Itemtypes and ccodes link points to itemtype admin--no ccodes.
From: Owen Leonard oleon...@debian-lenny.localhost --- .../intranet-tmpl/prog/en/includes/admin-menu.inc |2 +- .../prog/en/modules/admin/admin-home.tmpl |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc index c5919e6..4fbb584 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc @@ -8,7 +8,7 @@ lia href=/cgi-bin/koha/admin/branches.plLibraries, branches, groups/a/li lia href=/cgi-bin/koha/admin/aqbudgets.plBudgets, periods, planning/a/li lia href=/cgi-bin/koha/admin/currency.plCurrencies and exchange rates/a/li - lia href=/cgi-bin/koha/admin/itemtypes.plItem types and circulation codes/a/li + lia href=/cgi-bin/koha/admin/itemtypes.plItem types/a/li /ul h5Patrons and circulation/h5 diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl index 25d43b6..9951453 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl @@ -32,8 +32,8 @@ dl dta href=/cgi-bin/koha/admin/branches.plLibraries, branches and groups/a/dt ddDefine libraries, branches and groups./dd -dta href=/cgi-bin/koha/admin/itemtypes.plItem types and circulation codes/a/dt -ddDefine item types and circulation codes used for circulation rules./dd +dta href=/cgi-bin/koha/admin/itemtypes.plItem types/a/dt +ddDefine item types used for circulation rules./dd /dl h3Patrons and circulation/h3 -- 1.5.6.5 ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 3229, The Sort By feature for lists does not work.
White space in table cells can often break the javascript tablesorter.
The previous patch to tie the js tablesorter to the shelf sort
parameters should work now.
---
.../opac-tmpl/prog/en/modules/opac-shelves.tmpl| 11 +--
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index 1741d64..87b78fc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -245,16 +245,7 @@ $(function() {
img src=!-- TMPL_VAR NAME=imageurl --
alt=!-- TMPL_VAR NAME=description -- title=!-- TMPL_VAR
NAME=description -- /!-- TMPL_VAR NAME=description --
/td
!-- /TMPL_UNLESS --
-td
-!-- TMPL_IF NAME=BiblioDefaultViewmarc --
- a class=title
href=/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --!-- TMPL_VAR NAME=title escape=html
-- !-- TMPL_VAR NAME=subtitle --/a
-!-- TMPL_ELSE --
- !-- TMPL_IF NAME=BiblioDefaultViewisbd --
- a class=title
href=/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --!-- TMPL_VAR NAME=title escape=html
-- !-- TMPL_VAR NAME=subtitle --/a
- !-- TMPL_ELSE --
- a class=title
href=/cgi-bin/koha/opac-detail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --!-- TMPL_VAR NAME=title escape=html
-- !-- TMPL_VAR NAME=subtitle --/a
- !-- /TMPL_IF --
-!-- /TMPL_IF --
+td!-- TMPL_IF NAME=BiblioDefaultViewmarc --a
class=title href=/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --!-- TMPL_VAR NAME=title escape=html
-- !-- TMPL_VAR NAME=subtitle --/a!-- TMPL_ELSE --!-- TMPL_IF
NAME=BiblioDefaultViewisbd --a class=title
href=/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --!-- TMPL_VAR NAME=title escape=html
-- !-- TMPL_VAR NAME=subtitle --/a!-- TMPL_ELSE --a class=title
href=/cgi-bin/koha/opac-detail.pl?biblionumber=!-- TMPL_VAR
NAME=biblionumber ESCAPE=URL --!-- TMPL_VAR NAME=title escape=html
-- !-- TMPL_VAR NAME=subtitle --/a!-- /TMPL_IF --!-- /TMPL_IF --
!-- COinS / OpenURL --
!-- COinS / OpenURL --span class=Z3988
title=!-- TMPL_VAR NAME=coins --/span
br/
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 3271, Missing message when adding to a list with no items selected
The shelf js was trying to access a variable set by the Cart-related js. With
the cart disabled, the variable was missing. The patch sets this variable
for cases when the Cart is turned off.
---
.../opac-tmpl/prog/en/includes/doc-head-close.inc |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
index 8b148ca..a94acd2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
@@ -50,7 +50,8 @@
var MSG_NO_RECORD_ADDED = _(No item was added to your cart);
var MSG_CONFIRM_DEL_BASKET = _(Are you sure you want to empty your
cart?);
var MSG_CONFIRM_DEL_RECORDS = _(Are you sure you want to remove the
selected items?);
- $(#cartDetails).ready(function(){ $(#cmspan).html(a href=\#\
id=\cartmenulink\ class=\\i\/ispani\/ispan\/spanimg
src=\/opac-tmpl/prog/images/cart.gif\ width=\14\ height=\14\ alt=\\
border=\0\ / +_(Cart)+span id=\basketcount\\/span\/span\/a);
}); !-- /TMPL_IF --
+ $(#cartDetails).ready(function(){ $(#cmspan).html(a href=\#\
id=\cartmenulink\ class=\\i\/ispani\/ispan\/spanimg
src=\/opac-tmpl/prog/images/cart.gif\ width=\14\ height=\14\ alt=\\
border=\0\ / +_(Cart)+span id=\basketcount\\/span\/span\/a);
}); !-- TMPL_ELSE --!-- TMPL_IF NAME=virtualshelves --
+var MSG_NO_RECORD_SELECTED = _(No item was selected);!-- /TMPL_IF
--!-- /TMPL_IF --
!-- TMPL_IF NAME=OPACAmazonCoverImages --$(window).load(function() {
verify_images();
});!-- /TMPL_IF --
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 3589, OpacHighlightedWords sys pref does nothing
---
C4/Auth.pm |1 +
.../opac-tmpl/prog/en/modules/opac-results.tmpl| 10 --
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/C4/Auth.pm b/C4/Auth.pm
index 608fd9b..f0b0ccf 100755
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -394,6 +394,7 @@ sub get_template_and_user {
LoginBranchname =
C4::Context-userenv?C4::Context-userenv-{branchname}:,
OPACAmazonSimilarItems= .
C4::Context-preference(OPACAmazonSimilarItems),
OPACFRBRizeEditions =
C4::Context-preference(OPACFRBRizeEditions),
+OpacHighlightedWords =
C4::Context-preference(OpacHighlightedWords),
OPACItemHolds =
C4::Context-preference(OPACItemHolds),
OPACShelfBrowser = .
C4::Context-preference(OPACShelfBrowser),
OPACURLOpenInNewWindow= .
C4::Context-preference(OPACURLOpenInNewWindow),
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index d3da357..646a642 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -10,8 +10,8 @@
script type=text/javascript src=!-- TMPL_VAR name=themelang
--/lib/jquery/plugins/jquery.checkboxes.min.js/script
-script type=text/javascript src=!-- TMPL_VAR name=themelang
--/lib/jquery/plugins/jquery.highlight-3.js/script
-script type=text/javascript
+!-- TMPL_IF NAME=OpacHighlightedWords --script type=text/javascript
src=!-- TMPL_VAR name=themelang
--/lib/jquery/plugins/jquery.highlight-3.js/script
+!-- /TMPL_IF --script type=text/javascript
//![CDATA[
function holdMultiple() {
@@ -162,13 +162,11 @@ $(document).ready(function(){
!-- /TMPL_IF --
$(#holdDetails).hide();
-!-- TMPL_IF NAME=query_desc --
-var query_desc = !-- TMPL_VAR NAME=query_desc ESCAPE=JS--;
+!-- TMPL_IF NAME=query_desc --!-- TMPL_IF NAME=OpacHighlightedWords
--var query_desc = !-- TMPL_VAR NAME=query_desc ESCAPE=JS--;
q_array = query_desc.split( );
highlightOn();
$(#highlight_toggle_on ).hide().click(function() {highlightOn() ;});
-$(#highlight_toggle_off).show().click(function() {highlightOff();});
-!-- /TMPL_IF --
+$(#highlight_toggle_off).show().click(function()
{highlightOff();});!-- /TMPL_IF --!-- /TMPL_IF --
!-- TMPL_IF NAME=TagsEnabled --
$(.tagbutton).click(KOHA.Tags.add_tag_button);
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 3956, Basket details table headers misaligned
--- .../prog/en/modules/acqui/booksellers.tmpl |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl index 48d138f..e85ae76 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl @@ -74,7 +74,7 @@ td table !-- TMPL_IF NAME=loop_basket-- tr -thBasket/th +thBasket (#)/th thItems/th thCreated by/th thDate/th @@ -90,8 +90,7 @@ tr !-- /TMPL_UNLESS -- !--/TMPL_IF-- -td!-- TMPL_VAR NAME=basketno --/td -td!-- TMPL_VAR NAME=basketname --/td +td!-- TMPL_VAR NAME=basketname -- (!-- TMPL_VAR NAME=basketno --)/td td!--TMPL_VAR NAME=total--/td td !-- TMPL_VAR name=firstname -- !-- TMPL_VAR name=surname -- -- 1.6.3.3 ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 3949, already received box has funny shading and other cosmetic changes
- moving filter form to sidebar
- correcting markup
- moving table row show/hide message out of the table and adjusting for zero-
vs. 1-based js counts
---
.../intranet-tmpl/prog/en/css/staff-global.css |9 +
.../prog/en/modules/acqui/parcel.tmpl | 189 ++--
2 files changed, 100 insertions(+), 98 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 313e36b..e3bae59 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -298,6 +298,15 @@ tr.highlight.onissue td {
background-color: #E1;
}
+tfoot td {
+ background-color : #f3f3f3;
+ font-weight : bold;
+}
+
+td.total {
+ text-align : right;
+}
+
caption {
font-size : 133.9%;
font-weight : bold;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
index 7c940fc..c97c26e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
@@ -4,15 +4,15 @@
!-- TMPL_INCLUDE NAME=doc-head-close.inc --
!-- TMPL_INCLUDE NAME=greybox.inc --
script type=text/javascript src=!-- TMPL_VAR NAME=yuipath
--/json/json-min.js/script
-script type=text/JavaScript language=JavaScript
+script type=text/JavaScript
//![CDATA[
var rowsToCollapse = 5;
$(document).ready(function(){
- rowCountPending = $(table#pendingt tbody.filterclass tr).length;
- rowCountReceived = $(table#receivedt tbody.filterclass tr).length;
+ rowCountPending = $(#pendingt tbody.filterclass tr).length;
+ rowCountReceived = $(#receivedt tbody.filterclass tr).length;
if (rowCountPending rowsToCollapse) { pendingCollapse(); }
if (rowCountReceived rowsToCollapse) { receivedCollapse(); }
});
@@ -31,32 +31,30 @@
// Collapse pending items table
function pendingCollapse() {
$(#pendingcollapserow).remove();
- $(table#pendingt tbody.filterclass tr:gt( + rowsToCollapse +
)).hide();
- $(#basketfilter).focus();
- $(trtd id=\pendingcollapserow\ colspan=\7\Only the first +
rowsToCollapse + items are displayed. a
href=\javascript:pendingExpand();\Click here to show all + rowCountPending
+ items\/a.\/td\/tr).appendTo(table#pendingt);
+ $(#pendingt tbody.filterclass tr:gt( + (rowsToCollapse-1) +
)).hide();
+ $(#pendingt).before(p id=\pendingcollapserow\Only the first +
rowsToCollapse + items are displayed. a
href=\javascript:pendingExpand();\Click here to show all + rowCountPending
+ items\/a.\/p);
}
// Expend pending items table
function pendingExpand() {
$(#pendingcollapserow).remove();
- $(table#pendingt tr).show();
- $(trtd id=\pendingcollapserow\ colspan=\7\All +
rowCountPending + items are displayed. a
href=\javascript:pendingCollapse();\Click here to show only the first +
rowsToCollapse + items\/a.\/td\/tr).appendTo(table#pendingt);
+ $(#pendingt tr).show();
+ $(#pendingt).before(p id=\pendingcollapserow\All +
rowCountPending + items are displayed. a
href=\javascript:pendingCollapse();\Click here to show only the first +
rowsToCollapse + items\/a.\/p);
}
// Collapse already received items table
function receivedCollapse() {
$(#receivedcollapserow).remove();
- $(table#receivedt tbody.filterclass tr:gt( + rowsToCollapse +
)).hide();
- $(trtd id=\receivedcollapserow\ colspan=\7\Only the first +
rowsToCollapse + items are displayed. a
href=\javascript:receivedExpand();\Click here to show all +
rowCountReceived + items\/a.\/td\/tr).appendTo(table#receivedt);
-
+ $(#receivedt tbody.filterclass tr:gt( + (rowsToCollapse-1) +
)).hide();
+ $(#receivedt).before(p id=\receivedcollapserow\Only the first
+ rowsToCollapse + items are displayed. a
href=\javascript:receivedExpand();\Click here to show all +
rowCountReceived + items\/a.\/p);
}
// Expand already received items table
function receivedExpand() {
$(#receivedcollapserow).remove();
- $(table#receivedt tr).show();
- $(trtd id=\receivedcollapserow\ colspan=\7\All +
rowCountReceived + items are displayed. a
href=\javascript:receivedCollapse();\Click here to show only the first +
rowsToCollapse + items\/a.\/td\/tr).appendTo(table#receivedt);
+ $(#receivedt tr).show();
+ $(#receivedt).before(p id=\receivedcollapserow\All +
rowCountReceived + items are displayed. a
href=\javascript:receivedCollapse();\Click here to show only the first +
rowsToCollapse + items\/a.\/p);
}
// Launch filtering
@@ -102,7 +100,7 @@
// If nothing has been found, we tell the user
so
if (orders.length == 0) {
-
[Koha-patches] [PATCH] Fix for Bug 3960, moving filter form to the sidebar.
--- .../prog/en/modules/acqui/parcels.tmpl | 62 +++- 1 files changed, 34 insertions(+), 28 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl index 01a56a0..f74c647 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl @@ -9,7 +9,7 @@ div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo; a href=/cgi-bin/koha/acqui/acqui-home.plAcquisitions/a rsaquo; a href=/cgi-bin/koha/acqui/supplier.pl?supplierid=!-- TMPL_VAR NAME=supplierid --!-- TMPL_VAR NAME=name --/a rsaquo; Receive shipment from vendor !-- TMPL_VAR NAME=name --/div -div id=doc class=yui-t7 +!-- TMPL_IF NAME=count --div id=doc3 class=yui-t2!-- TMPL_ELSE --div id=doc class=yui-t7!-- /TMPL_IF -- div id=bd div id=yui-main @@ -17,33 +17,12 @@ h1Receive shipment from vendor a href=/cgi-bin/koha/acqui/supplier.pl?supplierid=!-- TMPL_VAR NAME=supplierid --!-- TMPL_VAR NAME=name --/a/h1 -!-- TMPL_IF NAME=count --p !-- TMPL_VAR NAME=count -- shipments/p!--/TMPL_IF-- +!-- TMPL_IF NAME=count -- +p !-- TMPL_VAR NAME=count -- shipments/p div id=resultlist !-- Search Results Table -- -!-- TMPL_IF NAME=count -- -form method=get action=parcels.pl -table class=small -tr -th input type=hidden name=supplierid value=!-- TMPL_VAR NAME=supplierid -- //th -thlabel for=filterInvoice / Code:/labelinput type=text size=20 name=filter value=!-- TMPL_VAR NAME=filter -- id=filter //th -thlabel for=datefromFrom:/labelinput type=text size=9 id=datefrom name=datefrom value=!-- TMPL_VAR NAME=datefrom -- /br / -label for=datetoTo:/labelinput type=text size=9 id=dateto name=dateto value=!-- TMPL_VAR NAME=dateto -- //th -thlabel for=orderbySort by :/labelselect name=orderby id=orderby -option value=aqorders.booksellerinvoicenumber Code/option -option value=datereceived Date Received/option -option value=datereceived desc Date Received reverse/option -option value=aqorders.booksellerinvoicenumber desc Code reverse/option -/selectbr / -label for=resultsperpageResults per page :/labelselect name=resultsperpage id=resultsperpage -option value=2020/option -option value=3030/option -option value=5050/option -option value=100100/option -/select/th -thinput type=submit class=button value=Filter //th -/tr - /tablebr / -table class=small + +table class=small tr thLine/th thDate Received/th @@ -81,7 +60,7 @@ /tr !-- /TMPL_LOOP -- /table -/form + div id=resultnumber !-- Row of numbers corresponding to search result pages -- !-- TMPL_IF NAME=displayprev -- @@ -98,8 +77,9 @@ a href=parcels.pl?supplierid=!-- TMPL_VAR NAME=supplierid --amp;startfrom=!-- TMPL_VAR NAME=nextstartfrom --!--TMPL_IF Name=datefrom--amp;datefrom=!--TMPL_VAR Name=datefrom--!--/TMPL_IF--!--TMPL_IF Name=dateto--amp;dateto=!--TMPL_VAR Name=dateto--!--/TMPL_IF--!--TMPL_IF Name=code--amp;filter=!--TMPL_VAR Name=code--!--/TMPL_IF--!--TMPL_IF Name=orderby--amp;orderby=!--TMPL_VAR Name=orderby--!--/TMPL_IF--!--TMPL_IF Name=resultsperpage--amp;resultsperpage=!--TMPL_VAR Name=resultsperpage--!--/TMPL_IF--amp;type=intraNext gt;gt;/a !-- /TMPL_IF -- /div -!--/TMPL_IF-- /div +!--/TMPL_IF-- + div id=parcels_new_parcel form method=get action=parcel.pl fieldset class=rows @@ -139,5 +119,31 @@ /div /div /div +div class=yui-b +!-- TMPL_IF NAME=count --form method=get action=parcels.pl +fieldset class=brief + h4Filter/h4 +ol +li input type=hidden name=supplierid value=!-- TMPL_VAR NAME=supplierid -- //li +lilabel for=filterInvoice number:/labelinput type=text size=20 name=filter value=!-- TMPL_VAR NAME=filter -- id=filter //li +lilabel for=datefromFrom:/labelinput type=text size=9 id=datefrom name=datefrom value=!-- TMPL_VAR NAME=datefrom -- /br / +label for=datetoTo:/labelinput type=text size=9 id=dateto name=dateto value=!-- TMPL_VAR NAME=dateto -- //li +lilabel for=orderbySort by :/labelselect name=orderby id=orderby +option value=aqorders.booksellerinvoicenumberInvoice number/option +option value=datereceived Date Received/option +option value=datereceived desc Date Received reverse/option +option value=aqorders.booksellerinvoicenumber desc Invoice number reverse/option +/selectbr / +label for=resultsperpageResults per page :/labelselect name=resultsperpage id=resultsperpage +option value=2020/option +
[Koha-patches] [PATCH] Reformat of suggestions management interface (Bug 3844)
Changes and fixes include:
- Moving filters forms into left-hand sidebar
- Making filter forms collapsed by default (click to show)
- Converting check all to text link to match similar controls on other pages
- Correcting case of tab labels
- Fixing display of custom reason field
- Converting radio buttons to drop-down for more compact display
- Table-sorter column exclusions
- Markup corrections
---
.../prog/en/modules/suggestion/suggestion.tmpl | 258 +++-
suggestion/suggestion.pl | 11 +-
2 files changed, 148 insertions(+), 121 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
index f29bfd8..2bfe15a 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
@@ -1,7 +1,8 @@
-!-- TMPL_INCLUDE NAME=doc-head-open.inc --title!-- TMPL_IF
NAME=LibraryNameTitle --!-- TMPL_VAR NAME=LibraryNameTitle --!--
TMPL_ELSE --Koha Online!-- /TMPL_IF -- Catalog rsaquo;
-!-- TMPL_IF name=op_save --!-- TMPL_IF name=suttesionid --Edit
purchase suggestion #!-- TMPL_VAR name=suggestionid --!--TMPL_ELSE--Enter
a new purchase suggestion!-- /TMPL_IF --!--TMPL_ELSE--Suggestions!--
/TMPL_IF --/title
+!-- TMPL_INCLUDE NAME=doc-head-open.inc --titleKoha rsaquo;
Acquisitions rsaquo;
+!-- TMPL_IF name=op_save --!-- TMPL_IF name=suttesionid --Edit
purchase suggestion #!-- TMPL_VAR name=suggestionid --!--TMPL_ELSE--Enter
a new purchase suggestion!-- /TMPL_IF --!--TMPL_ELSE--Suggestions
Management!-- /TMPL_IF --/title
!-- TMPL_INCLUDE NAME=doc-head-close.inc --
!--TMPL_IF Name=op_else-- script type=text/javascript src=!--
TMPL_VAR name=themelang
--/lib/jquery/plugins/jquery.tablesorter.min.js/script
+script type=text/javascript src=!-- TMPL_VAR name=themelang
--/lib/jquery/plugins/jquery.checkboxes.min.js/script
script type=text/JavaScript
// ![CDATA[
@@ -18,7 +19,10 @@ $.tablesorter.addParser({
* displayOther.
* This function display the select or an textaera to write a reason.
*/
-function displayOther(id,show,hide) {$(#+hide+id).hide();
$(#+show+id).show(); }
+function displayOther(id,show,hide){
+ $(#+hide+id).hide();
+ $(#+show+id).show();
+}
$(document).ready(function() {
yuiToolbar();
$('#suggestiontabs ul').tabs({
@@ -32,40 +36,57 @@ $(document).ready(function() {
$.tablesorter.defaults.widgets = ['zebra'];
!--TMPL_LOOP Name=suggestions--
+// functions for !--TMPL_VAR Name=suggestiontype-- interactions
$(#!--TMPL_VAR Name=suggestiontype--t).tablesorter({!-- TMPL_IF
EXPR=dateformat eq 'metric' --
dateFormat: 'uk',!-- /TMPL_IF --
headers: {0:{sorter: false}, 1: { sorter: 'articles' },5:{sorter:
false},6:{sorter: false},7:{sorter: false}, 8:{sorter: false},9:{sorter:
false},10:{sorter: false}}
});
$(#CheckAll!--TMPL_VAR Name=suggestiontype--).click(function(){
-$(#!--TMPL_VAR Name=suggestiontype--t :checkbox).attr('checked',
$(#CheckAll!--TMPL_VAR Name=suggestiontype--).is(':checked'));
-});
-$(div[id*=other_reason!--TMPL_VAR Name=suggestiontype--]).hide();
+ $(#!--TMPL_VAR Name=suggestiontype--t).checkCheckboxes();
+ });
+$(#UncheckAll!--TMPL_VAR Name=suggestiontype--).click(function(){
+ $(#!--TMPL_VAR
Name=suggestiontype--t).unCheckCheckboxes();
+ });
+ $(#other_reason!--TMPL_VAR Name=suggestiontype--).hide();
$(input[name*=other_reason!--TMPL_VAR
Name=suggestiontype--]).focus(function(){ $(this).val(); });
-$(select[name*=reason!--TMPL_VAR
Name=suggestiontype--]).change(function(){
-if($(this).children([selected]).val() == other){
-
displayOther($(this).attr(name).replace(/reason/,),other_reason!--TMPL_VAR
Name=suggestiontype--,select-reason!--TMPL_VAR
Name=suggestiontype--);
-}
+$(#reason!--TMPL_VAR Name=suggestiontype--).change(function(){
+ if($(this).val() == other){
+ $(this).hide();
+ $(#other_reason!-- TMPL_VAR NAME=suggestiontype
--).show();
+ }
});
+ $(#!-- TMPL_VAR NAME=suggestiontype --delete).change(function(){
+ if(this.checked){
+ $(form[name='f!-- TMPL_VAR NAME=suggestiontype
--'] input[name=op]).attr(value,delete);
+ } else {
+ $(form[name='f!-- TMPL_VAR NAME=suggestiontype
--'] input[name=op]).attr(value,change);
+ }
+ });
+
!--/TMPL_LOOP--
$(a[href*=back]).click(function(){
-var sid = $(this).attr(href).replace(/#back/,);
-displayOther(sid,select-reason,other_reason);
-$(#reason+sid).find(option[value='']).attr(selected,selected);
+ var sid = $(this).attr(href).replace(/#back/,);
+
$(#reason+sid).show().find(option[value='']).attr(selected,selected);
+
[Koha-patches] [PATCH] Markup, breadcrumbs, and language corrections.
Also adding a link back to smart-rules.pl from clone-rules.pl results page.
---
.../prog/en/modules/admin/clone-rules.tmpl | 16
.../prog/en/modules/admin/smart-rules.tmpl |5 +++--
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tmpl
index 4945f2e..ad675d1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tmpl
@@ -1,32 +1,32 @@
!-- TMPL_INCLUDE NAME=doc-head-open.inc --
-titleKoha rsaquo; Administration rsaquo; Clone Issuing Rules/title
+titleKoha rsaquo; Administration rsaquo; Issuing Rules rsaquo; Clone
Issuing Rules/title
!-- TMPL_INCLUDE NAME=doc-head-close.inc --
-
/head
body
!-- TMPL_INCLUDE NAME=header.inc --
!-- TMPL_INCLUDE NAME=cat-search.inc --
-div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo; a
href=/cgi-bin/koha/admin/admin-home.plAdministration/a rsaquo; Clone
Issuing Rules/div
+div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo; a
href=/cgi-bin/koha/admin/admin-home.plAdministration/a rsaquo; a
href=/cgi-bin/koha/admin/smart-rules.plIssuing rules/a rsaquo; Clone
issuing rules/div
div id=doc3 class=yui-t1
div id=bd
div id=yui-main
div class=yui-b
-h1Cloning issuing rules
+h2Cloning issuing rules
!-- TMPL_IF EXPR=frombranchname || tobranchname --
!-- TMPL_IF NAME=frombranchname -- from !-- TMPL_VAR
NAME=frombranchname --!-- /TMPL_IF --
!-- TMPL_IF NAME=tobranchname -- to !-- TMPL_VAR
NAME=tobranchname --!-- /TMPL_IF --
!-- /TMPL_IF --
-/h1
+/h2
!-- TMPL_IF NAME=result --
!-- TMPL_IF NAME=error --
- p class=errorIssuing rules cloning failed!/p
+ div class=dialog alertCloning of issuing rules failed!/div
!-- TMPL_ELSE --
- div class=messagepThe rules have been cloned./p/div
+ div class=dialog messagepThe rules have been cloned./p/div
!-- /TMPL_IF --
+ a href=/cgi-bin/koha/admin/smart-rules.plReturn to Issuing rules/a
!-- TMPL_ELSE --
p class=helpUse carefully ! If the destination library already has
issuing rules, they will be deleted without warning !/p
@@ -58,7 +58,7 @@
!-- TMPL_IF NAME=frombranch --input type=hidden
name=frombranch value=!-- TMPL_VAR NAME=frombranch -- /!-- /TMPL_IF
--
/fieldset
!-- /TMPL_UNLESS --
- input type=submit /
+ input type=submit value=Submit /
/form
!-- /TMPL_IF --
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
index 2811399..45a280f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
@@ -18,7 +18,7 @@ $(document).ready(function() {
!-- TMPL_INCLUDE NAME=header.inc --
!-- TMPL_INCLUDE NAME=cat-search.inc --
-div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo; a
href=/cgi-bin/koha/admin/admin-home.plAdministration/a rsaquo; Issuing
Rules/div
+div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo; a
href=/cgi-bin/koha/admin/admin-home.plAdministration/a rsaquo; Issuing
Rules/div
div id=doc3 class=yui-t1
@@ -46,7 +46,7 @@ $(document).ready(function() {
/ul
pTo modify a rule, create a new one with the same patron type and
item type./p
/div
-div id=bloc100
+div
form method=get action=/cgi-bin/koha/admin/smart-rules.pl
id=selectlibrary
Select a library :
select name=branch id=branch style=width:20em;
@@ -155,6 +155,7 @@ $(document).ready(function() {
thTotal Current Checkouts Allowed/th
thHold Policy/th
thnbsp;/th
+thnbsp;/th
/tr
tr
tdemDefaults!-- TMPL_UNLESS NAME=default_rules --
(not set)!-- /TMPL_IF --/em/td
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 3939, Issuing rules clone button looks like a submit
This patch incorporates a drop-down for choosing the clone to library
directly from issuing-rules.pl. This eliminates the extra step of choosing
the library after submitting the clone action and clarifies the purpose
of the two different controls.
---
.../prog/en/modules/admin/smart-rules.tmpl | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
index 2811399..ed81a9b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
@@ -47,8 +47,8 @@ $(document).ready(function() {
pTo modify a rule, create a new one with the same patron type and
item type./p
/div
div id=bloc100
-form method=get action=/cgi-bin/koha/admin/smart-rules.pl
id=selectlibrary
-Select a library :
+fieldsetform method=get
action=/cgi-bin/koha/admin/smart-rules.pl id=selectlibrary
+label for=branchstrongEdit issuing rules for:/strong/label
select name=branch id=branch style=width:20em;
option value=*Default/option
!-- TMPL_LOOP NAME=branchloop --
@@ -56,9 +56,9 @@ $(document).ready(function() {
!-- /TMPL_LOOP --
/select
/form
- !-- TMPL_IF Name=definedbranch --form
action=/cgi-bin/koha/admin/clone-rules.pl method=postinput type=hidden
name=frombranch value=!-- TMPL_VAR NAME=branch -- /input
type=submit value=Clone these rules //form!-- /TMPL_IF --
- br /
- br /
+!-- TMPL_IF Name=definedbranch --form
action=/cgi-bin/koha/admin/clone-rules.pl method=postlabel
for=tobranchstrongClone these rules to:/strong/label input
type=hidden name=frombranch value=!-- TMPL_VAR NAME=branch -- /
+select name=tobranch id=tobranch!-- TMPL_LOOP
NAME=branchloop --option value=!-- TMPL_VAR NAME=value --!--
TMPL_VAR NAME=branchname --/option!-- /TMPL_LOOP --/select input
type=submit value=Clone //form!-- /TMPL_IF --/fieldset
+
form method=post action=/cgi-bin/koha/admin/smart-rules.pl
input type=hidden name=op value=add /
table
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 3687, Empty Add to with cart off and non-logged-in user.
---
.../opac-tmpl/prog/en/modules/opac-results.tmpl|2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index d3da357..7e93baa 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -114,7 +114,7 @@ $(document).ready(function(){
});
$(span.clearall).html(a id=\CheckNone\ href=\#\+_(Clear
All)+\/a);
$(span.checkall).html(a id=\CheckAll\ href=\#\+_(Select
All)+\/a);
- $(span.addto).html(param1);
+!-- TMPL_IF NAME=opacbookbag --$(span.addto).html(param1);!-- TMPL_ELSE
--!-- TMPL_IF NAME=virtualshelves --!-- TMPL_IF NAME=loggedinusername
--$(span.addto).html(param1);!-- /TMPL_IF --!-- /TMPL_IF --!-- /TMPL_IF
--
$(#addto).change(function(){
cartList();
});
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 3940, Notes on add patron form need formatting
--- .../prog/en/modules/members/memberentrygen.tmpl|4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl index 20043c2..e56ec0b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl @@ -439,7 +439,7 @@ !-- /TMPL_IF-- Phone (home): /label input type=text id=phone name=phone value=!-- TMPL_VAR NAME=phone -- / - !-- TMPL_IF NAME=mandatoryphone --span class=requiredRequired/span!-- /TMPL_IF --strongemShows on transit slips/em/strong + !-- TMPL_IF NAME=mandatoryphone --span class=requiredRequired/span!-- /TMPL_IF --div class=hintShows on transit slips/div /li li @@ -470,7 +470,7 @@ !-- /TMPL_IF-- Email (home): /label input type=text id=email name=email size=45 value=!-- TMPL_VAR NAME=email -- / - !-- TMPL_IF NAME=mandatoryemail --span class=requiredRequired/span!-- /TMPL_IF --strongemShows on transit slips/em/strong + !-- TMPL_IF NAME=mandatoryemail --span class=requiredRequired/span!-- /TMPL_IF --div class=hintShows on transit slips/div /li li -- 1.6.3.3 ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Fix for Bug 3944, new order template formatting and markup corrections
---
.../prog/en/modules/acqui/neworderempty.tmpl | 52 ++--
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index cbd861f..7cccff0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -10,7 +10,7 @@ actTotal = ;
function Check(ff) {
var ok=0;
-var _alertString=Form not submitted because of the following
problem(s)\n;
+var _alertString= _(Form not submitted because of the following
problem(s))+\n;
_alertString
+=---\n\n;
@@ -54,8 +54,6 @@ ff.submit();
/head
body onload=calcNeworderTotal()
-div name=!-- TMPL_VAR NAME=ordernumber --
-
!-- TMPL_INCLUDE NAME=header.inc --
!-- TMPL_INCLUDE NAME=acquisitions-search.inc --
@@ -67,32 +65,33 @@ ff.submit();
div id=yui-main
div class=yui-b
-h1
+h2
!-- TMPL_IF name=ordernumber --
Modify order details (line #!-- TMPL_VAR NAME=ordernumber --)
!-- TMPL_ELSE --
New order
!-- /TMPL_IF --
!-- TMPL_IF name=suggestionid --(defined from suggestion #!--
TMPL_VAR NAME=suggestionid --)!-- /TMPL_IF --
-/h1
+/h2
!-- TMPL_IF name=basketno --
-fieldset class=rows
div id=acqui_basket_summary class=yui-g
-h2Basket details/h2
-!-- TMPL_IF NAME=basketnote --pInternal note: !-- TMPL_VAR
NAME=basketnote --/p!-- /TMPL_IF --
-!-- TMPL_IF NAME=basketbooksellernote --pBookseller note: !--
TMPL_VAR NAME=basketbooksellernote --/p!-- /TMPL_IF --
+ fieldset class=rows
+legendBasket details/legend
+ ol
+!-- TMPL_IF NAME=basketnote --lispan class=labelInternal
note:/span !-- TMPL_VAR NAME=basketnote --/li!-- /TMPL_IF --
+!-- TMPL_IF NAME=basketbooksellernote --lispan
class=labelBookseller note/span: !-- TMPL_VAR NAME=basketbooksellernote
--/li!-- /TMPL_IF --
!-- TMPL_IF NAME=basketcontractno --
-pContract number: !-- TMPL_VAR NAME=basketcontractno --/p
-pContract name: a
href=../admin/aqcontract.pl?op=add_formcontractnumber=!-- TMPL_VAR
NAME=basketcontractno --!-- TMPL_VAR NAME=basketcontractname --/a/p
+lispan class=labelContract number: /span!-- TMPL_VAR
NAME=basketcontractno --/li
+lispan class=labelContract name:/span a
href=/cgi-bin/koha/admin/aqcontract.pl?op=add_formamp;contractnumber=!--
TMPL_VAR NAME=basketcontractno --!-- TMPL_VAR NAME=basketcontractname
--/a/li
!-- /TMPL_IF --
-!-- TMPL_IF NAME=authorisedbyname --pManaged by: !-- TMPL_VAR
NAME=authorisedbyname --/p!-- /TMPL_IF --
-!-- TMPL_IF NAME=creationdate --pOpen on: !-- TMPL_VAR
NAME=creationdate --/p!-- /TMPL_IF --
+!-- TMPL_IF NAME=authorisedbyname --lispan
class=labelManaged by:/span !-- TMPL_VAR NAME=authorisedbyname
--/li!-- /TMPL_IF --
+!-- TMPL_IF NAME=creationdate --lispan class=labelOpen
on:/span !-- TMPL_VAR NAME=creationdate --/li!-- /TMPL_IF --
!-- TMPL_IF name=closedate --
form action=/cgi-bin/koha/acqui/basketgroup.pl method=post
-pClosed on: !-- TMPL_VAR name=closedate --/p
+lispan class=labelClosed on:/span !-- TMPL_VAR
name=closedate --/li
!-- TMPL_IF name=basketgroups --
-p basketgroup: select id=basketgroupid name=basketgroupid
+liBasketgroup: select id=basketgroupid name=basketgroupid
!-- TMPL_LOOP name=basketgroups --
!-- TMPL_IF name=default --
option value=!-- TMPL_VAR name=id --
selected=selected!-- TMPL_VAR name=name --/option
@@ -104,13 +103,14 @@ ff.submit();
input type=hidden id=basketno value=!-- TMPL_VAR
name=basketno -- name=basketno /
input type=hidden value=mod_basket name=op /
input type=hidden name=booksellerid value=!-- TMPL_VAR
name=booksellerid -- /
-input type=submit value=Change basketgroup /
-/p
+/li
+ fieldset class=actioninput type=submit value=Change
basketgroup //fieldset
/form
!-- /TMPL_IF --
!-- /TMPL_IF --
-/div
+ /ol
/fieldset
+/div
!-- /TMPL_IF --
form action=/cgi-bin/koha/acqui/addorder.pl method=post id=Aform
@@ -197,7 +197,7 @@ ff.submit();
fieldset class=rows
legendItem/legend
!-- TMPL_IF name=NoACQframework --
-p class=requiredNo ACQ framework, using default. You should
create a framework with code ACQ, the items framework would be used/p
+div class=dialog messageNo ACQ framework, using default. You
should create a framework with code ACQ, the items framework would be used/div
!-- /TMPL_IF --
!--
[Koha-patches] [PATCH] Fix for Bug 3905 (Serial routing list add patron popup pagination broken)
This patch also includes formatting fixes and style updates. The patron search
filter form is incorporated now within serials/member-search.tmpl in order to
have a markup structure more suited to the pop-up.
---
.../intranet-tmpl/prog/en/css/staff-global.css | 20 -
.../prog/en/modules/members/search.tmpl|1 +
.../prog/en/modules/serials/member-search.tmpl | 106 +++-
.../prog/en/modules/serials/routing.tmpl |2 +-
serials/member-search.pl |2 +-
5 files changed, 78 insertions(+), 53 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 313e36b..0953c98 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1423,19 +1423,35 @@ div.pages a {
text-decoration: none;
}
-div.pages a:link {
+div.pages a:link,
+div.pages a:visited {
background-color : #ee;
color : #3366CC;
}
div.pages a:hover {
- background-color : #e8f0f6;
+ background-color : #FFC;
}
div.pages a:active {
background-color : #ffc;
}
+div.pages .current,
+div.pages .currentPage {
+ background-color : #e6fcb7;
+ color : #666;
+ font-weight: bold;
+ padding: 1px 5px 1px 5px;
+}
+
+div.pages .inactive {
+ background-color : #f3f3f3;
+ color : #BCBCBC;
+ font-weight: bold;
+ padding: 1px 5px 1px 5px;
+}
+
div.browse {
margin : .5em 0;
}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl
index 2baecf3..00f5b65 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl
@@ -1,4 +1,5 @@
form action=!--TMPL_VAR Name=actionname-- method=get
+ fieldset class=brief
h3 Filter :/h3
input type=hidden name=surname value=!--
TMPL_VAR name=surname-- /
input type=text name=member value=!--
TMPL_VAR name=member-- /br/
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
index cf6b4b3..f6e2f0e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
@@ -12,64 +12,72 @@ function add_member(subscriptionid,borrowernumber){
//--
/script
style type=text/css
- #custom-doc { width:37.46em;*width:36.53em;min-width:430px; margin:auto;
text-align:left; }
+ #custom-doc { width:36.46em;*width:35.53em;min-width:430px; margin:auto;
text-align:left; padding: 1em; }
/style
/head
body
-div id=doc3 class=yui-t7
+div id=custom-doc class=yui-t7
- div id=bd
- div id=yui-main
- div class=yui-b
- div role=search class=yui-g
- !-- TMPL_INCLUDE NAME=../members/search.tmpl
--
- /div
- div role=main class=yui-g
-
- !-- TMPL_IF NAME=resultsloop
--
- div id=searchheader
h3Results !-- TMPL_VAR Name =from -- to !-- TMPL_VAR Name =to -- of
!-- TMPL_VAR Name =numresults -- found for !--TMPL_IF
Name=member--'span class=ex!-- TMPL_VAR NAME=member
--/span'!--/TMPL_IF--!--TMPL_IF Name=surname--'span class=ex!--
TMPL_VAR NAME=surname --/span'!--/TMPL_IF--/h3/div
- div class=searchresults
+div id=bd
+div id=yui-main
+div id=search class=yui-g
+ form action=!--TMPL_VAR Name=actionname-- method=get
+ fieldset class=rows
+ legend Filter :/legend
+ ol
+ lilabel for=memberName:/label input
type=hidden name=surname value=!-- TMPL_VAR name=surname-- /
+ input type=text name=member id=member
value=!-- TMPL_VAR name=member-- //li
+ lilabel for=branchcode Library :/labelselect
name=branchcode id=branchcode
+ option value=Any/option!-- TMPL_LOOP
name=branchloop --
+ !-- TMPL_IF NAME=selected --
+ option value=!-- TMPL_VAR name=value --
selected=selected!-- TMPL_VAR name=branchname --/option!-- TMPL_ELSE
--
+ option value=!-- TMPL_VAR name=value --!--
TMPL_VAR name=branchname --/option!-- /TMPL_IF --
+ !-- /TMPL_LOOP --/select/li
+ lilabel for=categorycodeCategory:/labelselect
name=categorycode id=categorycode
+ option value=Any/option!-- TMPL_LOOP
name=categoryloop --
+ !-- TMPL_IF NAME=selected --
+
[Koha-patches] [PATCH] Fix for Bug 3905 (Serial routing list add patron popup pagination broken)
This patch also includes formatting fixes and style updates. The patron search
filter form is incorporated now within serials/member-search.tmpl in order to
have a markup structure more suited to the pop-up. Corrected patch removes
changes to members/search.tmpl
---
.../intranet-tmpl/prog/en/css/staff-global.css | 20 -
.../prog/en/modules/serials/member-search.tmpl | 106 +++-
.../prog/en/modules/serials/routing.tmpl |2 +-
serials/member-search.pl |2 +-
4 files changed, 77 insertions(+), 53 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 313e36b..0953c98 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1423,19 +1423,35 @@ div.pages a {
text-decoration: none;
}
-div.pages a:link {
+div.pages a:link,
+div.pages a:visited {
background-color : #ee;
color : #3366CC;
}
div.pages a:hover {
- background-color : #e8f0f6;
+ background-color : #FFC;
}
div.pages a:active {
background-color : #ffc;
}
+div.pages .current,
+div.pages .currentPage {
+ background-color : #e6fcb7;
+ color : #666;
+ font-weight: bold;
+ padding: 1px 5px 1px 5px;
+}
+
+div.pages .inactive {
+ background-color : #f3f3f3;
+ color : #BCBCBC;
+ font-weight: bold;
+ padding: 1px 5px 1px 5px;
+}
+
div.browse {
margin : .5em 0;
}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
index cf6b4b3..f6e2f0e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
@@ -12,64 +12,72 @@ function add_member(subscriptionid,borrowernumber){
//--
/script
style type=text/css
- #custom-doc { width:37.46em;*width:36.53em;min-width:430px; margin:auto;
text-align:left; }
+ #custom-doc { width:36.46em;*width:35.53em;min-width:430px; margin:auto;
text-align:left; padding: 1em; }
/style
/head
body
-div id=doc3 class=yui-t7
+div id=custom-doc class=yui-t7
- div id=bd
- div id=yui-main
- div class=yui-b
- div role=search class=yui-g
- !-- TMPL_INCLUDE NAME=../members/search.tmpl
--
- /div
- div role=main class=yui-g
-
- !-- TMPL_IF NAME=resultsloop
--
- div id=searchheader
h3Results !-- TMPL_VAR Name =from -- to !-- TMPL_VAR Name =to -- of
!-- TMPL_VAR Name =numresults -- found for !--TMPL_IF
Name=member--'span class=ex!-- TMPL_VAR NAME=member
--/span'!--/TMPL_IF--!--TMPL_IF Name=surname--'span class=ex!--
TMPL_VAR NAME=surname --/span'!--/TMPL_IF--/h3/div
- div class=searchresults
+div id=bd
+div id=yui-main
+div id=search class=yui-g
+ form action=!--TMPL_VAR Name=actionname-- method=get
+ fieldset class=rows
+ legend Filter :/legend
+ ol
+ lilabel for=memberName:/label input
type=hidden name=surname value=!-- TMPL_VAR name=surname-- /
+ input type=text name=member id=member
value=!-- TMPL_VAR name=member-- //li
+ lilabel for=branchcode Library :/labelselect
name=branchcode id=branchcode
+ option value=Any/option!-- TMPL_LOOP
name=branchloop --
+ !-- TMPL_IF NAME=selected --
+ option value=!-- TMPL_VAR name=value --
selected=selected!-- TMPL_VAR name=branchname --/option!-- TMPL_ELSE
--
+ option value=!-- TMPL_VAR name=value --!--
TMPL_VAR name=branchname --/option!-- /TMPL_IF --
+ !-- /TMPL_LOOP --/select/li
+ lilabel for=categorycodeCategory:/labelselect
name=categorycode id=categorycode
+ option value=Any/option!-- TMPL_LOOP
name=categoryloop --
+ !-- TMPL_IF NAME=selected --
+ option value=!-- TMPL_VAR name=categorycode --
selected=selected!-- TMPL_VAR name=description --/option!-- TMPL_ELSE
--
+ option value=!-- TMPL_VAR name=categorycode
--!-- TMPL_VAR name=description --/option!-- /TMPL_IF --
+ !-- /TMPL_LOOP --/select/li
+ /ol
+ fieldset class=actioninput type=submit
value=Search //fieldset
+ /fieldset
+ /form
+/div
+!-- TMPL_IF NAME=resultsloop --
+div id=searchheader style=margin-top:.7em; h3Results !-- TMPL_VAR
Name =from -- to !-- TMPL_VAR Name =to -- of !-- TMPL_VAR Name
=numresults --
Re: [Koha-patches] [PATCH] Fix for Bug 3905 (Serial routing list add patron popup pagination broken)
Sorry, first patch included some changes to a file which I didn't intend to keep. Please ignore the first. -- Owen ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Style change to fix Bug 3898, Vendor Search Box Moved on Serials
Patch also includes markup fixes and cleanup for subscription-add.pl
---
.../intranet-tmpl/prog/en/css/staff-global.css |3 +-
.../prog/en/modules/serials/subscription-add.tmpl | 29 +--
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 313e36b..012abe8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -685,8 +685,9 @@ fieldset.rows label.inline {
}
fieldset.rows .inputnote {
+ clear : left;
float : left;
- margin : .5em 0 0 10em;
+ margin : .5em 0 0 11em;
}
.ui-tabs-nav li {
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
index f25c1cc..f8cadf8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
@@ -7,7 +7,6 @@
fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
.yui-u li p label.widelabel {
width: 300px; /* not enough for IE7 apparently */
-/* height: 2.4em; background-color: pink; */
}
/style
script type=text/javascript
@@ -439,22 +438,22 @@ var textbox = '';
textbox +=\/tr\n;
textbox +=trth scope=\row\+text[5]+\/tdtdinput
type='text' name='lastvalue1temp' id='lastvalue1temp' size='4'
onkeyup='moreoptionsupdate(this)' value=\ + document.f.lastvalue1.value +
\ /\/td\n;
if(y){
-textbox +=tdinput type='text' name='lastvalue2temp'
id='lastvalue2temp' size='4' onkeyup='moreoptionsupdate(this)' value=\ +
document.f.lastvalue2.value + \ /\/td\n;
+textbox +=tdinput type=\text\ name=\lastvalue2temp\
id=\lastvalue2temp\ size=\4\ onkeyup=\moreoptionsupdate(this)\ value=\
+ document.f.lastvalue2.value + \ /\/td\n;
if(z){
-textbox +=tdinput type='text' name='lastvalue3temp'
id='lastvalue3temp' size='4' onkeyup='moreoptionsupdate(this)' value=\ +
document.f.lastvalue3.value + \ /\/td\n;
+textbox +=tdinput type=\text\ name=\lastvalue3temp\
id=\lastvalue3temp\ size=\4\ onkeyup=\moreoptionsupdate(this)\ value=\
+ document.f.lastvalue3.value + \ /\/td\n;
}
}
textbox +=\/tr\n;
if(y){
textbox +=trth scope=\row\+text[6]+\/th;
textbox +=tdnbsp;\/td\n;
-textbox +=tdinput type='text' name='whenmorethan2temp'
id='whenmorethan2temp' size='4' onkeyup='moreoptionsupdate(this,1)'\/td\n;
+textbox +=tdinput type=\text\ name=\whenmorethan2temp\
id=\whenmorethan2temp\ size=\4\
onkeyup=\moreoptionsupdate(this,1)\\/td\n;
if(z){
-textbox +=tdinput type='text' name='whenmorethan3temp'
id='whenmorethan3temp' size='4' onkeyup='moreoptionsupdate(this,1)'\/td\n;
+textbox +=tdinput type=\text\ name=\whenmorethan3temp\
id=\whenmorethan3temp\ size=\4\
onkeyup=\moreoptionsupdate(this,1)\\/td\n;
}
textbox +=\/tr;
} else {
- textbox +=tr td+_(issues expected)+\/tdtdinput
type='text' name='issuesexpected1temp' id='issuesexpected1temp' size='4'
onkeyup='moreoptionsupdate(this,0)' value=\ +
document.f.issuesexpected1.value + \ \/td\/tr;
+ textbox +=tr td+_(issues expected)+\/tdtdinput
type=\text\ name=\issuesexpected1temp\ id=\issuesexpected1temp\
size=\4\ onkeyup=\moreoptionsupdate(this,0)\ value=\ +
document.f.issuesexpected1.value + \ \/td\/tr;
}
textbox +=\/table\n;
}
@@ -496,7 +495,7 @@ var textbox = '';
//alert(X: +x+Year: +y);
if(x){
var hemi_select = parseInt('!-- TMPL_VAR NAME=hemisphere --');
-textbox +=lilabel for=\hemisphere\+ text[7]
+\/labelselect name='hemisphere' id=\hemisphere\
onchange='hemispheres(this.options[this.selectedIndex].value)';
+textbox +=lilabel for=\hemisphere\+ text[7]
+\/labelselect name=\hemisphere\ id=\hemisphere\
onchange=\hemispheres(this.options[this.selectedIndex].value)\;
for(var i = 1; i = 2; i++){
textbox +=option value='+i+';
if(i == hemi_select){
@@ -505,10 +504,10 @@ var textbox = '';
textbox +=+text[i+7]+\/option;
}
textbox +=\/li\n;
-textbox +=table
id='seasonal_irregularity'trthnbsp;\/thth+x+\/th;
+textbox +=table
id=\seasonal_irregularity\trthnbsp;\/thth+x+\/th;
textbox +=th+text[16]+\/th;
textbox +=\/tr\n;
-textbox +=trth scope=\row\+text[5]+\/thtdselect
name='lastvalue2temp' id='lastvalue2temp' id='season1'
onchange='moreoptionsupdate(this)';
+textbox +=trth scope=\row\+text[5]+\/thtdselect
name=\lastvalue2temp\ id=\lastvalue2temp\ id=\season1\
onchange=\moreoptionsupdate(this)\;
for(var j = 1; j
[Koha-patches] [PATCH] Markup cleanup on subscription catalog search form and results page
---
.../prog/en/modules/serials/result.tmpl| 20
.../modules/serials/subscription-bib-search.tmpl | 19 +++
2 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
index af12ff2..b1559a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
@@ -1,5 +1,5 @@
!-- TMPL_INCLUDE NAME=doc-head-open.inc --
-titleKoha rsaquo; Search Results/title
+titleKoha rsaquo; Serials rsaquo; Search Results/title
!-- TMPL_INCLUDE NAME=doc-head-close.inc --
script type=text/javascript language=javascript
//![CDATA[
@@ -21,23 +21,19 @@ function GetIt(bibno,title)
div id=bd
-h1Search results from !-- TMPL_VAR NAME=from -- to !-- TMPL_VAR
NAME=to -- of !-- TMPL_VAR NAME=total --/h1
!-- TMPL_IF NAME=total--
+h1Search results from !-- TMPL_VAR NAME=from -- to !-- TMPL_VAR
NAME=to -- of !-- TMPL_VAR NAME=total --/h1
table
tr
thTitle/th
thAuthor/th
- thpublisher/th
+ thPublisher/th
thPublication year/th
+ thnbsp;/th
/tr
!-- TMPL_LOOP NAME=resultsloop --
tr
-td
-a href=# onclick=GetIt('!-- TMPL_VAR NAME=biblionumber
--','!-- TMPL_VAR escape=URL NAME=title --'); title=Get this one !
-!-- TMPL_VAR NAME=title escape=html --
-/a
-br /
-small!-- TMPL_VAR ESCAPE=HTML NAME=subtitle --/small
+td!-- TMPL_VAR NAME=title escape=html -- !-- TMPL_VAR
ESCAPE=HTML NAME=subtitle --
/td
td
!-- TMPL_VAR ESCAPE=HTML NAME=author --
@@ -48,6 +44,7 @@ function GetIt(bibno,title)
td
!-- TMPL_VAR ESCAPE=HTML NAME=publicationyear --
/td
+ tda href=# onclick=GetIt('!-- TMPL_VAR
NAME=biblionumber --','!-- TMPL_VAR escape=URL NAME=title --');
title=Choose this recordChoose/a/td
/tr
!-- /TMPL_LOOP --
/table
@@ -60,9 +57,8 @@ function GetIt(bibno,title)
!-- TMPL_IF NAME=displaynext --
a
href=/cgi-bin/koha/serials/subscription-bib-search.pl?op=do_searchamp;type=intranetamp;startfrom=!--
TMPL_VAR ESCAPE=URL NAME=startfromnext --amp;q=!-- TMPL_VAR
ESCAPE=URL NAME=query --gt;gt;/a
!-- /TMPL_IF --
-br/
-a href=subscription-bib-search.plSearch for another Biblio/a
-a class=button href=# onclick=window.close() Close/a
+pa href=subscription-bib-search.plSearch for another record/a/p
+fieldset class=actiona class=button close href=#Close/a/fieldset
/div
!-- TMPL_INCLUDE NAME=intranet-bottom.inc --
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl
index ed16b01..d010cd5 100644
---
a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl
+++
b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl
@@ -1,5 +1,5 @@
!-- TMPL_INCLUDE NAME=doc-head-open.inc --
-titleKoha rsaquo; Serials/title
+titleKoha rsaquo; Serials rsaquo; Catalog search/title
!-- TMPL_INCLUDE NAME=doc-head-close.inc --
/head
body
@@ -15,12 +15,14 @@
form name=f action=/cgi-bin/koha/serials/subscription-bib-search.pl
method=get
input type=hidden name=op value=do_search /
input type=hidden name=type value=intranet /
-label for=qKeyword/label
-input type=text id=q name=q /
+ fieldset class=rows
+ ol
+lilabel for=qKeyword: /label
+input type=text id=q name=q //li
!-- ITEMTYPE LIMITS --
-pLimit type to:
-select name=itemtypelimit
+lilabel for=itemtypelimitLimit type to: /label
+select name=itemtypelimit id=itemtypelimit
option value=All/option
!--TMPL_LOOP Name=itemtypeloop--
option value=!--TMPL_VAR Name=code --
@@ -28,10 +30,11 @@
/option
!--/TMPL_LOOP--
/select
-/p
+/li
!-- /ITEMTYPE LIMITS --
-
-input type=submit value=Search /
+ /ol
+/fieldset
+fieldset class=actioninput type=submit value=Search //fieldset
/form
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Markup corrections, removing table sorting from some columns.
---
.../prog/en/modules/serials/serials-home.tmpl | 14 ++
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
index 63f78f7..4a35e7c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
@@ -5,7 +5,13 @@
script type=text/javascript
//![CDATA[
$(document).ready(function() {
-$(#srlt).tablesorter();
+$(#srlt).tablesorter({
+headers: {
+2: { sorter: false },
+4: { sorter: false },
+ 5: { sorter: false }
+}
+});
});
//]]
/script
@@ -14,7 +20,7 @@
!-- TMPL_INCLUDE NAME=header.inc --
!-- TMPL_INCLUDE NAME=serials-search.inc --
-div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo;
Serials /div
+div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo;
!-- TMPL_IF NAME=done_searched--a
href=/cgi-bin/koha/serials/serials-home.plSerials/a rsaquo; Search
results!-- TMPL_ELSE --Serials !-- /TMPL_IF -- /div
div id=doc3 class=yui-t2
@@ -65,7 +71,7 @@ Serials updated :
/table
!--/TMPL_IF--
!-- TMPL_IF NAME=done_searched--
-h1Serials subscriptions/h1
+h2Serials subscriptions/h2
!-- TMPL_IF NAME=routing --
h3Search for Serial Routing List/h3
@@ -81,7 +87,7 @@ Serials updated :
Library (Callnumber)
/th
!-- TMPL_IF NAME=routing --
- th Routing list/th
+ thRouting list/th
!-- /TMPL_IF --
th colspan=2nbsp;/th
/tr
--
1.6.3.3
___
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
[Koha-patches] [PATCH] Reformatting routing list edit screen according to existing markup patterns
---
.../prog/en/modules/serials/routing.tmpl | 49 +--
1 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
index 199828f..67df5c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
@@ -1,5 +1,5 @@
!-- TMPL_INCLUDE NAME=doc-head-open.inc --
-titleKoha rsaquo; Serials rsaquo; !-- TMPL_VAR NAME=title escape=html
-- rsaquo; Edit Routing List/title
+titleKoha rsaquo; Serials rsaquo; !-- TMPL_VAR NAME=title escape=html
-- rsaquo; !-- TMPL_IF NAME=op --Create Routing List!-- TMPL_ELSE
--Edit Routing List!-- /TMPL_IF --/title
!-- TMPL_INCLUDE NAME=doc-head-close.inc --
script language=javascript type=text/javascript
!--
@@ -20,7 +20,7 @@ function search_member(subscriptionid){
!-- TMPL_INCLUDE NAME=header.inc --
!-- TMPL_INCLUDE NAME=serials-search.inc --
-div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo; a
href=/cgi-bin/koha/serials/serials-home.plSerials/a rsaquo; a
href=/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=!-- TMPL_VAR
NAME=subscriptionid --i!-- TMPL_VAR NAME=title escape=html
--/i/a rsaquo; Edit Routing List /div
+div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo; a
href=/cgi-bin/koha/serials/serials-home.plSerials/a rsaquo; a
href=/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=!-- TMPL_VAR
NAME=subscriptionid --i!-- TMPL_VAR NAME=title escape=html
--/i/a rsaquo; !-- TMPL_IF NAME=op --Create Routing List!--
TMPL_ELSE --Edit Routing List!-- /TMPL_IF --/div
div id=doc3 class=yui-t2
@@ -30,29 +30,25 @@ function search_member(subscriptionid){
!-- TMPL_IF NAME=op --
-h1Create Routing List/h1
+h1Create Routing List for i!-- TMPL_VAR NAME=title escape=html
--/i/h1
!-- TMPL_ELSE --
-h1Edit Routing List/h1
+h1Edit Routing List for i!-- TMPL_VAR NAME=title escape=html
--/i/h1
!-- /TMPL_IF --
form method=post action=routing.pl
input type=hidden name=op value=save /
input type=hidden name=subscriptionid value=!-- TMPL_VAR
NAME=subscriptionid -- /
-pbSerial Title:/b !-- TMPL_VAR NAME=title escape=html --/p
-pbIssue:/b
-
-select name=date_selected
+fieldset class=rows
+ ol
+ lilabel for=date_selectedIssue: /label
+select name=date_selected id=date_selected
!-- TMPL_LOOP NAME=dates --
!-- TMPL_IF NAME=selected --option value=!-- TMPL_VAR NAME=serialseq
-- (!-- TMPL_VAR NAME=planneddate --) selected=selected!-- TMPL_VAR
NAME=serialseq -- (!-- TMPL_VAR NAME=planneddate --)/option!--
TMPL_ELSE --option value=!-- TMPL_VAR NAME=serialseq -- (!-- TMPL_VAR
NAME=planneddate --)!-- TMPL_VAR NAME=serialseq -- (!-- TMPL_VAR
NAME=planneddate --)/option!-- /TMPL_IF --
!-- /TMPL_LOOP --
-/select
-
-!-- TMPL_VAR NAME=issue --/p
+/select !-- TMPL_VAR NAME=issue --/li
!-- TMPL_IF NAME=memberloop --
-table
-trtd style=padding-top:5px;bList Member:/b/td
-tdtable cellspacing=0 cellpadding=0 border=0 class=collapse
+lispan class=labelRecipients:/spantable style=clear:none;margin:0;
trthName/th
thRank/th
thDelete/th/tr
@@ -61,24 +57,25 @@ function search_member(subscriptionid){
td!-- TMPL_VAR NAME=routingbox --/td
tda href=/cgi-bin/koha/serials/routing.pl?routingid=!--
TMPL_VAR NAME=routingid --amp;subscriptionid=!-- TMPL_VAR
NAME=subscriptionid --amp;op=deleteDelete/a/td/tr
!-- /TMPL_LOOP --
-/tablepa onclick=search_member(!-- TMPL_VAR
+/tablep style=margin-left:10em;a onclick=search_member(!--
TMPL_VAR
NAME=subscriptionid --); return false
href=/cgi-bin/koha/serials/member-search.pl?subscriptionid=!-- TMPL_VAR
-NAME=subscriptionid -- class=buttonAdd List Member/a nbsp; a
-href=/cgi-bin/koha/serials/routing.pl?subscriptionid=!-- TMPL_VAR
NAME=subscriptionid --amp;op=delete class=buttonDelete
All/a/p/td/tr
-
+NAME=subscriptionid -- class=buttonAdd recipients/a nbsp; a
+href=/cgi-bin/koha/serials/routing.pl?subscriptionid=!-- TMPL_VAR
NAME=subscriptionid --amp;op=delete class=buttonDelete All/a/p/li
!-- TMPL_ELSE --
-table border=0 cellspacing=0 cellpadding=0
-trtdbList Member:/b/td
-tdpa onclick=search_member(!-- TMPL_VAR NAME=subscriptionid
---); return false
href=/cgi-bin/koha/serials/member-search.pl?subscriptionid=!-- TMPL_VAR
NAME=subscriptionid -- class=buttonAdd List Member/a/p/td/tr
+lispan class=labelRecipients:/span
+a onclick=search_member(!-- TMPL_VAR NAME=subscriptionid
+--); return false
href=/cgi-bin/koha/serials/member-search.pl?subscriptionid=!-- TMPL_VAR
NAME=subscriptionid -- class=buttonAdd recipients/a/li
!-- /TMPL_IF --
-trtd valign=toplabel for=notesNotes:/label/td
-tdtextarea name=notes id=notes rows=3 cols=50!-- TMPL_VAR
NAME=routingnotes --/textarea/td/tr
-/table
-pinput type=submit name=submit class=button value=Save //p
+
[Koha-patches] [PATCH] Markup reformatting following established patterns. Also changing name output to surname, firstname
--- .../prog/en/modules/serials/routing-preview.tmpl | 33 ++- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl index 999b31b..f2c658b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl @@ -1,5 +1,5 @@ !-- TMPL_INCLUDE NAME=doc-head-open.inc -- -titleKoha rsaquo; Serials/title +titleKoha rsaquo; Serials rsaquo; Preview Routing List/title !-- TMPL_INCLUDE NAME=doc-head-close.inc -- script type=text/javascript !-- @@ -16,34 +16,35 @@ window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes'); !-- TMPL_INCLUDE NAME=header.inc -- !-- TMPL_INCLUDE NAME=serials-search.inc -- +div id=breadcrumbsa href=/cgi-bin/koha/mainpage.plHome/a rsaquo; a href=/cgi-bin/koha/serials/serials-home.plSerials/a rsaquo; a href=/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=!-- TMPL_VAR NAME=subscriptionid --i!-- TMPL_VAR NAME=title escape=html --/i/a rsaquo; Preview routing list/div + div id=doc3 class=yui-t2 div id=bd div id=yui-main div class=yui-b -h1Preview Routing List/h1 +h2Preview Routing List for i!-- TMPL_VAR NAME=title escape=html --/i/h2 form method=post action=routing-preview.pl input type=hidden name=subscriptionid value=!-- TMPL_VAR NAME=subscriptionid -- / -pbSerial Title:/b !-- TMPL_VAR NAME=title escape=html --/p -pbIssue:/b !-- TMPL_VAR NAME=issue --/p - -table border=0 cellspacing=0 cellpadding=0 -trtd style=padding-top: 5px;bList Member:/b/td -tdtable cellspacing=0 cellpadding=0 border=0 class=collapse +fieldset class=rows + ol + lispan class=labelIssue:/span!-- TMPL_VAR NAME=issue --/li + lispan class=labelList Member:/spantable style=clear:none;margin:0; trthName/th/tr !-- TMPL_LOOP NAME=memberloop -- -trtd!-- TMPL_VAR NAME=name --/td/tr +trtd!-- TMPL_VAR NAME=surname --, !-- TMPL_VAR NAME=firstname --/td/tr !-- /TMPL_LOOP -- -/table/td/tr -trtdbNotes:/b/td -td!-- TMPL_VAR NAME=routingnotes --/td/tr -/table -p -input type=submit name=ok class=button value=OK, Preview Routing Slip onclick=print_slip(!-- TMPL_VAR NAME=subscriptionid --,'!-- TMPL_VAR NAME=issue_escaped --'); return false / +/table/li + lispan class=labelNotes:/span!-- TMPL_VAR NAME=routingnotes --/li + /ol +/fieldset + +fieldset class=action +input type=submit name=ok class=button value=Save and preview routing slip onclick=print_slip(!-- TMPL_VAR NAME=subscriptionid --,'!-- TMPL_VAR NAME=issue_escaped --'); return false / input type=submit name=edit class=button value=Edit / -input type=submit name=delete class=button value=Delete //p +input type=submit name=delete class=button value=Delete //fieldset /form /div -- 1.6.3.3 ___ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches
