Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a new "full_center" layout #3970

Merged
merged 2 commits into from
May 22, 2018
Merged

Add a new "full_center" layout #3970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
184d0b5
ApplicationHelper - move big_iframe to page_layouts
himdel May 22, 2018
8476d59
Add a new "full_center" layout
himdel May 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/helpers/application_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,8 +1337,6 @@ def remote_function(options)
super(options).to_str
end

attr_reader :big_iframe

def appliance_name
MiqServer.my_server.name
end
Expand Down
7 changes: 7 additions & 0 deletions app/helpers/application_helper/page_layouts.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,4 +202,11 @@ def show_adv_search?
(@lastaction == "show_list" && !session[:menu_click] && show_search.include?(@layout) && !@in_a_form) ||
(@explorer && x_tree && tree_with_advanced_search? && !@record)
end

attr_reader :big_iframe

# a layout which gives full control over the center, but always provides the navbars and menus - to be overriden per-controller, used by v2v
def layout_full_center
nil
end
end
3 changes: 3 additions & 0 deletions app/views/layouts/_content.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@
= render :partial => "layouts/listnav"
= yield :left
#custom_left_cell
- elsif layout_full_center
= render :partial => "layouts/vertical_navbar"
= render :partial => layout_full_center
- else
#center_div{:style => "height: 100%;"}
= render :partial => center_div_partial
Expand Down