Added button to retry attaching item, added default bib view handling, cosmetic 
changes to the error display (buttons now in error div).
---
 .../prog/en/modules/cataloguing/moveitem.tt        |  112 +++++++++++++++-----
 1 files changed, 83 insertions(+), 29 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt 
b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
index 553d130..6fd8dfa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
@@ -5,38 +5,92 @@
 <body>
 [% 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/cataloging/addbooks.pl">Cataloging</a>  &rsaquo; Attach an 
item to <i>[% bibliotitle |html %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a 
href="/cgi-bin/koha/cataloging/addbooks.pl">Cataloging</a>  &rsaquo; Attach an 
item to <i>[% bibliotitle |html %][% IF ( itemsloo.subtitle ) %][% 
itemsloo.subtitle %][% END %]</i></div>
 <div id="doc" class="yui-t7">
 
 [% IF ( error ) %]
     <div class="dialog alert">
-       [% IF ( errornonewitem ) %]ERROR: Unable to create the new item.[% END 
%]
-       [% IF ( errornoitem ) %]ERROR: Unable to get the item.[% END %]
-       [% IF ( errornoitemnumber ) %]ERROR: Unable to get the item number from 
this barcode.[% END %]
-    </div>
-    <form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
-       <input type="submit" value="OK" />
-       <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
-    </form>
-[% ELSE %]
-    [% IF ( success ) %]
-       <div class="dialog message">The item has successfully been attached to 
[% INCLUDE 'biblio-default-view.inc' %]<i>[% bibliotitle |html %]</i></a>.[% IF 
( BiblioDefaultViewmarc ) %]
-       <form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
-[% ELSIF ( BiblioDefaultViewlabeled_marc ) %]
-       <form action="/cgi-bin/koha/catalogue/labeledMARCdetail.pl" 
method="post">
-[% ELSIF ( BiblioDefaultViewisbd ) %]
-       <form action="/cgi-bin/koha/catalogue/ISBDdetail.pl" method="post">
-[% ELSE %]
-       <form method="link" 
action="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber %]"/>
-[% END %]
-           <input type="submit" class="attachanother" value="Attach Another 
Item"/>
-           <input type="hidden" name="biblionumber" value="[% biblionumber %]" 
/>
-       </form>
-       <form action="/cgi-bin/koha/catalogue/detail.pl" method="post">
-           <input type="submit"  class="approve" value="OK" />
-           <input type="hidden" name="biblionumber" value="[% biblionumber %]" 
/>
-       </form>
-</div>
+
+               [% IF ( errornonewitem ) %]ERROR: Unable to create the new 
item.<p>
+
+                       [% IF ( BiblioDefaultViewmarc ) %]
+                               <form 
action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
+                       [% ELSIF ( BiblioDefaultViewlabeled_marc ) %]
+                               <form 
action="/cgi-bin/koha/catalogue/labeledMARCdetail.pl" method="post">
+                       [% ELSIF ( BiblioDefaultViewisbd ) %]
+                               <form 
action="/cgi-bin/koha/catalogue/ISBDdetail.pl" method="post">
+                       [% ELSE %]
+                               <form 
action="/cgi-bin/koha/catalogue/detail.pl" method="post">
+                       [% END %]
+                               <input type="submit" class="approve" value="OK" 
/>
+                               <input type="hidden" name="biblionumber" 
value="[% biblionumber %]" />
+                       </form>
+                               <form method="link" 
action="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber %]"/>
+                               <input type="submit" class="new" value="Try 
again with a different barcode"/>
+                               <input type="hidden" name="biblionumber" 
value="[% biblionumber %]" />
+                       </form>
+               </div>
+               [% END %]
+
+               [% IF ( errornoitem ) %]ERROR: Unable to get the item.<p>
+
+                       [% IF ( BiblioDefaultViewmarc ) %]
+                               <form 
action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
+                       [% ELSIF ( BiblioDefaultViewlabeled_marc ) %]
+                               <form 
action="/cgi-bin/koha/catalogue/labeledMARCdetail.pl" method="post">
+                       [% ELSIF ( BiblioDefaultViewisbd ) %]
+                               <form 
action="/cgi-bin/koha/catalogue/ISBDdetail.pl" method="post">
+                       [% ELSE %]
+                               <form 
action="/cgi-bin/koha/catalogue/detail.pl" method="post">
+                       [% END %]
+                               <input type="submit" class="approve" value="OK" 
/>
+                           <input type="hidden" name="biblionumber" value="[% 
biblionumber %]" />
+                       </form>
+                               <form method="link" 
action="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber %]"/>
+                               <input type="submit" class="new" value="Try 
again with a different barcode"/>
+                               <input type="hidden" name="biblionumber" 
value="[% biblionumber %]" />
+                       </form>
+               </div>
+               [% END %]
+
+               [% IF ( errornoitemnumber ) %]ERROR: Unable to get the item 
number from this barcode.<p>
+
+                       [% IF ( BiblioDefaultViewmarc ) %]
+                               <form 
action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
+                       [% ELSIF ( BiblioDefaultViewlabeled_marc ) %]
+                               <form 
action="/cgi-bin/koha/catalogue/labeledMARCdetail.pl" method="post">
+                       [% ELSIF ( BiblioDefaultViewisbd ) %]
+                               <form 
action="/cgi-bin/koha/catalogue/ISBDdetail.pl" method="post">
+                       [% ELSE %]
+                               <form 
action="/cgi-bin/koha/catalogue/detail.pl" method="post">
+                       [% END %]
+                               <input type="submit" class="approve" value="OK" 
/>
+                               <input type="hidden" name="biblionumber" 
value="[% biblionumber %]" />
+                       </form>
+                               <form method="link" 
action="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber %]"/>
+                               <input type="submit" class="new" value="Try 
again with a different barcode"/>
+                               <input type="hidden" name="biblionumber" 
value="[% biblionumber %]" />
+                       </form>
+               </div>
+               [% END %]
+
+       [% ELSE %]
+           [% IF ( success ) %]
+                       <div class="dialog message">The item has successfully 
been attached to [% INCLUDE 'biblio-default-view.inc' %]<i>[% bibliotitle |html 
%]</i></a>.
+               [% IF ( BiblioDefaultViewmarc ) %]
+                       <form action="/cgi-bin/koha/catalogue/MARCdetail.pl" 
method="post">
+               [% ELSIF ( BiblioDefaultViewlabeled_marc ) %]
+                       <form 
action="/cgi-bin/koha/catalogue/labeledMARCdetail.pl" method="post">
+               [% ELSIF ( BiblioDefaultViewisbd ) %]
+                       <form action="/cgi-bin/koha/catalogue/ISBDdetail.pl" 
method="post">
+               [% ELSE %]
+                       <form action="/cgi-bin/koha/catalogue/detail.pl" 
method="post">
+               [% END %]
+                   <input type="submit"  class="approve" value="OK" />
+                       <input type="hidden" name="biblionumber" value="[% 
biblionumber %]" />
+               </form>
+       </div>
+
 
     [% ELSE %]
        [% IF ( missingparameter ) %]
@@ -44,7 +98,7 @@
            [% IF ( missingbiblionumber ) %]
            <fieldset id="biblionumber_fieldset">
                <label for="biblionumber">Select the biblionumber to attach the 
item to</label>
-                   <div class="hint">Enter biblionumber:</div>
+                       <div class="hint">Enter biblionumber:</div>
                    <input type="text" name="biblionumber" id="biblionumber" 
class="focus" size="14" />
                    <fieldset class="action"><input type="submit" 
value="Submit" /></fieldset>
            </fieldset>
-- 
1.7.2.5

_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

Reply via email to