edit.html.erb in solidus_backend-1.3.0.beta1

- old
+ new

@@ -1,6 +1,6 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/general_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:general_settings) %>
 <% end %>
 
@@ -8,44 +8,56 @@
   <div id="preferences" data-hook>
 
     <fieldset class="general no-border-top">
 
       <%= fields_for :store do |f| %>
-        <div class="field" data-hook="admin_general_setting_input_name">
-          <%= f.label :name %>
-          <br />
-          <%= f.text_field :name, class: 'fullwidth' %>
+        <div data-hook="admin_general_setting_input_name">
+          <%= f.field_container :name do %>
+            <%= f.label :name %>
+            <%= f.text_field :name, class: 'fullwidth' %>
+            <%= f.error_message_on :name %>
+          <% end %>
         </div>
 
-        <div class="field" data-hook="admin_general_setting_input_seo_title">
-          <%= f.label :seo_title %>
-          <br />
-          <%= f.text_field :seo_title, class: 'fullwidth'  %>
+        <div data-hook="admin_general_setting_input_seo_title">
+          <%= f.field_container :seo_title do %>
+            <%= f.label :seo_title %>
+            <%= f.text_field :seo_title, class: 'fullwidth'  %>
+            <%= f.error_message_on :seo_title %>
+          <% end %>
         </div>
 
-        <div class="field" data-hook="admin_general_setting_input_meta_keywords">
-          <%= f.label :meta_keywords %>
-          <br />
-          <%= f.text_field :meta_keywords, class: 'fullwidth'  %>
+        <div data-hook="admin_general_setting_input_meta_keywords">
+          <%= f.field_container :meta_keywords do %>
+            <%= f.label :meta_keywords %>
+            <%= f.text_field :meta_keywords, class: 'fullwidth'  %>
+            <%= f.error_message_on :meta_keywords %>
+          <% end %>
         </div>
 
-        <div class="field" data-hook="admin_general_setting_input_meta_description">
-          <%= f.label :meta_description %>
-          <br />
-          <%= f.text_field :meta_description, class: 'fullwidth'  %>
+        <div data-hook="admin_general_setting_input_meta_description">
+          <%= f.field_container :meta_description do %>
+            <%= f.label :meta_description %>
+            <%= f.text_field :meta_description, class: 'fullwidth'  %>
+            <%= f.error_message_on :meta_description %>
+          <% end %>
         </div>
 
-        <div class="field" data-hook="admin_general_setting_input_url">
-          <%= f.label :url %>
-          <br />
-          <%= f.text_field :url, class: 'fullwidth'  %>
+        <div data-hook="admin_general_setting_input_url">
+          <%= f.field_container :url do %>
+            <%= f.label :url %>
+            <%= f.text_field :url, class: 'fullwidth'  %>
+            <%= f.error_message_on :url %>
+          <% end %>
         </div>
 
-        <div class="field" data-hook="admin_general_setting_mail_from_address">
-          <%= f.label :mail_from_address %>
-          <br />
-          <%= f.text_field :mail_from_address, class: 'fullwidth'  %>
+        <div data-hook="admin_general_setting_mail_from_address">
+          <%= f.field_container :mail_from_address do %>
+            <%= f.label :mail_from_address %>
+            <%= f.text_field :mail_from_address, class: 'fullwidth'  %>
+            <%= f.error_message_on :mail_from_address %>
+          <% end %>
         </div>
       <% end %>
 
       <% if can? :clear_cache, :general_settings %>
         <div class="row">
@@ -64,10 +76,9 @@
       <% end %>
 
       <% if can? :update, :general_settings %>
         <div class="form-buttons filter-actions actions" data-hook="buttons">
           <%= button Spree.t('actions.update'), 'refresh' %>
-          <span class="or"><%= Spree.t(:or) %></span>
           <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button' %>
         </div>
       <% end %>
 
     </fieldset>