Bug 32070: Consistent classes for primary buttons: Acquisitions
authorOwen Leonard <oleonard@myacpl.org>
Wed, 2 Nov 2022 11:43:32 +0000 (11:43 +0000)
committerTomas Cohen Arazi <tomascohen@theke.io>
Wed, 2 Nov 2022 22:37:37 +0000 (19:37 -0300)
This patch makes changes the button markup in Acquisitions templates
so that all submit buttons and any buttons that should should be styled
as primary buttons have the Bootstrap class "btn btn-primary."

To test, apply the patch and view pages in Acquisitions to confirm
that everything looks correct. In most cases there are no visible
changes.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
22 files changed:
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt

index 4c2b53d..3c7fbe9 100644 (file)
@@ -55,7 +55,7 @@
         <legend>Manage orders</legend>
         <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
             <p><label for="supplierpage">Vendor: </label><input type="text" size="25" name="supplier" id="supplierpage" class="focus" />
-            <input type="submit" value="Search" />
+            <input type="submit" class="btn btn-primary" value="Search" />
             </p>
         </form>
     </fieldset>
index c314009..77fbe6e 100644 (file)
                         </div> <!-- /#tabs -->
 
                         <fieldset class="action">
-                            <input id="add_order" type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a>
+                            <input type="submit" id="add_order" class="btn btn-primary" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a>
                         </fieldset>
                     </form> <!-- /#Aform -->
                 [% ELSE # IF ( batch_details ) %]
index 2fcfe68..1a2fad6 100644 (file)
                                             <input type="hidden" name="basketgroupid" value="[% basketgroupid | html %]" />
                                         [% END %]
                                         <input type="hidden" name="op" value="attachbasket" />
-                                        <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]" class="cancel">Cancel</a>
+                                        <input type="submit" class="btn btn-primary" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]" class="cancel">Cancel</a>
                                     </fieldset>
                                 [% END %]
                             </form>
                                                     <td>[% basketgroup.basketsqty | html %]</td>
                                                     <td>
                                                         <input type="button" onclick="closeandprint('[% basketgroup.id | html %]');" value="Close and export as PDF" />
-                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Edit" /></form>
+                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" class="btn btn-primary" value="Edit" /></form>
                                                         [% UNLESS basketgroup.basketsqty %]
-                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Delete" /></form>
+                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" class="btn btn-primary" value="Delete" /></form>
                                                         [% END %]
                                                     </td>
                                                 </tr>
                                                     <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %]</td>
                                                     <td>[% basketgroup.basketsqty | html %]</td>
                                                     <td>
-                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="View" /></form>
-                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Reopen" /></form>
-                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as PDF" /></form>
-                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as CSV" /></form>
+                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" class="btn btn-primary" value="View" /></form>
+                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" class="btn btn-primary" value="Reopen" /></form>
+                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" class="btn btn-primary" value="Export as PDF" /></form>
+                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" class="btn btn-primary" value="Export as CSV" /></form>
                                                 [% IF (ediaccount) %]
-                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Generate EDIFACT order" /></form>
+                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" class="btn btn-primary" value="Generate EDIFACT order" /></form>
                                                 [% ELSE %]
                                                         <div>No EDIFACT configuration for [% booksellername | html %]</div>
                                                 [% END %]
index 0422916..01d7742 100644 (file)
 
         <fieldset class="action">
             <input type="hidden" name="op" value="add_validate" />
-            <input type="submit" value="Save" />
+            <input type="submit" class="btn btn-primary" value="Save" />
             [% IF ( basketno ) %]
                 <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a>
             [% ELSE %]
index a3c8834..c71f43b 100644 (file)
@@ -74,7 +74,7 @@ Acquisitions &rsaquo; Koha
             <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
 
             <input type="hidden" name="ordernumbers" value="[% ordernumbers.join(',') | html %]" />
-            <fieldset class="action"><input type="submit" value="Search" /></fieldset>
+            <fieldset class="action"><input type="submit" class="btn btn-primary" value="Search" /></fieldset>
         </div>
     </fieldset>
 </form>
index 5466345..bed9283 100644 (file)
@@ -41,7 +41,7 @@
         <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
         <input type="hidden" value="ediorder" name="op" />
         <p>
-            <input type="submit" value="Send EDI order" />
+            <input type="submit" class="btn btn-primary" value="Send EDI order" />
         </p>
     </form>
 </main>
index 5a9d671..d1b644d 100644 (file)
         [% END %]
             [% INCLUDE 'filter-orders.inc' %]
             <input type="hidden" name="do_search" value="1" />
-            <fieldset class="action"><input type="submit" value="Search" /></fieldset>
+            <fieldset class="action"><input type="submit" class="btn btn-primary" value="Search" /></fieldset>
         </fieldset>
     </form>
 [% END %]
index b53f523..aa36ac8 100644 (file)
@@ -96,7 +96,7 @@
                       <input name="description" id="description" type="text" /></li>
                       <li><label for="uploadfile">File:</label><input name="uploadfile" type="file" id="uploadfile" /></li>
                   </ol>
