From 691bcc631c059602fd50421f4ec9b7b2d99db536 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 17 Jun 2008 07:53:07 -0500 Subject: [PATCH] Markup corrections to cataloging pages; Fixes for Bugs 2166 (" Book Jackets Not Showing on My Summary"), 2194 ("No results for Authority Search Shows blank record"), and 2196 ("Extra comma being added to record display") Signed-off-by: Joshua Ferraro --- .../prog/en/includes/auth-finder-search.inc | 42 +++++++++---------- .../prog/en/includes/cataloging-toolbar.inc | 4 +- .../en/modules/authorities/auth_finder.tmpl | 5 ++- .../authorities/searchresultlist-auth.tmpl | 31 +++++++------- .../prog/en/modules/catalogue/detail.tmpl | 2 +- .../prog/en/modules/cataloguing/addbooks.tmpl | 12 +++--- .../prog/en/modules/opac-readingrecord.tmpl | 7 ++++ .../prog/en/modules/opac-results.tmpl | 2 +- .../opac-tmpl/prog/en/modules/opac-user.tmpl | 24 ++++++++--- opac/opac-user.pl | 17 ++++++++ 10 files changed, 94 insertions(+), 52 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc index 0d9bdd262c..e18d236ccf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc @@ -3,55 +3,55 @@ " /> " /> -

Search on

-

- +

  1. + Authority type " /> -

    -

    - +

    2. +
  2. + - " /> -

    -

    - +

    3. +
  3. + - " /> -

    -

    - +

    4. +
  4. + - " /> -

    -

    - Sort by - - + - +

+
Cancel
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 ab14c3f76a..f1dae2d2dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc @@ -38,7 +38,7 @@ //]]> - +
New Record @@ -55,5 +55,5 @@ - +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl index fc42cd7768..77486c5146 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl @@ -1,9 +1,12 @@ Koha › Cataloguing Authority Plugin + -
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl index 271d6bfc4a..e63e4b9c0b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl @@ -1,6 +1,9 @@ Koha › Cataloguing Authority Plugin + -
+
@@ -18,9 +21,8 @@ function jumpfull(page)

Authority search results

-
-
- +
- -  Results to of

+ +

Results to of

-   No results found
- -
+ + +

No results found

-
+
@@ -74,8 +75,7 @@ function jumpfull(page) + - + 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 12632d8c3d..2fd010bf71 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl @@ -81,7 +81,7 @@ function verify_images() {
  • Description: - , +
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl index 1cc2cee24d..0c7aef69d6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl @@ -49,7 +49,7 @@
    • - - - - + + + + @@ -237,10 +244,17 @@ $.tablesorter.addParser({ - - + + + + + + - + + +
    Summary

    "> - +

    @@ -93,10 +93,12 @@ On order ()     		" title="MARC" rel="gb_page_center[600,500]">MARC | " title="MARC" rel="gb_page_center[600,500]">Card + " title="MARC" rel="gb_page_center[600,500]">MARC | " title="MARC" rel="gb_page_center[600,500]">Card - " class="disabled" onclick="return false;">Edit biblio + ">Edit biblio + " class="disabled" onclick="return false;">Edit biblio + + ">Add holdings @@ -132,7 +134,7 @@ " title="MARC" rel="gb_page_center[600,500]">MARC | " title="MARC" rel="gb_page_center[600,500]">Card + " title="MARC" rel="gb_page_center[600,500]">MARC | " title="MARC" rel="gb_page_center[600,500]">Card diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl index 6dd9ebaaf0..0c8a893466 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl @@ -1,5 +1,12 @@ Koha Online Catalog › Account for +
    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 10b43ab108..4499da3912 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl @@ -205,7 +205,7 @@ $(document).ready(function(){ . , - , + (modified on ) Date:&rft.btitle=&rft.date=&rft.tpages=&rft.isbn=&rft.aucorp=&rft.place=&rft.pub=&rft.edition=&rft.series=&rft.genre="> 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 09a58e74e2..ca4c10df70 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl @@ -42,6 +42,7 @@ $.tablesorter.addParser({ }); +KOHA.Google.GetCoverFromIsbn(); }); //]]> @@ -60,10 +61,13 @@ $.tablesorter.addParser({

    Thank you!

    Your corrections have been submitted to the library, and a staff member will update your record as soon as possible.

    +

    Message from the library

    +
    +
    • Please note: Your account has been frozen. Usually the reason for freezing an account is old overdues or damage fees.If your account page shows your account to be clear, please consult a librarian.
      • @@ -74,7 +78,7 @@ $.tablesorter.addParser({
    • Please note: Your library card has been marked as lost or stolen. If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.
      • -
    +
    @@ -229,7 +233,10 @@ $.tablesorter.addParser({
    Overdues ( total)
    TitleCall No. TitleItem Type Call No. Due Renew
    /images/.gif" alt="" title="" />">.01.THUMBZZZ.jpg" alt="" class="thumbnail" /> "> +/ref=sib_dp_pt/002-7879865-0184864#reader-link">.01.THUMBZZZ.jpg" alt="Cover Image" />
    " id="" class="gbs-thumbnail">
    		">See Baker & Taylor" />"> " title="" alt="" /> Account Frozen diff --git a/opac/opac-user.pl b/opac/opac-user.pl index f9aeb0c008..2345c445f7 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -138,6 +138,23 @@ foreach my $issue ( @$issues ) { $issue->{date_due} = format_date($issue->{date_due}); push @issuedat, $issue; $count++; + + # XISBN Stuff + my $xisbn=$issue->{'isbn'}; + $xisbn =~ /(\d*[X]*)/; + $issue->{amazonisbn} = $1; # FIXME: so it is OK if the ISBN = 'XXXXX' ? + my ($clean, $amazonisbn); + $amazonisbn = $1; + # these might be overkill, but they are better than the regexp above. + if ( + $amazonisbn =~ /\b(\d{13})\b/ or + $amazonisbn =~ /\b(\d{10})\b/ or + $amazonisbn =~ /\b(\d{9}X)\b/i + ) { + $clean = $1; + $issue->{clean_isbn} = $1; + } + } $template->param( ISSUES => \@issuedat ); -- 2.39.5