diff --git a/app/assets/javascripts/controllers/report_data_controller.js b/app/assets/javascripts/controllers/report_data_controller.js index 82fbece0261..dcf00938b16 100644 --- a/app/assets/javascripts/controllers/report_data_controller.js +++ b/app/assets/javascripts/controllers/report_data_controller.js @@ -407,6 +407,11 @@ $(pagingDiv).append(col); col[0].appendChild(pagination[0]); } + + if (this.initObject.pages) { + $(pagingDiv).show(); + } + // calculates the height of main content from toolbar and footer, needed // to make sure the paginator is not off the screen miqInitMainContent(); diff --git a/app/helpers/gtl_helper.rb b/app/helpers/gtl_helper.rb index 03eea2ca61e..b5f98ce58d2 100644 --- a/app/helpers/gtl_helper.rb +++ b/app/helpers/gtl_helper.rb @@ -67,6 +67,7 @@ def render_gtl_outer(no_flash_div) :view => @view, :db => @db, :parent => @parent, + :pages => @pages, :report_data_additional_options => @report_data_additional_options, } @@ -121,7 +122,8 @@ def render_gtl_javascripts(options) isExplorer: '#{options[:explorer]}' === 'true' ? true : false, records: #{!options[:selected_records].nil? ? h(j_str(options[:selected_records].to_json)) : "\'\'"}, hideSelect: #{options[:selected_records].kind_of?(Array)}, - showUrl: '#{gtl_show_url(options)}' + showUrl: '#{gtl_show_url(options)}', + pages: #{options[:pages].to_json}, } }}); EOJ diff --git a/app/views/layouts/_center_div_dashboard_no_listnav.html.haml b/app/views/layouts/_center_div_dashboard_no_listnav.html.haml index deb3632a037..44ea4e6718f 100644 --- a/app/views/layouts/_center_div_dashboard_no_listnav.html.haml +++ b/app/views/layouts/_center_div_dashboard_no_listnav.html.haml @@ -4,7 +4,7 @@ .col-sm-12 - if @widgets_menu = render :partial => "layouts/angular/toolbar" - .row#main-content.miq-body + .row#main-content.miq-body.miq-layout-center_div_dashboard_no_listnav .col-md-12 .spacer = render :partial => 'layouts/tabs' diff --git a/app/views/layouts/_center_div_no_listnav.html.haml b/app/views/layouts/_center_div_no_listnav.html.haml index a62cb8321dc..610fd71bc3e 100644 --- a/app/views/layouts/_center_div_no_listnav.html.haml +++ b/app/views/layouts/_center_div_no_listnav.html.haml @@ -6,7 +6,7 @@ .row.toolbar-pf#toolbar .col-sm-12 = render :partial => "layouts/angular/toolbar" - .row#main-content{:class => @lastaction == "show_dashboard" ? 'miq-sand-paper' : ''} + .row#main-content.miq-layout-center_div_no_listnav{:class => @lastaction == "show_dashboard" ? 'miq-sand-paper' : ''} .col-md-12 = render :partial => "layouts/breadcrumbs" - if layout_uses_tabs? @@ -14,5 +14,4 @@ = render :partial => 'layouts/tabs' .col-md-12 = yield - - if layout_uses_paging? && !@in_a_form - .row#paging_div + .row#paging_div{:style => (layout_uses_paging? && !@in_a_form) ? '' : 'display: none'} diff --git a/app/views/layouts/_center_div_with_listnav.html.haml b/app/views/layouts/_center_div_with_listnav.html.haml index 256b6393188..a0ec7a81afa 100644 --- a/app/views/layouts/_center_div_with_listnav.html.haml +++ b/app/views/layouts/_center_div_with_listnav.html.haml @@ -8,7 +8,7 @@ = render :partial => "layouts/angular/toolbar" .row.max-height .col-sm-10.col-md-9.col-sm-push-2.col-md-push-3.max-height - #main-content.row + #main-content.row.miq-layout-center_div_with_listnav .col-md-12 .row .col-md-7 @@ -21,8 +21,7 @@ .row .col-md-12 = yield - - unless @in_a_form - .row#paging_div + .row#paging_div{:style => @in_a_form ? '' : 'display: none'} .col-sm-2.col-md-3.col-sm-pull-10.col-md-pull-9.sidebar-pf.sidebar-pf-left.max-height -# listnav_div diff --git a/app/views/layouts/_content.html.haml b/app/views/layouts/_content.html.haml index 2e1343746fd..14c8777339c 100644 --- a/app/views/layouts/_content.html.haml +++ b/app/views/layouts/_content.html.haml @@ -17,7 +17,7 @@ = render :partial => "layouts/angular/toolbar" .row.max-height #right_div.resizable.max-height{:class => "col-md-#{maindiv} col-md-push-#{sidewidth}"} - #main-content.row + #main-content.row.miq-layout-content .col-md-12 .row .col-md-7#explorer @@ -44,7 +44,7 @@ = yield .col-md-12.no-padding = render :partial => 'layouts/x_form_buttons' - .row#paging_div + .row#paging_div{:style => saved_report_paging? ? "" : "display: none"} - if saved_report_paging? = render(:partial => 'layouts/saved_report_paging_bar', :locals => {:pages => @sb[:pages]})