From 856fa8685ac0027d108d717ae607ccd3d564c58d Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 16 Jul 2019 14:48:47 +0100 Subject: [PATCH] Convert spree/admin/shipping_categories views from erb to haml --- .../admin/shipping_categories/_form.html.erb | 6 ---- .../admin/shipping_categories/_form.html.haml | 5 +++ .../admin/shipping_categories/edit.html.erb | 20 ----------- .../admin/shipping_categories/edit.html.haml | 15 ++++++++ .../admin/shipping_categories/index.html.erb | 35 ------------------- .../admin/shipping_categories/index.html.haml | 24 +++++++++++++ .../admin/shipping_categories/new.html.erb | 20 ----------- .../admin/shipping_categories/new.html.haml | 15 ++++++++ 8 files changed, 59 insertions(+), 81 deletions(-) delete mode 100644 app/views/spree/admin/shipping_categories/_form.html.erb create mode 100644 app/views/spree/admin/shipping_categories/_form.html.haml delete mode 100644 app/views/spree/admin/shipping_categories/edit.html.erb create mode 100644 app/views/spree/admin/shipping_categories/edit.html.haml delete mode 100644 app/views/spree/admin/shipping_categories/index.html.erb create mode 100644 app/views/spree/admin/shipping_categories/index.html.haml delete mode 100644 app/views/spree/admin/shipping_categories/new.html.erb create mode 100644 app/views/spree/admin/shipping_categories/new.html.haml diff --git a/app/views/spree/admin/shipping_categories/_form.html.erb b/app/views/spree/admin/shipping_categories/_form.html.erb deleted file mode 100644 index 70ca495da5..0000000000 --- a/app/views/spree/admin/shipping_categories/_form.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -
-
- <%= label_tag Spree.t(:name) %>
- <%= f.text_field :name %> -
-
diff --git a/app/views/spree/admin/shipping_categories/_form.html.haml b/app/views/spree/admin/shipping_categories/_form.html.haml new file mode 100644 index 0000000000..49c0d02a3d --- /dev/null +++ b/app/views/spree/admin/shipping_categories/_form.html.haml @@ -0,0 +1,5 @@ +%div{"data-hook" => "admin_shipping_category_form_fields"} + .field.align-center{"data-hook" => "name"} + = label_tag Spree.t(:name) + %br/ + = f.text_field :name diff --git a/app/views/spree/admin/shipping_categories/edit.html.erb b/app/views/spree/admin/shipping_categories/edit.html.erb deleted file mode 100644 index 63cc98ea41..0000000000 --- a/app/views/spree/admin/shipping_categories/edit.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -<%= render :partial => 'spree/admin/shared/configuration_menu' %> - -<% content_for :page_title do %> - <%= Spree.t(:editing_shipping_category) %> -<% end %> - -<% content_for :page_actions do %> -
  • - <%= button_link_to Spree.t(:back_to_shipping_categories), spree.admin_shipping_categories_path, :icon => 'icon-arrow-left' %> -
  • -<% end %> - -<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @shipping_category } %> - -<%= form_for [:admin, @shipping_category] do |f| %> -
    - <%= render :partial => 'form', :locals => { :f => f } %> - <%= render :partial => 'spree/admin/shared/edit_resource_links' %> -
    -<% end %> diff --git a/app/views/spree/admin/shipping_categories/edit.html.haml b/app/views/spree/admin/shipping_categories/edit.html.haml new file mode 100644 index 0000000000..ca1cecd626 --- /dev/null +++ b/app/views/spree/admin/shipping_categories/edit.html.haml @@ -0,0 +1,15 @@ += render :partial => 'spree/admin/shared/configuration_menu' + +- content_for :page_title do + = Spree.t(:editing_shipping_category) + +- content_for :page_actions do + %li + = button_link_to Spree.t(:back_to_shipping_categories), spree.admin_shipping_categories_path, :icon => 'icon-arrow-left' + += render :partial => 'spree/shared/error_messages', :locals => { :target => @shipping_category } + += form_for [:admin, @shipping_category] do |f| + %fieldset.no-border-top + = render :partial => 'form', :locals => { :f => f } + = render :partial => 'spree/admin/shared/edit_resource_links' diff --git a/app/views/spree/admin/shipping_categories/index.html.erb b/app/views/spree/admin/shipping_categories/index.html.erb deleted file mode 100644 index 81e7895731..0000000000 --- a/app/views/spree/admin/shipping_categories/index.html.erb +++ /dev/null @@ -1,35 +0,0 @@ -<%= render :partial => 'spree/admin/shared/configuration_menu' %> - -<% content_for :page_title do %> - <%= Spree.t(:shipping_categories) %> -<% end %> - -<% content_for :page_actions do %> -
  • - <%= button_link_to Spree.t(:new_shipping_category), new_object_url, :icon => 'icon-plus' %> -
  • -<% end %> - - - - - - - - - - - - - - <% @shipping_categories.each do |shipping_category|%> - - - - - <% end %> - -
    <%= Spree.t(:name) %>
    <%= shipping_category.name %> - <%= link_to_edit shipping_category, :no_text => true %> - <%= link_to_delete shipping_category, :no_text => true %> -
    diff --git a/app/views/spree/admin/shipping_categories/index.html.haml b/app/views/spree/admin/shipping_categories/index.html.haml new file mode 100644 index 0000000000..d91e0a22ab --- /dev/null +++ b/app/views/spree/admin/shipping_categories/index.html.haml @@ -0,0 +1,24 @@ += render :partial => 'spree/admin/shared/configuration_menu' + +- content_for :page_title do + = Spree.t(:shipping_categories) + +- content_for :page_actions do + %li + = button_link_to Spree.t(:new_shipping_category), new_object_url, :icon => 'icon-plus' + +%table.index + %colgroup + %col{:style => "width: 85%"}/ + %col{:style => "width: 15%"}/ + %thead + %tr{"data-hook" => "categories_header"} + %th= Spree.t(:name) + %th.actions + %tbody + - @shipping_categories.each do |shipping_category| + %tr{:class => "#{cycle('odd', 'even')}", "data-hook" => "category_row", :id => "#{spree_dom_id shipping_category}"} + %td{:style => "width:350px;"}= shipping_category.name + %td.actions + = link_to_edit shipping_category, :no_text => true + = link_to_delete shipping_category, :no_text => true diff --git a/app/views/spree/admin/shipping_categories/new.html.erb b/app/views/spree/admin/shipping_categories/new.html.erb deleted file mode 100644 index 812a7a4a02..0000000000 --- a/app/views/spree/admin/shipping_categories/new.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -<%= render :partial => 'spree/admin/shared/configuration_menu' %> - -<% content_for :page_title do %> - <%= Spree.t(:new_shipping_category) %> -<% end %> - -<% content_for :page_actions do %> -
  • - <%= button_link_to Spree.t(:back_to_shipping_categories_list), spree.admin_shipping_categories_path, :icon => 'icon-arrow-left' %> -
  • -<% end %> - -<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @shipping_category } %> - -<%= form_for [:admin, @shipping_category] do |f| %> -
    - <%= render :partial => 'form', :locals => { :f => f } %> - <%= render :partial => 'spree/admin/shared/new_resource_links' %> -
    -<% end %> diff --git a/app/views/spree/admin/shipping_categories/new.html.haml b/app/views/spree/admin/shipping_categories/new.html.haml new file mode 100644 index 0000000000..f301434a9e --- /dev/null +++ b/app/views/spree/admin/shipping_categories/new.html.haml @@ -0,0 +1,15 @@ += render :partial => 'spree/admin/shared/configuration_menu' + +- content_for :page_title do + = Spree.t(:new_shipping_category) + +- content_for :page_actions do + %li + = button_link_to Spree.t(:back_to_shipping_categories_list), spree.admin_shipping_categories_path, :icon => 'icon-arrow-left' + += render :partial => 'spree/shared/error_messages', :locals => { :target => @shipping_category } + += form_for [:admin, @shipping_category] do |f| + %fieldset.no-border-top + = render :partial => 'form', :locals => { :f => f } + = render :partial => 'spree/admin/shared/new_resource_links'