From 86accc227e4721e84824965db115eb405dbff00c Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 8 Jul 2019 17:36:54 +0100 Subject: [PATCH] Convert erb files brought from spree_auth_devise to haml --- app/views/spree/admin/_users_tab.html.erb | 3 --- app/views/spree/admin/_users_tab.html.haml | 2 ++ app/views/spree/admin/users/new.html.erb | 23 -------------------- app/views/spree/admin/users/new.html.haml | 15 +++++++++++++ app/views/spree/shared/_user_form.html.erb | 17 --------------- app/views/spree/shared/_user_form.html.haml | 15 +++++++++++++ app/views/spree/user_passwords/new.html.erb | 17 --------------- app/views/spree/user_passwords/new.html.haml | 14 ++++++++++++ 8 files changed, 46 insertions(+), 60 deletions(-) delete mode 100644 app/views/spree/admin/_users_tab.html.erb create mode 100644 app/views/spree/admin/_users_tab.html.haml delete mode 100644 app/views/spree/admin/users/new.html.erb create mode 100644 app/views/spree/admin/users/new.html.haml delete mode 100644 app/views/spree/shared/_user_form.html.erb create mode 100644 app/views/spree/shared/_user_form.html.haml delete mode 100755 app/views/spree/user_passwords/new.html.erb create mode 100755 app/views/spree/user_passwords/new.html.haml diff --git a/app/views/spree/admin/_users_tab.html.erb b/app/views/spree/admin/_users_tab.html.erb deleted file mode 100644 index 5b3ffc9e60..0000000000 --- a/app/views/spree/admin/_users_tab.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<% if can? :admin, Spree::User %> - <%= tab(:users, :url => spree.admin_users_path, :icon => 'icon-user') %> -<% end %> diff --git a/app/views/spree/admin/_users_tab.html.haml b/app/views/spree/admin/_users_tab.html.haml new file mode 100644 index 0000000000..8be1861f50 --- /dev/null +++ b/app/views/spree/admin/_users_tab.html.haml @@ -0,0 +1,2 @@ +- if can? :admin, Spree::User + = tab(:users, url: spree.admin_users_path, icon: 'icon-user') diff --git a/app/views/spree/admin/users/new.html.erb b/app/views/spree/admin/users/new.html.erb deleted file mode 100644 index 9891bce060..0000000000 --- a/app/views/spree/admin/users/new.html.erb +++ /dev/null @@ -1,23 +0,0 @@ -<% content_for :page_title do %> - <%= Spree.t(:new_user) %> -<% end %> - -<% content_for :page_actions do %> -
  • - <%= button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, :icon => 'icon-arrow-left' %> -
    • -<% end %> - -
    - <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %> -
    - -
    - <%= form_for [:admin, @user] do |f| %> - <%= render :partial => 'form', :locals => { :f => f } %> - -
    - <%= render :partial => 'spree/admin/shared/new_resource_links' %> -
    - <% end %> -
    diff --git a/app/views/spree/admin/users/new.html.haml b/app/views/spree/admin/users/new.html.haml new file mode 100644 index 0000000000..9fb68e689f --- /dev/null +++ b/app/views/spree/admin/users/new.html.haml @@ -0,0 +1,15 @@ += content_for :page_title do + = Spree.t(:new_user) + += content_for :page_actions do + %li + = button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, icon: 'icon-arrow-left' + +%div + = render partial: 'spree/shared/error_messages', locals: { target: @user } + +%div + = form_for [:admin, @user] do |f| + = render partial: 'form', locals: { f: f } + %div + = render partial: 'spree/admin/shared/new_resource_links' diff --git a/app/views/spree/shared/_user_form.html.erb b/app/views/spree/shared/_user_form.html.erb deleted file mode 100644 index a31902ca61..0000000000 --- a/app/views/spree/shared/_user_form.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -

    - <%= f.label :email, Spree.t(:email) %>
    - <%= f.email_field :email, :class => 'title' %> -

    -
    -

    - <%= f.label :password, Spree.t(:password) %>
    - <%= f.password_field :password, :class => 'title' %> -

    - -

    - <%= f.label :password_confirmation, Spree.t(:confirm_password) %>
    - <%= f.password_field :password_confirmation, :class => 'title' %> -

    -
    - -
    diff --git a/app/views/spree/shared/_user_form.html.haml b/app/views/spree/shared/_user_form.html.haml new file mode 100644 index 0000000000..ddee06e421 --- /dev/null +++ b/app/views/spree/shared/_user_form.html.haml @@ -0,0 +1,15 @@ +%p + = f.label :email, Spree.t(:email) + %br + = f.email_field :email, class: 'title' + +%div{"id" => "password-credentials"} + %p + = f.label :password, Spree.t(:password) + %br + = f.password_field :password, class: 'title' + + %p + = f.label :password_confirmation, Spree.t(:confirm_password) + %br + = f.password_field :password_confirmation, class: 'title' diff --git a/app/views/spree/user_passwords/new.html.erb b/app/views/spree/user_passwords/new.html.erb deleted file mode 100755 index a4330e4490..0000000000 --- a/app/views/spree/user_passwords/new.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user } %> - -
    -
    <%= Spree.t(:forgot_password) %>
    - -

    <%= Spree.t(:instructions_to_reset_password) %>

    - - <%= form_for Spree::User.new, :as => :spree_user, :url => spree.reset_password_path do |f| %> -

    - <%= f.label :email, Spree.t(:email) %>
    - <%= f.email_field :email %> -

    -

    - <%= f.submit Spree.t(:reset_password), :class => 'button primary' %> -

    - <% end %> -
    diff --git a/app/views/spree/user_passwords/new.html.haml b/app/views/spree/user_passwords/new.html.haml new file mode 100755 index 0000000000..604f7ebf8c --- /dev/null +++ b/app/views/spree/user_passwords/new.html.haml @@ -0,0 +1,14 @@ += render partial: 'spree/shared/error_messages', locals: { target: @spree_user } + +%div{"id" => "forgot-password"} + %h6= Spree.t(:forgot_password) + + %p= Spree.t(:instructions_to_reset_password) + + = form_for Spree::User.new, as: :spree_user, url: spree.reset_password_path do |f| + %p + = f.label :email, Spree.t(:email) + %br + = f.email_field :email + %p + = f.submit Spree.t(:reset_password), class: 'button primary'