Bug 27631: acqui folder

Changed each of the pages in the acqui folder to have one <h1> tag
showing that describes the page, rather than the <h1> describing the
logo.

The hierarchy of heading tags may be broken in many pages, but this
will be dealt with in an additional bug.

To test:
1) Go to the Staff Client
2) Apply patch
3) Go to each of the pages in the acqui folder and check that they have
   an obvious and descriptive heading
4) Ensure that the heading in the page is <h1>

Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index 1a06400..a716d45 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -185,7 +185,7 @@
             [% END %]
 
     [% IF ( NO_BOOKSELLER ) %]
-    <h2>Vendor not found</h2>
+    <h1>Vendor not found</h1>
     [% ELSE %]
         [% IF ( delete_confirmed ) %]
             <div class="dialog message">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
index 6370fd0..db1b7fe 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
@@ -39,6 +39,7 @@
             <main>
 
 [% INCLUDE 'acquisitions-toolbar.inc' %]
+<h1>Search for vendor</h1>
 [% UNLESS ( count == 1 ) %]
     [% UNLESS count %]
         <h1>Your search returned no results.</h1>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
index b8d6a35..7c70c12 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
@@ -32,7 +32,7 @@
       [% UNLESS ( confirmcancel ) %]
       <form method="post" action="">
         <div class="dialog alert">
-          <h3>Are you sure you want to cancel this order ([% ordernumber | html %])</h3>
+          <h1>Are you sure you want to cancel this order ([% ordernumber | html %])</h1>
           <p>
             [% IF (del_biblio) %]
               Bibliographic record will be deleted too.

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
index 5fe95f1..c7588ef 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
@@ -50,10 +50,9 @@ Acquisitions › Koha
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+<h1>Duplicate existing orders</h1>
 [% INCLUDE 'blocking_errors.inc' %]
 
-<h2>Duplicate existing orders</h2>
-
 [% IF op == 'search' || op == 'select' %]
 <form action="/cgi-bin/koha/acqui/duplicate_orders.pl" method="post">
     <fieldset class="rows">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
index a4a6082..b05d641 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
@@ -26,7 +26,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-    <h2>Select the library account submitting the EDI order</h2>
+    <h1>Select the library account submitting the EDI order</h1>
     <br />
     <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
          <p>Select ordering library account: </p>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
index 24d481f..4af2fb2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
@@ -25,6 +25,7 @@
     <div class="row">
         <div class="col-sm-10 col-sm-push-2">
             <main>
+            <h1>EDIFACT message display</h1>
                 <div id="edimsg">
                     [% IF no_message %]
                         <div class"dialog message">The requested message cannot be displayed</div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
index 37b557c..68f6c97 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@@ -45,6 +45,9 @@
     <div class="row">
         <div class="col-sm-10 col-sm-push-2">
             <main>
+
+                <h1>Order search</h1>
+
                 [% IF !order_loop && search_done %]
                     <div class="dialog message">
                         Your search returned no results.

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt
index d90c1b0..906fa3c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt
@@ -37,7 +37,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-      <h2>Files for invoice: [% invoicenumber | html %]</h2>
+      <h1>Files for invoice: [% invoicenumber | html %]</h1>
       <p><strong>Vendor: </strong><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a></p>
       <br />
       [% IF errors %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
index 742926c..27c57bf 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
@@ -40,6 +40,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+      <h1>Invoice: [% invoicenumber | html %]</h1>
                 [% INCLUDE 'blocking_errors.inc' %]
 
       [% IF ( modified ) %]
@@ -47,7 +48,6 @@
           <p>Invoice has been modified</p>
         </div>
       [% END %]
-      <h1>Invoice: [% invoicenumber | html %]</h1>
 
       <p>Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a></p>
         <form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 2e80630..8f95f31 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -53,13 +53,13 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-<h2>
+<h1>
     [% IF ( ordernumber ) %]
         Modify order line
     [% ELSE %]
         New order
     [% END %]
-</h2>
+</h1>
 
 <div class="dialog alert order_error" style="display:none"></div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt
index bd9bb5d..2aea8d8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt
@@ -33,7 +33,7 @@
             <main>
 
 <div class="dialog alert">
-<h4>Duplicate warning</h4>
+<h1>Duplicate warning</h1>
 <p>You selected a record from an external source that matches an existing record in your catalog: <a target="_blank" title="Open in new window" href="[% PROCESS biblio_a_href biblionumber => biblionumber %]"><i class="fa fa-window-restore"></i> [% duplicatetitle | html %]</a></p>
 </div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
index 055c3ce..2986089 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
@@ -41,7 +41,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-            <h2>Serials subscriptions</h2>
+            <h1>Serials subscriptions</h1>
             [% IF (done_searched) %]
                 <label for="show_only_renewed">
                     <input type="checkbox" style="vertical-align: middle;" id="show_only_renewed" />

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
index dce8168..f115cbd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -36,8 +36,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-<h1>Fund: [% fund_code | html %]</h1>
-<h2>Ordered</h2>
+<h1>Ordered - Fund: [% fund_code | html %]</h1>
 
 <table id="spent">
     <thead>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
index 7eeae33..c81d40a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -38,13 +38,13 @@
             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
         [% END %]
             <main>
+<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1>
 
 [% IF ( error_failed_to_create_invoice ) %]
     <div id="error" class="dialog alert">
         <p>An error has occurred. Invoice cannot be created.</p>
     </div>
 [% END %]
-<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1>
 
     [% IF duplicate_invoices %]
     <div id="parcels_duplicate_invoice" class="dialog alert">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt
index e974272..f79e805 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt
@@ -4,6 +4,7 @@
 </head>
 <body id="acq_showorder" class="acq">
     <div id="main">
+        <h1>Order details</h1>
         [% IF order %]
             <fieldset class="rows">
                 <ol>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
index e46928a..5eca17f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -36,8 +36,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-<h1>Fund: [% fund_code | html %]</h1>
-<h2>Spent</h2>
+<h1>Spent - Fund: [% fund_code | html %]</h1>
 
 <table id="spent">
     <thead>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
index 2aebea9..92bcb32 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
@@ -8,6 +8,7 @@
 
 <body id="acq_transferorder" class="acq">
     <div class="container-fluid">
+        <h1>Transfer order</h1>
         [% IF ( bookselleridfrom ) %]
             <h3>Search for a vendor to transfer to</h3>
               <div class="transferinfo">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
index b40e3c2..c6c40ce 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -79,7 +79,7 @@
             [% END %]
         [% END %]
 
-        <h2>Orders with uncertain prices</h2>
+        <h1>Orders with uncertain prices</h1>
         <form action="[% scriptname | html %]" method="post">
         <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
         <label for="owner">Orders from:</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index d08aabc..a09e892 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -55,7 +55,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
     <form method="post" action="z3950_search.pl" name="f" class="checkboxed">
     <div class="row">
     <div class="col-sm-6">
-    <h2>Order from external source</h2>
+    <h1>Order from external source</h1>
     <input type="hidden" name="op" id="op" value="do_search" />
            <fieldset class="rows">
          <ol>