Merge remote branch 'kc/new/enh/bug_5917' into kcmaster

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 7be1b3e..120592f 100755 (executable)
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -761,6 +761,7 @@ Return the ISBD view which can be included in opac and intranet
 sub GetISBDView {
     my ( $biblionumber, $template ) = @_;
     my $record   = GetMarcBiblio($biblionumber);
+    return undef unless defined $record;
     my $itemtype = &GetFrameworkCode($biblionumber);
     my ( $holdingbrtagf, $holdingbrtagsubf ) = &GetMarcFromKohaField( "items.holdingbranch", $itemtype );
     my $tagslib = &GetMarcStructure( 1, $itemtype );

diff --git a/C4/Templates.pm b/C4/Templates.pm
index ea11aee..8939be5 100644 (file)
--- a/C4/Templates.pm
+++ b/C4/Templates.pm
@@ -188,7 +188,7 @@ sub themelanguage {
         @languages = ( $lang, @languages );
     }
     else {
-        $lang = $languages[0];
+        $lang = $languages[0] || 'en';
     }
     my $theme = 'prog'; # in the event of theme failure default to 'prog' -fbcit
     my $dbh = C4::Context->dbh;

diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl
index ed8d294..e34f2cc 100755 (executable)
--- a/admin/aqbudgets.pl
+++ b/admin/aqbudgets.pl
@@ -64,10 +64,9 @@ my $show         = $input->param('show'); # SET TO 1, BY A FORM SUMBIT
 $show_mine       = $input->param('show_mine') if $show == 1;
 
 # IF USER DOESNT HAVE PERM FOR AN 'ADD', THEN REDIRECT TO THE DEFAULT VIEW...
-if  (  not defined $template->{param_map}->{'CAN_user_acquisition_budget_add_del'}  &&  $op ==  'add_form'  )   {
+if  (  not defined $template->{VARS}->{'CAN_user_acquisition_budget_add_del'}  &&  $op ==  'add_form'  )   {
     $op = '';
 }
-
 my $num=FormatNumber;
 
 my $script_name               = "/cgi-bin/koha/admin/aqbudgets.pl";
@@ -123,7 +122,6 @@ $template->param(auth_cats_loop => GetBudgetAuthCats($$period{budget_period_id})
 # Used to create form to add or  modify a record
 if ($op eq 'add_form') {
 #### ------------------- ADD_FORM -------------------------
-
     # if no buget_id is passed then its an add
     #  pass the period_id to build the dropbox - because we only want to show  budgets from this period
     my $dropbox_disabled;

diff --git a/authorities/detail.pl b/authorities/detail.pl
index 59273c1..57e0737 100755 (executable)
--- a/authorities/detail.pl
+++ b/authorities/detail.pl
@@ -172,13 +172,33 @@ my ($template, $loggedinuser, $cookie)
 
 my $authid = $query->param('authid');
 
-
-
 # Using default authtypecode, so all fields are seen
 my $authtypecode = '';
 $tagslib = &GetTagsLabels(1,$authtypecode);
 
-my $record;
+# Build list of authtypes for showing them
+my $authtypes = getauthtypes;
+my @authtypesloop;
+
+foreach my $thisauthtype (sort { $authtypes->{$b} cmp $authtypes->{$a} } keys %$authtypes) {
+    my %row =(value => $thisauthtype,
+                selected => $thisauthtype eq $authtypecode,
+                authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+            );
+    push @authtypesloop, \%row;
+}
+
+my $record=GetAuthority($authid);
+
+if (not defined $record) {
+    # authid invalid
+    $template->param ( errauthid => $authid,
+                       unknownauthid => 1,
+                       authtypesloop => \@authtypesloop );
+    output_html_with_http_headers $query, $cookie, $template->output;
+    exit;
+}
+
 if (C4::Context->preference("AuthDisplayHierarchy")){
   my $trees=BuildUnimarcHierarchies($authid);
   my @trees = split /;/,$trees ;
@@ -201,9 +221,8 @@ if (C4::Context->preference("AuthDisplayHierarchy")){
     'displayhierarchy' =>C4::Context->preference("AuthDisplayHierarchy"),
     'loophierarchies' =>\@loophierarchies,
   );
-} else {
-  $record=GetAuthority($authid);
 }
+
 my $count = CountUsage($authid);
 
 # find the marc field/subfield used in biblio by this authority
@@ -215,24 +234,7 @@ while (my ($tagfield) = $sth->fetchrow) {
 }
 chop $biblio_fields;
 
-
-# fill arrays
-my @loop_data =();
-my $tag;
-# loop through each tab 0 through 9
-# for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
-# loop through each tag
-  build_tabs ($template, $record, $dbh,"",$query);
-
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype (sort { $authtypes->{$b} cmp $authtypes->{$a} } keys %$authtypes) {
-       my %row =(value => $thisauthtype,
-                               selected => $thisauthtype eq $authtypecode,
-                               authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
-                       );
-       push @authtypesloop, \%row;
-}
+build_tabs ($template, $record, $dbh,"",$query);
 
 $template->param(authid => $authid,
                count => $count,

diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl
index df84a3a..58a8d90 100755 (executable)
--- a/catalogue/ISBDdetail.pl
+++ b/catalogue/ISBDdetail.pl
@@ -67,6 +67,16 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
+my $res = GetISBDView($biblionumber, "intranet");
+if ( not defined $res ) {
+       # biblionumber invalid -> report and exit
+       $template->param( unknownbiblionumber => 1,
+                               biblionumber => $biblionumber
+       );
+       output_html_with_http_headers $query, $cookie, $template->output;
+       exit;
+}
+
 if($query->cookie("holdfor")){ 
     my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor"));
     $template->param(
@@ -77,10 +87,6 @@ if($query->cookie("holdfor")){
     );
 }
 
-# my @blocs = split /\@/,$ISBD;
-# my @fields = $record->fields();
-my $res = GetISBDView($biblionumber, "intranet");
-
 # count of item linked with biblio
 my $itemcount = GetItemsCount($biblionumber);
 $template->param( count => $itemcount);
@@ -98,9 +104,9 @@ if ($subscriptionsnumber) {
 $template->param (
     ISBD                => $res,
     biblionumber        => $biblionumber,
-       isbdview => 1,
-       z3950_search_params     => C4::Search::z3950_search_args(GetBiblioData($biblionumber)),
-       C4::Search::enabled_staff_search_views,
+    isbdview            => 1,
+    z3950_search_params => C4::Search::z3950_search_args(GetBiblioData($biblionumber)),
+    C4::Search::enabled_staff_search_views
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;

diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl
index c3cc5d4..0a2974b 100755 (executable)
--- a/catalogue/MARCdetail.pl
+++ b/catalogue/MARCdetail.pl
@@ -70,10 +70,6 @@ my $popup        =
   ;    # if set to 1, then don't insert links, it's just to show the biblio
 my $subscriptionid = $query->param('subscriptionid');
 
-my $tagslib = &GetMarcStructure(1,$frameworkcode);
-
-my $record = GetMarcBiblio($biblionumber);
-my $biblio = GetBiblioData($biblionumber);
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -86,6 +82,20 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
+my $record = GetMarcBiblio($biblionumber);
+
+if ( not defined $record ) {
+    # biblionumber invalid -> report and exit
+    $template->param( unknownbiblionumber => 1,
+                biblionumber => $biblionumber
+    );
+    output_html_with_http_headers $query, $cookie, $template->output;
+    exit;
+}
+
+my $tagslib = &GetMarcStructure(1,$frameworkcode);
+my $biblio = GetBiblioData($biblionumber);
+
 if($query->cookie("holdfor")){ 
     my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor"));
     $template->param(

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 21fcb1f..03271b4 100755 (executable)
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -51,6 +51,17 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
+my $biblionumber = $query->param('biblionumber');
+my $record       = GetMarcBiblio($biblionumber);
+
+if ( not defined $record ) {
+    # biblionumber invalid -> report and exit
+    $template->param( unknownbiblionumber => 1,
+                      biblionumber => $biblionumber );
+    output_html_with_http_headers $query, $cookie, $template->output;
+    exit;
+}
+
 if($query->cookie("holdfor")){ 
     my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor"));
     $template->param(
@@ -61,14 +72,9 @@ if($query->cookie("holdfor")){
     );
 }
 
-my $biblionumber = $query->param('biblionumber');
-my $fw = GetFrameworkCode($biblionumber);
-
+my $fw           = GetFrameworkCode($biblionumber);
 my $showallitems = $query->param('showallitems');
-
-## get notes and subjects from MARC record
-my $marcflavour      = C4::Context->preference("marcflavour");
-my $record           = GetMarcBiblio($biblionumber);
+my $marcflavour  = C4::Context->preference("marcflavour");
 
 # XSLT processing of some stuff
 if (C4::Context->preference("XSLTDetailsDisplay") ) {
@@ -93,11 +99,6 @@ $template->param(
     normalized_isbn => $isbn,
 );
 
-unless (defined($record)) {
-    print $query->redirect("/cgi-bin/koha/errors/404.pl");
-       exit;
-}
-
 my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
 my $marcisbnsarray   = GetMarcISBN( $record, $marcflavour );
 my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );

diff --git a/catalogue/labeledMARCdetail.pl b/catalogue/labeledMARCdetail.pl
index 8faecfc..b8c7982 100755 (executable)
--- a/catalogue/labeledMARCdetail.pl
+++ b/catalogue/labeledMARCdetail.pl
@@ -38,9 +38,6 @@ my $popup        =
   $query->param('popup')
   ;    # if set to 1, then don't insert links, it's just to show the biblio
 
-my $tagslib = GetMarcStructure(1,$frameworkcode);
-my $record = GetMarcBiblio($biblionumber);
-my $biblio = GetBiblioData($biblionumber);
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -53,6 +50,19 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
+my $record = GetMarcBiblio($biblionumber);
+if ( not defined $record ) {
+    # biblionumber invalid -> report and exit
+    $template->param( unknownbiblionumber => 1,
+                biblionumber => $biblionumber
+    );
+    output_html_with_http_headers $query, $cookie, $template->output;
+    exit;
+}
+
+my $tagslib = GetMarcStructure(1,$frameworkcode);
+my $biblio = GetBiblioData($biblionumber);
+
 if($query->cookie("holdfor")){ 
     my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor"));
     $template->param(

diff --git a/installer/InstallAuth.pm b/installer/InstallAuth.pm
index 81c38fb..26ba5a7 100644 (file)
--- a/installer/InstallAuth.pm
+++ b/installer/InstallAuth.pm
@@ -115,10 +115,11 @@ sub get_template_and_user {
       C4::Context->config('intrahtdocs') . "/prog/"
       . ( $language ? $language : "en" );
     
-    my $filename = "$path/modules/" . $in->{template_name};
-    $filename =~ s/\.tmpl$/.tt/; 
+    my $tmplbase = $in->{template_name};
+    $tmplbase=~ s/\.tmpl$/.tt/;
+    my $filename = "$path/modules/" . $tmplbase;
     my $interface = 'intranet';
-    my $template = C4::Templates->new( $interface, $filename);
+    my $template = C4::Templates->new( $interface, $filename, $tmplbase);
     
 
     my ( $user, $cookie, $sessionID, $flags ) = checkauth(

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
index 5a1deb1..43ba022 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
@@ -48,7 +48,7 @@ Calendar._TT["DAY_FIRST"] = _("Display %s first");
 // This may be locale-dependent.  It specifies the week-end days, as an array
 // of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
 // means Monday, etc.
-Calendar._TT["WEEKEND"] = "0comma6";
+Calendar._TT["WEEKEND"] = "0,6";
 
 Calendar._TT["CLOSE"] = _("Close");
 Calendar._TT["TODAY"] = _("Today");

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index fd5afd5..af6a238 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -10,7 +10,7 @@
      var actTotal ="";
 
     function ownerRemove(f) {
-        document.getElementById('budget_owner_name').innerhtml = '';
+        document.getElementById('budget_owner_name').innerHTML = '';
     }
 
     function Check(f) {
@@ -247,7 +247,6 @@
 <!-- ********************************************************************************************** -->
 <!-- create add/mod entry form -->
 [% IF ( add_form ) %]
-
 <form action="/cgi-bin/koha/admin/aqbudgets.pl" name="Aform" method="post">
     <fieldset class="rows">
     <legend>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
index 24d200b..6c74a3b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
@@ -1,5 +1,11 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Authorities &rsaquo; Details for Authority #[% authid %] ([% authtypetext %])</title>
+<title>Koha &rsaquo; Authorities &rsaquo;
+    [% IF ( unknownauthid ) %]
+      Unknown authority record
+    [% ELSE %]
+      Details for Authority #[% authid %] ([% authtypetext %])
+    [% END %]
+</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 
@@ -62,7 +68,13 @@ function searchauthority() {
 <body>
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'authorities-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> &rsaquo; Details for Authority #[% authid %] ([% authtypetext %]) </div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> &rsaquo;
+    [% IF ( unknownauthid ) %]
+      Unknown authority record
+    [% ELSE %]
+      Details for Authority #[% authid %] ([% authtypetext %])
+    [% END %]
+</div>
 
 <div id="doc" class="yui-t7">
 
@@ -103,6 +115,10 @@ function searchauthority() {
 </div>
 [% END %]
 
+
+[% IF ( unknownauthid ) %]
+    <div class="dialog message">The authority record you requested does not exist ([% errauthid %]).</div>
+[% ELSE %]
 <h1>Authority #[% authid %] ([% authtypetext %])</h1>
 
 <div id="action">
@@ -154,6 +170,7 @@ function searchauthority() {
 </div>
 </div>
 </div>
+[% END %]
 </div>
 
 [% INCLUDE 'intranet-bottom.inc' %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
index 45f0f8a..b08f360 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
@@ -1,5 +1,11 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Catalog &rsaquo; ISBD Details for [% title %]</title>
+<title>Koha &rsaquo; Catalog &rsaquo;
+  [% IF ( unknownbiblionumber ) %]
+    Unknown record
+  [% ELSE %]
+    ISBD Details for [% title %]
+  [% END %]
+</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body>
@@ -7,24 +13,33 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; ISBD Details for <i>[% biblionumber %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo;
+  [% IF ( unknownbiblionumber ) %]
+    Unknown record
+  [% ELSE %]
+    ISBD Details for <i>[% biblionumber %]</i>
+  [% END %]
+</div>
 
 <div id="doc3" class="yui-t2">
-   
+
+[% IF ( unknownbiblionumber ) %]
+  <div class="dialog message">The record you requested does not exist ([% biblionumber %]).</div>
+[% ELSE %]
    <div id="bd">
-       <div id="yui-main">
+      <div id="yui-main">
        <div class="yui-b">
-[% INCLUDE 'cat-toolbar.inc' %]
+       [% INCLUDE 'cat-toolbar.inc' %]
 
-       <div id="catalogue_ISBDdetail">
-               [% ISBD %]
+         <div id="catalogue_ISBDdetail">
+                 [% ISBD %]
+         </div>
        </div>
-
-
-</div>
-</div>
-<div class="yui-b">
-[% INCLUDE 'biblio-view-menu.inc' %]
-</div>
+      </div>
+      <div class="yui-b">
+      [% INCLUDE 'biblio-view-menu.inc' %]
+      </div>
+    </div>
+[% END %]
 </div>
 [% INCLUDE 'intranet-bottom.inc' %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
index 8ae54b4..3fac577 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
@@ -1,5 +1,11 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Catalog &rsaquo; MARC Details for [% bibliotitle %]</title>
+<title>Koha &rsaquo; Catalog &rsaquo;
+  [% IF ( unknownbiblionumber ) %]
+    Unknown record
+  [% ELSE %]
+    MARC Details for [% bibliotitle %]
+  [% END %]
+</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
@@ -21,10 +27,19 @@ function Changefwk(FwkList) {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; MARC Details for <i>[% bibliotitle |html %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo;
+  [% IF ( unknownbiblionumber ) %]
+    Unknown record
+  [% ELSE %]
+    MARC Details for <i>[% bibliotitle |html %]</i>
+  [% END %]
+</div>
 
 <div id="doc3" class="yui-t2">
 
+[% IF ( unknownbiblionumber ) %]
+  <div class="dialog message">The record you requested does not exist ([% biblionumber %]).</div>
+[% ELSE %]
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
@@ -404,5 +419,6 @@ function Changefwk(FwkList) {
 <div class="yui-b">
 [% INCLUDE 'biblio-view-menu.inc' %]
 </div>
+[% END %]
 </div>
 [% INCLUDE 'intranet-bottom.inc' %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 25cc66a..a019733 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -1,5 +1,11 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Catalog &rsaquo; Details for [% title |html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</title>
+<title>Koha &rsaquo; Catalog &rsaquo;
+  [% IF ( unknownbiblionumber ) %]
+    Unknown record
+  [% ELSE %]
+    Details for [% title |html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]
+  [% END %]
+</title>
 [% INCLUDE 'doc-head-close.inc' %]<script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
 // http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html
@@ -44,10 +50,19 @@ function verify_images() {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Details for <i>[% title |html %]  [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo;
+  [% IF ( unknownbiblionumber ) %]
+    Unknown record
+  [% ELSE %]
+    Details for <i>[% title |html %]  [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</i>
+  [% END %]
+</div>
 
 <div id="doc3" class="yui-t2">
-   
+
+[% IF ( unknownbiblionumber ) %]
+  <div class="dialog message">The record you requested does not exist ([% biblionumber %]).</div>
+[% ELSE %]
    <div id="bd">
     <div id="yui-main">
     <div class="yui-b">
@@ -518,5 +533,6 @@ function verify_images() {
 <div class="yui-b">
 [% INCLUDE 'biblio-view-menu.inc' %]
 </div>
+[% END %]
 </div>
 [% INCLUDE 'intranet-bottom.inc' %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
index e368c4d..983420e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
@@ -1,6 +1,12 @@
 [% INCLUDE 'doc-head-open.inc' %]
 
-       <title>Koha &rsaquo; Catalog &rsaquo; Labeled MARC Details for [% bibliotitle %]</title>
+<title>Koha &rsaquo; Catalog &rsaquo;
+  [% IF ( unknownbiblionumber ) %]
+    Unknown record
+  [% ELSE %]
+    Labeled MARC Details for [% bibliotitle %]
+  [% END %]
+</title>
 
        [% INCLUDE 'doc-head-close.inc' %]
 
@@ -21,11 +27,20 @@
 
        <div id="breadcrumbs">
                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-               &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>
-               &rsaquo; MARC Details for <i>[% bibliotitle %]</i>
+               &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> &rsaquo;
+               [% IF ( unknownbiblionumber ) %]
+                 Unknown record
+               [% ELSE %]
+                 MARC Details for <i>[% bibliotitle %]</i>
+               [% END %]
        </div>
 
        <div id="doc3" class="yui-t2">
+
+       [% IF ( unknownbiblionumber ) %]
+         <div class="dialog message">The record you requested does not exist ([% biblionumber %]).</div>
+       [% ELSE %]
+
                <div id="bd">
                        <div id="yui-main">
                                <div class="yui-b">
@@ -54,5 +69,6 @@
                                [% INCLUDE 'biblio-view-menu.inc' %]
 
                </div>
+       [% END %]
        </div>
        [% INCLUDE 'intranet-bottom.inc' %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index a74d677..b000d85 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -208,7 +208,7 @@ function set_to_today(id, force) {
                 [% FOREACH item_loo IN item_loop %]
                 <tr id="row[% item_loo.itemnumber %]">
                     [% IF ( item_loo.nomod ) %] <td colspan="2">&nbsp;</td>[% ELSE %]<td><a href="additem.pl?op=edititem&amp;biblionumber=[% biblionumber %]&amp;itemnumber=[% item_loo.itemnumber %]#edititem">Edit</a></td>
-                    <td><a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&amp;biblionumber=[% item_loo.biblionumber %]&amp;itemnumber=[% item_loo.itemnumber %]" onclick="confirm_deletion([% item_loo.biblionumber %],[% item_loo.itemnumber %]); return false;">Delete</a></td>[% END %]
+                    <td><a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&amp;biblionumber=[% biblionumber %]&amp;itemnumber=[% item_loo.itemnumber %]" onclick="confirm_deletion([% biblionumber %],[% item_loo.itemnumber %]); return false;">Delete</a></td>[% END %]
                 [% FOREACH item_valu IN item_loo.item_value %]
                     <td>[% item_valu.field |html %]</td>
                 [% END %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt
index 14b466a..3c7d656 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt
@@ -122,7 +122,7 @@ function RedrawChoices(typ){
   var divOutput=document.getElementById("choices");
   switch(typ){
   case "a":
-    divOutput.innerhtml='<table> \
+    divOutput.innerHTML='<table> \
                           <tr> \
                            <td>00 Category of material</td> \
                            <td>a- Map</td> \
@@ -424,7 +424,7 @@ function RedrawChoices(typ){
                         </table>';  
     break;
   case "c":
-    divOutput.innerhtml='<table> \
+    divOutput.innerHTML='<table> \
                           <tr> \
                            <td>00 Category of material</td> \
                            <td>c- Electronic Resource</td> \
@@ -860,7 +860,7 @@ function RedrawChoices(typ){
                           </table>';
     break;
   case "d":
-    divOutput.innerhtml='<table> \
+    divOutput.innerHTML='<table> \
                           <tr> \
                            <td>00 Category of material</td> \
                            <td>d- Globe</td> \
@@ -1038,7 +1038,7 @@ function RedrawChoices(typ){
                         </table>';  
     break;
   case "f":
-    divOutput.innerhtml='<table> \
+    divOutput.innerHTML='<table> \
                           <tr> \
                            <td>00 Category of material</td> \
                            <td>f- Tactile Material</td> \
@@ -1576,7 +1576,7 @@ function RedrawChoices(typ){
                         </table>';  
     break;
   case "g":
-    divOutput.innerhtml='<table> \
+    divOutput.innerHTML='<table> \
                           <tr> \
                            <td>00 Category of material</td> \
                            <td>g- Projected graphic</td> \
@@ -2016,7 +2016,7 @@ function RedrawChoices(typ){
                         </table>';  
     break;
   case "h":
-    divOutput.innerhtml='<table> \
+    divOutput.innerHTML='<table> \
                           <tr> \
                            <td>00 Category of material</td> \
                            <td>h- Microform</td> \
@@ -2432,7 +2432,7 @@ function RedrawChoices(typ){
                           </table>';
     break;
   case "k":
-    divOutput.innerhtml='<table> \
+    divOutput.innerHTML='<table> \
                           <tr> \
                            <td>00 Category of material</td> \
                            <td>k- Nonprojected graphic</td> \
@@ -2775,7 +2775,7 @@ function RedrawChoices(typ){
                         </table>';  
     break;
   case "m":
-    divOutput.innerhtml='<table> \
+    divOutput.innerHTML='<table> \
                           <tr> \
                            <td>00 Category of material</td> \
                            <td>m- Motion Picture</td> \
@@ -3613,7 +3613,7 @@ function RedrawChoices(typ){
                         </table>';  
     break;
   case "o":
-    divOutput.innerhtml='<table> \
+    divOutput.innerHTML='<table> \
                           <tr> \
                            <td>00 Category of material</td> \
                            <td>o- Kit</td> \
@@ -3638,7 +3638,7 @@ function RedrawChoices(typ){
                          </table>';
     break;
   case "q":
-    divOutput.innerhtml='<table> \
+    divOutput.innerHTML='<table> \
                           <tr> \
                            <td>00 Category of material</td> \
                            <td>q- Notated music</td> \
@@ -3663,7 +3663,7 @@ function RedrawChoices(typ){
                          </table>';
     break;
   case "r":
-    divOutput.innerhtml='<table> \
+    divOutput.innerHTML='<table> \
                           <tr> \
                            <td>00 Category of material</td> \
                            <td>r- Remote-sensing image</td> \
@@ -4219,7 +4219,7 @@ function RedrawChoices(typ){
                        </table>';  
     break;
   case "s":
-    divOutput.innerhtml='<table> \
+    divOutput.innerHTML='<table> \
                           <tr> \
                            <td>00 Category of material</td> \
                            <td>s- Sound recording</td> \
@@ -4933,7 +4933,7 @@ function RedrawChoices(typ){
                         </table>';  
     break;
   case "t":
-    divOutput.innerhtml='<table> \
+    divOutput.innerHTML='<table> \
                           <tr> \
                            <td>00 Category of material</td> \
                            <td>t- Text</td> \
@@ -4983,7 +4983,7 @@ function RedrawChoices(typ){
                          </table>';
     break;
   case "v":
-    divOutput.innerhtml='<table> \
+    divOutput.innerHTML='<table> \
                           <tr> \
                            <td>00 Category of material</td> \
                            <td>v- Videorecording</td> \
@@ -5402,7 +5402,7 @@ function RedrawChoices(typ){
                         </table>';  
     break;
   case "z":
-    divOutput.innerhtml='<table> \
+    divOutput.innerHTML='<table> \
                           <tr> \
                            <td>00 Category of material</td> \
                            <td>z- Unspecified</td> \
@@ -5437,7 +5437,7 @@ function RedrawChoices(typ){
                          </table>';
     break;
   default:
-    divOutput.innerhtml="baz";
+    divOutput.innerHTML="baz";
   }
 }
 //]]>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
index c325565..b20ced4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -140,7 +140,7 @@ function init_pattern() {
 }
 function reset_pattern() {
        document.getElementById("numberpattern").value = '';
-    document.getElementById("irregularity").innerhtml = '';
+    document.getElementById("irregularity").innerHTML = '';
        init_pattern();
        reset_num_pattern();
 }
@@ -255,7 +255,7 @@ var patternchoice = document.getElementById("numberpattern").value;
         break;
     case "7":
         display_table(1);
-        document.getElementById("more_options").innerhtml = '';
+        document.getElementById("more_options").innerHTML = '';
         document.f.irreg_check.value=1; 
         break;
     case "8":  // Year/Number
@@ -406,25 +406,25 @@ function moreoptions_daily_check(x) {
     var periodicity = document.f.periodicity.value;
     var errortext='';
     if(periodicity == 1){ // i.e. daily
-        document.getElementById("irregularity").innerhtml = '';
+        document.getElementById("irregularity").innerHTML = '';
         errortext =_("Please indicate which days of the week you DO NOT expect to receive issues.")+"<br \/>";
         for(var j=0;j<irregular_issues.daynames.length;j++){
             errortext +="<input type='checkbox' name='irregular' id='irregular"+(j+1)+"' value='"+(j+1)+"' />"+irregular_issues.daynames[j]+" &nbsp; ";
         }
         var error = errortext;
         moreoptions(x);
-        document.getElementById("irregularity").innerhtml = error;
+        document.getElementById("irregularity").innerHTML = error;
     } else {
-        document.getElementById("irregularity").innerhtml = '';
-        document.getElementById("more_options").innerhtml = '';
+        document.getElementById("irregularity").innerHTML = '';
+        document.getElementById("more_options").innerHTML = '';
         moreoptions(x);
     }
 }
 
 // to dispaly the more options section
 function moreoptions(x,y,z){
-document.getElementById("irregularity").innerhtml = '';
-document.getElementById("more_options").innerhtml = '';
+document.getElementById("irregularity").innerHTML = '';
+document.getElementById("more_options").innerHTML = '';
 var textbox = '';
     // alert("X: "+x+"Y: "+y+"Z: "+z);
     if(x){
@@ -457,7 +457,7 @@ var textbox = '';
         }
         textbox +="<\/table>\n";
     }
-    document.getElementById("more_options").innerhtml = textbox;
+    document.getElementById("more_options").innerHTML = textbox;
 }
 
 function hemispheres(chosen){
@@ -489,8 +489,8 @@ var selbox = document.getElementById("season1");
 // to display the more options section for seasons
 function moreoptions_seasons(x,y){
 // x = 'Season'.  y = 'Year'.
-document.getElementById("irregularity").innerhtml = '';
-document.getElementById("more_options").innerhtml = '';
+document.getElementById("irregularity").innerHTML = '';
+document.getElementById("more_options").innerHTML = '';
 var textbox = '';
     //alert("X: "+x+"Year: "+y);
     if(x){
@@ -518,7 +518,7 @@ var textbox = '';
         textbox +="<td><input type=\"text\" name=\"whenmorethan2temp\" id=\"whenmorethan2temp\" size=\"4\" onkeyup=\"moreoptionsupdate(this,1)\"><\/td>\n";
         textbox +="<\/tr><\/table>\n";
     }
-    document.getElementById("more_options").innerhtml = textbox;
+    document.getElementById("more_options").innerHTML = textbox;
 }
 
 function irregularity_check(){
@@ -644,7 +644,7 @@ function irregularity_check(){
         error=_("No irregularities noticed");
     }
        display_example(expected);
-    document.getElementById("irregularity").innerhtml = error;
+    document.getElementById("irregularity").innerHTML = error;
        irregular_issues.update();
 }
 
@@ -793,7 +793,7 @@ function display_example(expected){
         }
     }
    //  displaytext = "<div style='padding: 5px; background-color: #CCCCCC'>"+displaytext+"<\/div>";
-    document.getElementById("displayexample").innerhtml = displaytext;
+    document.getElementById("displayexample").innerHTML = displaytext;
 }
 
 function isArray(obj) {

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
index 8e394e2..b5761bc 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -210,7 +210,7 @@ $.tablesorter.addParser({
 [% IF ( OPACFinesTab ) %]
         <th>Fines</th>
 [% END %]
-        [% IF ( OPACMySummaryhtml ) %]
+        [% IF ( OPACMySummaryHTML ) %]
         <th>Links</th>
         [% END %]
         </tr></thead>
@@ -263,8 +263,8 @@ $.tablesorter.addParser({
 [% IF ( OPACFinesTab ) %]
                 <td>[% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]</td>
 [% END %]
-            [% IF ( OPACMySummaryhtml ) %]
-                <td>[% MySummaryhtml %]</td>
+            [% IF ( OPACMySummaryHTML ) %]
+                <td>[% ISSUE.MySummaryHTML %]</td>
             [% END %]
             </tr>
         [% END %]</tbody>

diff --git a/misc/release_notes/release_notes_3_4_0.txt b/misc/release_notes/release_notes_3_4_0.txt
index a08e2d6..a5b1d8b 100644 (file)
--- a/misc/release_notes/release_notes_3_4_0.txt
+++ b/misc/release_notes/release_notes_3_4_0.txt
@@ -293,6 +293,7 @@ new features in Koha 3.4:
   * Lyon3 University, France
   * Marlboro College, USA
   * MassCat, USA
+  * Ministry of Culture, Spanish Government, Spain
   * Naropa College, USA
   * Nelsonville Public Library, USA
   * Nimes, France

diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 4233d9f..7386820 100755 (executable)
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -105,7 +105,7 @@ for my $date qw(startdate enddate firstacquidate histstartdate histenddate){
 }
 $subs->{location} = GetKohaAuthorisedValueLib("LOC",$subs->{location});
 $subs->{abouttoexpire}  = abouttoexpire($subs->{subscriptionid});
-$template->param($subs);
+$template->param(%{ $subs });
 $template->param(biblionumber_for_new_subscription => $subs->{bibnum});
 my @irregular_issues = split /,/, $subs->{irregularity};