-                  <fieldset class="action"><input name="upload" type="submit" id="upload" value="Upload file" /></fieldset>
+                    <fieldset class="action"><input name="upload" type="submit" id="upload" class="btn btn-primary" value="Upload file" /></fieldset>
               </fieldset>
           </form>
       [% END %]
index f84a744..534f07d 100644 (file)
           <input type="hidden" name="op" value="mod" />
           <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" />
             <fieldset class="action">
-                <input type="submit" value="Save" />
+                <input type="submit" class="btn btn-primary" value="Save" />
                 [% IF CAN_user_acquisition_delete_invoices AND NOT orders_loop.size %]
                 <a href="invoice.pl?op=delete&invoiceid=[% invoiceid | uri %]" id="delete">Delete</a>
                 [% END %]
                           </fieldset>
                           <fieldset class="action">
                               <input type="hidden" name="op" value="mod_adj" />
-                              <input type="submit" value="Update adjustments" />
+                              <input type="submit" class="btn btn-primary" value="Update adjustments" />
                           </fieldset>
                     [% END %]
                   </fieldset>
index 126a7d4..2d4bf06 100644 (file)
                                             <span class="label">Status:</span> <span id="merge_status"></span>
                                         </li>
                                         <li>
-                                            <input type="submit" value="Merge" />
+                                            <input type="submit" class="btn btn-primary" value="Merge" />
                                         </li>
                                     </ol>
                                     <input type="hidden" name="op" value="mod" />
                         [% END %]
                         </ol>
                         <fieldset class="action">
-                            <input type="submit" value="Search" />
+                            <input type="submit" class="btn btn-primary" value="Search" />
                         </fieldset>
                     </fieldset> <!-- /.sidebar.brief -->
                     <input type="hidden" name="op" id="op" value="do_search" />
index a88e8cc..5d5ecf9 100644 (file)
             [% END %]
         </select>
 </ol>
-    <fieldset class="action"><input type="submit" value="Filter" /></fieldset>
+    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Filter" /></fieldset>
 </fieldset>
     </form>
 [% INCLUDE 'acquisitions-menu.inc' %]
index 91da28c..4a5b738 100644 (file)
@@ -43,7 +43,7 @@
         <input type="hidden" name="ordernumber" value="[% ordernumber | html %]" />
         <input type="hidden" name="op" value="save" />
         <fieldset class="action">
-          <input type="submit" value="Save" />
+          <input type="submit" class="btn btn-primary" value="Save" />
           <a class="cancel" href="[% referrer | url %]">Cancel</a>
         </fieldset>
       </form>
index 5582def..6398034 100644 (file)
@@ -55,7 +55,7 @@
         <input type="hidden" name="op" value="save" />
         <input type="hidden" name="type" value="[% type | html %]" />
         <fieldset class="action">
-          <input type="submit" value="Save" />
+          <input type="submit" class="btn btn-primary" value="Save" />
           <a class="cancel" href="[% referrer | url %]">Cancel</a>
         </fieldset>
       </form>
index 49142eb..f0b537d 100644 (file)
@@ -96,7 +96,7 @@
                 <input type="hidden" value="mod_basket" name="op" />
                 <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
             </li>
-            <fieldset class="action"><input type="submit" value="Change basketgroup" /></fieldset>
+            <fieldset class="action"><input type="submit" class="btn btn-primary" value="Change basketgroup" /></fieldset>
         [% END %]
         </form>
         [% END %]
                     </ul>
                     <input type="hidden" id="users_ids" name="users_ids" value="[% users_ids | html %]" />
                     <input type="hidden" id="op" name="op" value="mod_users" />
-                    <input type="button" id="add_user" onclick="UserSearchPopup();" value="Add user" />
+                    <input type="button" id="add_user" class="btn btn-default" onclick="UserSearchPopup();" value="Add user" />
                 </div>
             </li>
         </ol>
     </fieldset>
     <fieldset class="action">
         <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" />
-        <input type="submit" value="Save" />
+        <input type="submit" class="btn btn-primary" value="Save" />
         [% IF (suggestionid) %]
             <a class="cancel" href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">Cancel</a>
         [% ELSE %]
index 4ed47e9..123508b 100644 (file)
@@ -51,7 +51,7 @@
 <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
 <input type="hidden" name="basketno" value="[% basketno | html %]" />
 <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
-<input type="submit" value="Use existing" />
+<input type="submit" class="btn btn-primary" value="Use existing" />
 </form>
 </div>
 </div>
@@ -62,7 +62,7 @@
 <h4>Cancel and return to order</h4>
 <p>Return to the basket without making a new order.</p>
 <input type="hidden" name="basketno" value="[% basketno | html %]" />
-<input type="submit" value="Cancel" />
+<input type="submit" class="btn btn-primary" value="Cancel" />
 </form>
 </div>
 </div>
