diff --git a/app/views/chargeback_rate/_rates_tabs.html.haml b/app/views/chargeback_rate/_rates_tabs.html.haml deleted file mode 100644 index 1f89a988cca..00000000000 --- a/app/views/chargeback_rate/_rates_tabs.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -#rates_tabs_div - - if x_node == "root" - = render :partial => "rates_list" - - elsif @edit && @edit[:new] && ((params[:pressed] && params[:pressed] != "chargeback_rates_delete") || params[:button] == "reset") - = render :partial => "edit" - - elsif %w(Compute Storage).include?(x_node.split('-').last) - = render :partial => 'layouts/x_gtl', :locals => {:action_url => "cb_rates_list"} - - else - = render :partial => "cb_rate_show" diff --git a/app/views/configuration/show.html.haml b/app/views/configuration/show.html.haml index 323746fbfaa..206312e189b 100644 --- a/app/views/configuration/show.html.haml +++ b/app/views/configuration/show.html.haml @@ -2,8 +2,6 @@ - case @tabform - when 'ui_1' = render :partial => 'ui_1' - - when 'ui_2' - = render :partial => 'ui_2' - when 'ui_3' = render :partial => 'ui_3' - when 'ui_4' diff --git a/app/views/dashboard/_dropdownbar.html.haml b/app/views/dashboard/_dropdownbar.html.haml deleted file mode 100644 index ed73507a8ec..00000000000 --- a/app/views/dashboard/_dropdownbar.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -#dashboard_dropdown - #widget_select_div - = render :partial => 'dashboard/widgets_menu' diff --git a/app/views/miq_alert/_alert_details.html.haml b/app/views/miq_alert/_alert_details.html.haml index ef970e17a26..e2236add970 100644 --- a/app/views/miq_alert/_alert_details.html.haml +++ b/app/views/miq_alert/_alert_details.html.haml @@ -2,9 +2,7 @@ - url = url_for_only_path(:action => 'alert_field_changed', :id => (@alert.id || 'new')) - observe = {:url => url}.to_json #alert_details_div - - if @assign - = render :partial => 'alert_assign' - - elsif @alert + - if @alert #alert_info_div = render :partial => "layouts/flash_msg" %h3= _('Info') diff --git a/app/views/miq_policy/explorer.html.haml b/app/views/miq_policy/explorer.html.haml index c03801b8450..7b77d837970 100644 --- a/app/views/miq_policy/explorer.html.haml +++ b/app/views/miq_policy/explorer.html.haml @@ -5,8 +5,6 @@ - case @nodetype - when "root" - case x_active_tree - - when :policy_profile_tree - = render :partial => "profile_list" - when :policy_tree = render :partial => "policy_folders" - when :event_tree @@ -22,9 +20,7 @@ - when "pp" = render :partial => "profile_details" - when "xx" - - if @profiles - = render :partial => "profile_list" - - elsif @policies || (@view && @sb[:tree_typ] == "policies") + - if @policies || (@view && @sb[:tree_typ] == "policies") = render :partial => "policy_list" - elsif @conditions = render :partial => "condition_list" diff --git a/app/views/miq_request/_prov_wf.html.haml b/app/views/miq_request/_prov_wf.html.haml index 7f7686f9d0e..61f658a1cb9 100644 --- a/app/views/miq_request/_prov_wf.html.haml +++ b/app/views/miq_request/_prov_wf.html.haml @@ -24,8 +24,6 @@ = render :partial => "/shared/views/prov_dialog", :locals => partial_locals - elsif wf.kind_of?(VmMigrateWorkflow) = render :partial => "/miq_request/prov_vm_migrate_dialog", :locals => partial_locals - - else - = render :partial => "/miq_request/prov_host_dialog", :locals => partial_locals :javascript miq_tabs_init('#prov_tabs', '/miq_request/prov_field_changed', {edit_mode: 'true'}); diff --git a/app/views/miq_template/show.html.haml b/app/views/miq_template/show.html.haml index 556b9d1b6d5..4ea8d7e25ff 100644 --- a/app/views/miq_template/show.html.haml +++ b/app/views/miq_template/show.html.haml @@ -5,8 +5,6 @@ = render :partial => "vm_common/right_size" - elsif @reconfigure = render :partial => "vm_common/reconfigure" - - elsif request.parameters[:action] == "provision" - = render :partial => "vm_common/provision" - else - case @showtype - when "details" @@ -17,8 +15,6 @@ = render :partial => "layouts/compare" - when "drift_history" = render :partial => "layouts/drift_history" - - when "drift" - = render :partial => "layouts/drift" - when "item" = render :partial => "layouts/item" - when "performance" diff --git a/app/views/service/_explorer.js.haml b/app/views/service/_explorer.js.haml deleted file mode 100644 index 1384e109b23..00000000000 --- a/app/views/service/_explorer.js.haml +++ /dev/null @@ -1,17 +0,0 @@ --# Renders JS to replace the contents of the miq_policy explorer view as directed by the controller - --# Pull options into local vars -- exp = options.delete(:exp) - -- if exp - -# See if any miq expression vars need to be set - - if exp[:val1_type] - ManageIQ.expEditor.first.type = '#{exp[:val1_type]}'; - - if exp[:val1_title] - ManageIQ.expEditor.first.title = '#{exp[:val1_title]}'; - - if exp[:val2_type] - ManageIQ.expEditor.second.type = '#{exp[:val2_type]}'; - - if exp[:val2_title] - ManageIQ.expEditor.second.title = '#{exp[:val2_title]}'; - -= render :partial => "shared/explorer", :locals => {:options => options}