Bug 12508: adding an error message if a contract cannot be removed

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / admin / aqcontract.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
index 9eb9088..b4a6e0c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
@@ -6,8 +6,8 @@
 [% END %]
 [% IF ( else ) %]Contracts of [% booksellername %][% END %]
 [% IF ( add_validate ) %]Data recorded[% END %]
-[% IF ( delete_confirm ) %]Confirm Deletion of Contract '[% contractnumber %]'[% END %]
-[% IF ( delete_confirmed ) %]Contract Deleted[% END %]</title>
+[% IF ( delete_confirm ) %]Confirm deletion of contract '[% contractnumber %]'[% END %]
+[% IF ( delete_confirmed ) %]Contract deleted[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
@@ -22,8 +22,8 @@ function Check(ff) {
         ok=1;
         _alertString += _("- Name missing") + "\n";
     }
-    var startDate = Date_from_syspref($("#contractstartdate").val());
-    var endDate   = Date_from_syspref($("#contractenddate").val());
+    var startDate = Date_from_syspref($("#from").val());
+    var endDate   = Date_from_syspref($("#to").val());
     if (!parseInt(startDate.getTime())) {
         ok=1;
         _alertString += _("- Start date missing or invalid.") + "\n";
@@ -75,7 +75,7 @@ function Check(ff) {
     [% END %]
     [% IF ( delete_confirm ) %]
         <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a>
-        &rsaquo; Confirm Deletion of Contract [% contractnumber %]
+        &rsaquo; Confirm deletion of contract [% contractnumber %]
     [% END %]
     [% IF ( delete_confirmed ) %]
         <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a> &rsaquo; Contract Deleted
@@ -83,9 +83,18 @@ function Check(ff) {
     [% IF ( else ) %]Contracts[% END %]
 </div>
 
-<div id="doc" class="yui-t7">
+<div id="doc3" class="yui-t2">
+
     <div id="bd">
-        <div id="yui-main">
+    <div id="yui-main">
+    <div class="yui-b">
+
+[% INCLUDE 'acquisitions-toolbar.inc' %]
+
+[% IF error == 'not_deleted' %]
+    <div class="dialog alert">Contract has not been deleted. Maybe a basket linked to this contract exists.</div>
+[% END %]
+
                 [% IF ( add_form ) %]
                     <form name="Aform" action="[% script_name %]" method="post">
                         <input type="hidden" name="op" value="add_validate" />
@@ -104,38 +113,18 @@ function Check(ff) {
                                             <input type="hidden" name="is_a_modif" value="1" />
                                         </li>
                                 [% END %]
-                                <li><label for="contractname" class="required">Name *</label> &nbsp;
+                                <li><label for="contractname" class="required">Name: *</label> &nbsp;
                                         <input type="text" name="contractname" id="contractname" size="40" maxlength="80" value="[% contractname %]" />
                                 </li>
-                                <li><label for="contractdescription">Description</label> &nbsp;
+                                <li><label for="contractdescription">Description: </label> &nbsp;
                                         <input type="text" name="contractdescription" id="contractdescription" size="40" maxlength="80" value="[% contractdescription %]" />
                                 </li>
-                                <li><label for="contractstartdate" class="required">Start date *</label> &nbsp;
-                                        <input type="text" name="contractstartdate" id="contractstartdate" value="[% contractstartdate %]" maxlength="10"  size="10"/>
-                                        <img src="[% themelang %]/lib/calendar/cal.gif" id="contractstartdate_button" alt="Show Calendar" />
-                                        <script language="JavaScript" type="text/javascript">
-                                            Calendar.setup(
-                                            {
-                                            inputField : "contractstartdate",
-                                            ifFormat : "[% DHTMLcalendar_dateformat %]",
-                                            button : "contractstartdate_button"
-                                            }
-                                            );
-                                        </script>
+                                <li><label for="from" class="required">Start date: *</label> &nbsp;
+                                        <input type="text" name="contractstartdate" id="from" value="[% contractstartdate %]" maxlength="10" size="10" class="datepickerfrom" />
                                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                                 </li>
-                                <li><label for="contractenddate" class="required">End date *</label> &nbsp;
-                                        <input type="text" name="contractenddate" id="contractenddate" value="[% contractenddate %]" maxlength="10"  size="10" />
-                                        <img src="[% themelang %]/lib/calendar/cal.gif" id="contractenddate_button" alt="Show Calendar" />
-                                        <script language="JavaScript" type="text/javascript">
-                                            Calendar.setup(
-                                            {
-                                            inputField : "contractenddate",
-                                            ifFormat : "[% DHTMLcalendar_dateformat %]",
-                                            button : "contractenddate_button"
-                                            }
-                                            );
-                                        </script>
+                                <li><label for="to" class="required">End date: *</label> &nbsp;
+                                        <input type="text" name="contractenddate" id="to" value="[% contractenddate %]" maxlength="10"  size="10" class="datepickerto" />
                                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                                 </li>
                             </ol>
@@ -154,7 +143,7 @@ function Check(ff) {
             [% IF ( delete_confirm ) %]
                 <form action="[% script_name %]" method="post">
                     <fieldset>
-                        <legend>Confirm Deletion of Contract [% contractnumber %]</legend>
+                        <legend>Confirm deletion of contract [% contractnumber %]</legend>
                         <table>
                             <tr><th scope="row">Contract number:</th><td>[% contractnumber %]</td></tr>
                             <tr><th scope="row">Contract name:</th><td>[% contractname %]</td></tr>
@@ -174,30 +163,13 @@ function Check(ff) {
                 </form>
             [% END %]
             [% IF ( delete_confirmed ) %]
-                <h3>Contract Deleted</h3>
+                <h3>Contract deleted</h3>
                 <form action="[% script_name %]" method="post">
                     <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
                     <input type="submit" value="OK" />
                 </form>
             [% END %]
             [% IF ( else ) %]
-                <div id="toolbar">
-                    <script type="text/javascript">
-                        //<![CDATA[
-                        // prepare DOM for YUI Toolbar
-                        $(document).ready(function() {
-                        yuiToolbar();
-                        });
-                        // YUI Toolbar Functions
-                        function yuiToolbar() {
-                        new YAHOO.widget.Button("newcontract");
-                        }
-                        //]]>
-                    </script>
-                    <ul class="toolbar">
-                        <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">New Contract</a></li>
-                    </ul>
-                </div>
                 <h2>Contract(s) of [% booksellername %]</h2>
                 [% IF ( loop ) %]
                     <table>
@@ -222,9 +194,13 @@ function Check(ff) {
                     [% END %]
                 </table>
                 [% ELSE %]
-                <div class="dialog message">There are no contracts with this vendor.</div>
+                <div class="dialog message">There are no contracts with this vendor. <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">Add a contract</a>.</div>
                 [% END %]
             [% END %]
-        </div>
+</div>
+</div>
+<div class="yui-b">
+[% INCLUDE 'vendor-menu.inc' %]
+</div>
 </div>
 [% INCLUDE 'intranet-bottom.inc' %]