@@ -76,7 +76,7 @@
 <input type="hidden" name="basketno" value="[% basketno | html %]" />
 <input type="hidden" name="breedingid" value="[% breedingid | html %]" />
 <input type="hidden" name="use_external_source" value="1" />
-<input type="submit" value="Create new" />
+<input type="submit" class="btn btn-primary" value="Create new" />
 </form>
 </div>
 </div>
index 4e0450f..44f0f41 100644 (file)
 
 </div>
 </div><div class="row"><fieldset class="action">
-        <input type="submit"  value="Save" class="button" accesskey="w" />
+        <input type="submit" value="Save" class="btn btn-primary" accesskey="w" />
         <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]">Cancel</a>
 </fieldset></div>    </form>
 [% ELSE %]
index cf74de1..a488102 100644 (file)
     <form action="/cgi-bin/koha/acqui/invoice.pl" method="get">
         <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" />
         <fieldset class="action">
-            <input type="submit" value="Finish receiving" />
+            <input type="submit" class="btn btn-primary" value="Finish receiving" />
         </fieldset>
     </form>
 [% END %]
index ffe58aa..1e890ac 100644 (file)
@@ -71,7 +71,7 @@
             <input type="hidden" name="shipmentdate" value="[% shipmentdate | $KohaDates dateformat => 'iso' %]" />
             <input type="hidden" name="shipmentcost" value="[% shipmentcost | html %]" />
             <input type="hidden" name="shipmentcost_budgetid" value="[% shipmentcost_budgetid | html %]" />
-            <input type="submit" class="button" value="Create new invoice anyway" />
+            <input type="submit" class="btn btn-primary" value="Create new invoice anyway" />
         </form>
     </div>
     [% END %]
                     [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
                 [% END %]
             </fieldset>
-            <fieldset class="action"><input type="submit" class="button" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a></fieldset>
+            <fieldset class="action"><input type="submit" class="btn btn-default" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a></fieldset>
         </form>
     </div>
 </main>
                 <option value="100">100</option>
                 </select></li>
         </ol>
-    <fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | uri %]">Clear</a></fieldset>
-       </fieldset>
+        <fieldset class="action"><input type="submit" class="btn btn-default" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | uri %]">Clear</a></fieldset>
+    </fieldset>
 </form>
 </aside>
 </div>  <!-- /.col-sm-2.col-sm-pull-10 -->
index dbd0ab6..18d651c 100644 (file)
 [% IF ( enter ) %]
     <form action="updatesupplier.pl" name="updatesupplier" style="display:block" class="validated" method="post">
         <div id="toolbar" class="btn-toolbar">
-            <button class="btn btn-default" type="submit"><i class="fa fa-save"></i> Save</button>
+            <button class="btn btn-primary" type="submit"><i class="fa fa-save"></i> Save</button>
             [% IF ( booksellerid ) %]
                 <a class="btn btn-default cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">
             [% ELSE %]
                 <textarea cols="40" rows="4" id="notes" name="notes" >[% notes | html %]</textarea></li>
             </ol>
         </fieldset>
-        <fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %]
+        <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" />[% IF ( booksellerid ) %]
         <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
         [% END %]Cancel</a></fieldset>
 
index b6442be..483886e 100644 (file)
@@ -32,7 +32,7 @@
             [% END %]
             <label for="query">Vendor:</label>
             <input type="text" id="query" name="query" />
-            <input type="submit" value="Search" />
+            <input type="submit" class="btn btn-primary" value="Search" />
             </fieldset>
         </form>
         [% IF ( show_baskets ) %]
index a626769..bd544f4 100644 (file)
@@ -95,7 +95,7 @@
             <option value="1">me</option>
             [% END %]
         </select>
-        <input type="submit" value="Filter" />
+        <input type="submit" class="btn btn-primary" value="Filter" />
         </form>
         <form action="[% scriptname | html %]" method="post" id="uncertainprices">
         <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
            [% END %]
     </tbody>
        </table>
-    <fieldset class="action"><input type="submit" value="Save" /></fieldset>
+    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" /></fieldset>
        </form>
        [% END %]
 
index c43e580..2d7691b 100644 (file)
@@ -148,7 +148,7 @@ tr.selected td {
 
 <div class="row">
     <div class="col-md-12">
-    <fieldset class="action"><input type="submit"  class="submit" value="Search" /> <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Cancel</a></fieldset>
+    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Search" /> <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Cancel</a></fieldset>
     </div>
 </div>
 </form>
@@ -269,7 +269,7 @@ tr.selected td {
         [% IF ( show_nextbutton ) %]
             <input type="button" name="changepage_next" value="Next page" data-currentpage="[% current_page | html %]" />
         [% END %]
-        <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page | html %]" size="4" type="text" /> <input type="submit" name="changepage_goto" value="Go" />
+        <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page | html %]" size="4" type="text" /> <input type="submit" name="changepage_goto" class="btn btn-primary" value="Go" />
     </form>
 
     [% ELSE %]