From 90af31386f92bab243d32957ba841d326a14488b Mon Sep 17 00:00:00 2001 From: Josef Moravec 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('
  • ' + _("Loading...") + '
  • '); @@ -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( '
  • « ' + _("Previous") + '
  • ' ); + pages.push( '
  • ' + _("Previous") + '
  • ' ); } 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( '
  • ' + _("Next") + ' »
  • ' ); + pages.push( '
  • ' + _("Next") + '
  • ' ); } - $( '#search-top-pages, #search-bottom-pages' ).find( '.pagination' ).html( pages.length > 1 ? ( '' ) : '' ); + $( '#search-top-pages, #search-bottom-pages' ).find( 'nav' ).html( pages.length > 1 ? ( '' ) : '' ); 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 @@

    Advanced search

    - - @@ -199,8 +200,8 @@
    - +
    @@ -211,8 +212,8 @@
    - +
    -- 2.1.4