From 90af31386f92bab243d32957ba841d326a14488b Mon Sep 17 00:00:00 2001
From: Josef Moravec <josef.moravec@gmail.com>
Date: Wed, 12 Oct 2016 17:58:44 +0200
Subject: [PATCH] Bug 16239: Advanced cataloguing editor changes

---
 koha-tmpl/intranet-tmpl/prog/css/cateditor.css            |  8 +++++---
 koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc |  8 ++++----
 .../intranet-tmpl/prog/en/modules/cataloguing/editor.tt   | 15 ++++++++-------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/cateditor.css b/koha-tmpl/intranet-tmpl/prog/css/cateditor.css
index a854854..800b1a2 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/cateditor.css
+++ b/koha-tmpl/intranet-tmpl/prog/css/cateditor.css
@@ -205,14 +205,16 @@ body {
 
 /*> Search */
 
-#advanced-search-ui, #search-results-ui, #macro-ui {
-    padding: 5px;
+#advanced-search-ui .modal-lg, #search-results-ui .modal-lg, #macro-ui .modal-lg {
     width: 90%;
 }
 
 .modal-body {
     max-height: none;
-    padding: 0;
+}
+
+.modal-lg .modal-body {
+    overflow-y: auto;
 }
 
 #quicksearch-overlay {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc
index d7a325c..6e2d91c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc
@@ -387,7 +387,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr
     }
 
     function showResultsBox(data) {
-        $('#search-top-pages, #search-bottom-pages').find('.pagination').empty();
+        $('#search-top-pages, #search-bottom-pages').find('nav').empty();
         $('#searchresults thead tr').empty();
         $('#searchresults tbody').empty();
         $('#search-serversinfo').empty().append('<li>' + _("Loading...") + '</li>');
@@ -527,7 +527,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr
         var max_page = Math.ceil( data.total_fetched / data.page_size ) - 1;
 
         if ( cur_page != 0 ) {
-            pages.push( '<li><a class="search-nav" href="#" data-offset="' + (data.offset - data.page_size) + '">&laquo; ' + _("Previous") + '</a></li>' );
+            pages.push( '<li><a class="search-nav" href="#" data-offset="' + (data.offset - data.page_size) + '"><span aria-hidden="true">&laquo;</span> ' + _("Previous") + '</a></li>' );
         }
 
         for ( var page = Math.max( 0, cur_page - 9 ); page <= Math.min( max_page, cur_page + 9 ); page++ ) {
@@ -539,10 +539,10 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr
         }
 
         if ( cur_page < max_page ) {
-            pages.push( ' <li><a class="search-nav" href="#" data-offset="' + (data.offset + data.page_size) + '">' + _("Next") + ' &raquo;</a></li>' );
+            pages.push( ' <li><a class="search-nav" href="#" data-offset="' + (data.offset + data.page_size) + '">' + _("Next") + ' <span aria-hidden="true">&raquo;</span></a></li>' );
         }
 
-        $( '#search-top-pages, #search-bottom-pages' ).find( '.pagination' ).html( pages.length > 1 ? ( '<ul>' + pages.join( '' ) + '</ul>' ) : '' );
+        $( '#search-top-pages, #search-bottom-pages' ).find( 'nav' ).html( pages.length > 1 ? ( '<ul class="pagination pagination-sm">' + pages.join( '' ) + '</ul>' ) : '' );
 
         var $overlay = $('#search-overlay');
         $overlay.find('span').text(_("Loading"));
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
index d0f07c7..dd3ab74 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
@@ -105,8 +105,8 @@
     <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
     <h3 id="advanced-search-title">Advanced search</h3>
 </div>
-
-<form id="advanced-search" class="modal-body">
+<div class="modal-body">
+  <form id="advanced-search">
     <div class="row">
     <div class="col-md-3">
         <div id="search-facets">
@@ -172,7 +172,8 @@
         </ul>
     </div>
     </div>
-</form>
+  </form>
+</div>
 </div>
 </div>
 </div>
@@ -199,8 +200,8 @@
         <!-- tabindex attribute allows JS-controlled focus -->
         <div id="searchresults" tabindex="-1">
             <div id="search-top-pages">
-                <div class="pagination pagination-small">
-                </div>
+                <nav aria-label="Search results navigation">
+                </nav>
             </div>
 
             <table>
@@ -211,8 +212,8 @@
             </table>
 
             <div id="search-bottom-pages">
-                <div class="pagination pagination-small">
-                </div>
+                <nav aria-label="Search results navigation">
+                </nav>
             </div>
         </div>
     </div>
-- 
2.1.4