spree_backend 2.4.10 → 3.0.0.rc1

data/app/views/spree/admin/general_settings/edit.html.erb

@@ -1,128 +1,139 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:general_settings) %>
 <% end %>
 
-<%= form_tag admin_general_settings_path, method: :put do %>
+<%= form_tag admin_general_settings_path, :method => :put do %>
   <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>
-
-        <div class="field" data-hook="admin_general_setting_input_seo_title">
-          <%= f.label :seo_title %>
-          <br />
-          <%= f.text_field :seo_title, class: 'fullwidth'  %>
-        </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 class="row">
+          <div class="col-md-6">
+            <div class="form-group" data-hook="admin_general_setting_input_name">
+              <%= f.label :name %>
+              <%= f.text_field :name, class: 'form-control' %>
+            </div>    
+          </div>
+
+          <div class="col-md-6">
+            <div class="form-group" data-hook="admin_general_setting_input_seo_title">
+              <%= f.label :seo_title %>
+              <%= f.text_field :seo_title, class: 'form-control'  %>
+            </div>
+          </div>
         </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 class="row">
+          <div class="col-md-6">
+            <div class="form-group" data-hook="admin_general_setting_input_meta_keywords">
+              <%= f.label :meta_keywords %>
+              <%= f.text_field :meta_keywords, class: 'form-control'  %>
+            </div>    
+          </div>
+
+          <div class="col-md-6">
+            <div class="form-group" data-hook="admin_general_setting_input_meta_description">
+              <%= f.label :meta_description %>
+              <%= f.text_field :meta_description, class: 'form-control'  %>
+            </div>
+          </div>
         </div>
 
-        <div class="field" data-hook="admin_general_setting_input_url">
-          <%= f.label :url %>
-          <br />
-          <%= f.text_field :url, class: 'fullwidth'  %>
-        </div>
+        <div class="row">
+          <div class="col-md-6">
+            <div class="form-group" data-hook="admin_general_setting_input_url">
+              <%= f.label :url %>
+              <%= f.text_field :url, class: 'form-control'  %>
+            </div>
+          </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 class="col-md-6">
+            <div class="form-group" data-hook="admin_general_setting_mail_from_address">
+              <%= f.label :mail_from_address %>
+              <%= f.text_field :mail_from_address, class: 'form-control'  %>
+            </div>
+          </div>
         </div>
       <% end %>
 
       <div class="row">
-        <div class="alpha six columns">
-          <fieldset class="security no-border-bottom">
-            <legend align="center"><%= Spree.t(:security_settings)%></legend>
-            <% @preferences_security.each do |key|
-                type = Spree::Config.preference_type(key) %>
-                <div class="field">
-                  <%= label_tag(key, Spree.t(key)) + tag(:br) if type != :boolean %>
-                  <%= preference_field_tag(key, Spree::Config[key], :type => type) %>
-                  <%= label_tag(key, Spree.t(key)) + tag(:br) if type == :boolean %>
-                </div>
-            <% end %>
-          </fieldset>
-          <fieldset class="no-border-bottom">
-            <legend align="center"><%= Spree.t(:clear_cache)%></legend>
-            <div>
-              <%= Spree.t(:clear_cache_warning) %>
+        <div class="col-md-6">
+
+          <%#-------------------------------------------------%>
+          <%# Security settings                               %>
+          <%#-------------------------------------------------%>
+          <div class="panel panel-default security">
+            <div class="panel-heading">
+              <h1 class="panel-title">
+                <%= Spree.t(:security_settings)%>
+              </h1>
             </div>
-            <div class="field" data-hook="general_settings_clear_cache">
-              <%= button Spree.t(:clear_cache), '', 'button', id: "clear_cache" %>
+
+            <div class="panel-body">
+              <% @preferences_security.each do |key|
+                  type = Spree::Config.preference_type(key) %>
+                  <div class="checkbox">
+                    <%= label_tag key do %>
+                      <%= preference_field_tag(key, Spree::Config[key], :type => type) %>
+                      <%= Spree.t(key) %>
+                    <% end %>
+                  </div>
+              <% end %>  
             </div>
-          </fieldset>
-        </div>
-        <div class="omega six columns">
-          <fieldset class="currency no-border-bottom">
-            <legend align="center"><%= Spree.t(:currency_settings)%></legend>
-            <% @preferences_currency.each do |key|
-                type = Spree::Config.preference_type(key) %>
-                <div class="field">
-                  <%= label_tag(key, Spree.t(key)) + tag(:br) if type != :boolean %>
-                  <%= preference_field_tag(key, Spree::Config[key], :type => type) %>
-                  <%= label_tag(key, Spree.t(key)) + tag(:br) if type == :boolean %>
-                </div>
-            <% end %>
-            <div class="field">
-              <%= label_tag :currency, Spree.t(:choose_currency) %><br>
-              <%= select_tag :currency, currency_options, :class => 'fullwidth' %>
+          </div>
+          
+          <%#-------------------------------------------------%>
+          <%# Clear cache                                     %>
+          <%#-------------------------------------------------%>
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h1 class="panel-title"><%= Spree.t(:clear_cache)%></h1>
             </div>
-            <div class="field">
-              <%= label_tag Spree.t(:currency_symbol_position) %><br>
-              <div class="choices">
-                <ul>
-                  <li>
-                    <%= radio_button_tag :currency_symbol_position, "before", Spree::Config[:currency_symbol_position] == "before" %>
-                    <%= label_tag :currency_symbol_position_before, Spree::Money.new(10, :symbol_position => "before") %>
-                  </li>
-                  <li class="white-space-nowrap">
-                    <%= radio_button_tag :currency_symbol_position, "after", Spree::Config[:currency_symbol_position] == "after" %>
-                    <%= label_tag :currency_symbol_position_after, Spree::Money.new(10, :symbol_position => "after") %>
-                  </li>
-                </ul>
+
+            <div class="panel-body">
+              <div class="clear-cache-warning alert alert-warning">
+                <%= Spree.t(:clear_cache_warning) %>
               </div>
+              <div data-hook="general_settings_clear_cache">
+                <%= button Spree.t(:clear_cache), 'ok', 'button', id: "clear_cache" %>
+              </div>    
             </div>
-            <div class="field">
-              <%= label_tag :currency_decimal_mark, Spree.t(:currency_decimal_mark) %><br>
-              <%= text_field_tag :currency_decimal_mark, Spree::Config[:currency_decimal_mark], :size => 3 %>
+          </div>
+          
+        </div>
+        <div class="col-md-6">
+
+          <%#-------------------------------------------------%>
+          <%# Currency Settings                               %>
+          <%#-------------------------------------------------%>
+          <div class="panel panel-default currency">
+            <div class="panel-heading">
+              <h1 class="panel-title">
+                <%= Spree.t(:currency_settings)%>
+              </h1>
             </div>
-            <div class="field">
-              <%= label_tag :currency_thousands_separator, Spree.t(:currency_thousands_separator) %><br>
-              <%= text_field_tag :currency_thousands_separator, Spree::Config[:currency_thousands_separator], :size => 3 %>
+
+            <div class="panel-body">
+              <div class="form-group">
+                <%= label_tag :currency, Spree.t(:choose_currency) %>
+                <%= select_tag :currency, currency_options %>
+              </div>
             </div>
-          </fieldset>
+          </div>
         </div>
       </div>
 
-      <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button Spree.t('actions.update'), 'refresh' %>
+      <div class="form-actions" data-hook="buttons">
+        <%= button Spree.t('actions.update'), 'save' %>
         <span class="or"><%= Spree.t(:or) %></span>
-        <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button' %>
+        <%= button_link_to Spree.t('actions.cancel'), edit_admin_general_settings_url, :icon => 'delete' %>
       </div>
 
     </fieldset>
 
   </div>
 
-
 <% end %>
 
 <script>

data/app/views/spree/admin/images/_form.html.erb

@@ -1,18 +1,18 @@
-<div data-hook="admin_image_form_fields">
-  <div class="four columns alpha">
-    <div data-hook="file" class="field">
-      <%= f.label :attachment, Spree.t(:filename) %><br>
+<div data-hook="admin_image_form_fields" class="row">
+  <div class="col-md-6">
+    <div data-hook="file" class="form-group">
+      <%= f.label :attachment, Spree.t(:filename) %>
       <%= f.file_field :attachment %>
     </div>
-    <div data-hook="variant" class="field">
-      <%= f.label :viewable_id, Spree::Variant.model_name.human %><br>
-      <%= f.select :viewable_id, @variants, {}, { class: 'select2 fullwidth' } %>
+    <div data-hook="variant" class="form-group">
+      <%= f.label :viewable_id, Spree::Variant.model_name.human %>
+      <%= f.select :viewable_id, @variants, {}, {:class => 'select2'} %>
     </div>
   </div>
-  <div data-hook="alt_text" class="field omega five columns">
-    <%= f.label :alt, Spree.t(:alt_text) %><br>
-    <%= f.text_area :alt, rows: 4, class: 'fullwidth' %>
+  <div data-hook="alt_text" class="col-md-6">
+    <div class="form-group">
+      <%= f.label :alt, Spree.t(:alt_text) %>
+      <%= f.text_area :alt, :rows => 4, :class => 'form-control' %>
+    </div>
   </div>
 </div>
-
-<div class="clear"></div>

data/app/views/spree/admin/images/edit.html.erb

@@ -1,28 +1,30 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Images' } %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @image } %>
-
-<% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_images_list), admin_product_images_url(@product), :icon => 'arrow-left' %></li>
-<% end %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @image } %>
 
 <%= form_for [:admin, @product, @image], :html => { :multipart => true } do |f| %>
-  <fieldset data-hook="edit_image">
-    <legend align="center"><%= @image.attachment_file_name%></legend>
-    <div data-hook="thumbnail" class="field alpha three columns align-center">
-      <%= f.label Spree.t(:thumbnail) %><br>
-      <%= link_to image_tag(@image.attachment.url(:small)), @image.attachment.url(:product) %>
+  <div data-hook="edit_image" class="panel panel-default">
+    <div class="panel-heading">
+      <h1 class="panel-title">
+        <%= @image.attachment_file_name%>
+      </h1>
     </div>
-    <div class="nine columns omega">
-      <%= render :partial => 'form', :locals => { :f => f } %>  
-    </div>
-    <div class="clear"></div>
-    <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 Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button remove' %>
+    <div class="panel-body">
+      <div class="form-group">
+        <div data-hook="thumbnail" class="col-md-3 text-center">
+          <%= f.label Spree.t(:thumbnail) %>
+          <%= link_to image_tag(@image.attachment.url(:small)), @image.attachment.url(:product) %>
+        </div>
+        <div class="col-md-9">
+          <%= render :partial => 'form', :locals => { :f => f } %>
+        </div>
+
+        <div class="form-actions" data-hook="buttons">
+          <%= button Spree.t('actions.update'), 'save' %>
+          <span class="or"><%= Spree.t(:or) %></span>
+          <%= button_link_to Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :icon => 'delete' %>
+        </div>
+      </div>
     </div>
-  </fieldset>
+  </div>
 <% end %>

data/app/views/spree/admin/images/index.html.erb

@@ -1,55 +1,50 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
-<%= render :partial => 'spree/admin/shared/product_tabs', :locals => {:current => 'Images'} %>
+<%= render partial: 'spree/admin/shared/product_tabs', locals: { current: 'Images' } %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon('plus', Spree.t(:new_image), new_admin_product_image_url(@product), :id => 'new_image_link', :class => 'button') %></li>
+  <%= button_link_to Spree.t(:new_image), new_admin_product_image_url(@product), { class: "btn-success", icon: 'add', id: 'new_image_link' } %>
 <% end %>
 
-<div id="images" data-hook></div>
+<% has_variants = @product.has_variants? %>
 
-<% unless @product.images.any? || @product.variant_images.any? %>
-  <div class="no-objects-found">
-    <%= Spree.t(:no_images_found) %>.
+<% unless @product.variant_images.any? %>
+  <div class="alert alert-warning">
+    <%= Spree.t(:no_resource_found, resource: Spree::Image.model_name.human(count: :many)) %>.
   </div>
 <% else %>
-  <table class="index sortable" data-hook="images_table" data-sortable-link="<%= update_positions_admin_product_images_url(@product) %>">
-    <colgroup>
-      <col style="width: 5%">
-      <col style="width: 10%">
-      <% if @product.has_variants? %>
-        <col style="width: 25%">
-      <% end %>
-      <col style="width: 45%">
-      <col style="width: 15%">
-    </colgroup>
+  <table class="table sortable" data-hook="images_table" data-sortable-link="<%= update_positions_admin_product_images_url(@product) %>">
     <thead>
       <tr data-hook="images_header">
-        <th colspan="2"><%= Spree.t(:thumbnail) %></th>
-        <% if @product.has_variants? %>
-          <th><%= Spree::Variant.model_name.human %></th>
+        <th colspan="2">
+          <%= Spree.t(:thumbnail) %>
+        </th>
+        <% if has_variants %>
+          <th>
+            <%= Spree::Variant.model_name.human %>
+          </th>
         <% end %>
-        <th><%= Spree.t(:alt_text) %></th>
+        <th>
+          <%= Spree.t(:alt_text) %>
+        </th>
         <th class="actions"></th>
       </tr>
     </thead>
 
     <tbody>
       <% (@product.variant_images).each do |image| %>
-        <tr id="<%= spree_dom_id image %>" data-hook="images_row" class="<%= cycle('odd', 'even')%>">
-          <td class="no-border">
-            <span class="handle"></span>
+        <tr id="<%= spree_dom_id image %>" data-hook="images_row">
+          <td class="move-handle text-center">
+            <span class="icon icon-move handle"></span>
           </td>
-          <td>
+          <td class="image">
             <%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %>
           </td>
-          <% if @product.has_variants? %>
+          <% if has_variants %>
             <td><%= options_text_for(image) %></td>
           <% end %>
           <td><%= image.alt %></td>
-          <td class="actions">
-            <%= link_to_with_icon 'edit', Spree.t(:edit), edit_admin_product_image_url(@product, image), :no_text => true, :data => {:action => 'edit'} %>
-            <%= link_to_delete image, { :url => admin_product_image_url(@product, image), :no_text => true } %>
+          <td class="actions actions-2 text-right">
+            <%= link_to_with_icon 'edit', Spree.t(:edit), edit_admin_product_image_url(@product, image), class: 'btn btn-primary btn-sm', no_text: true, data: { action: 'edit' } %>
+            <%= link_to_delete image, { url: admin_product_image_url(@product, image), no_text: true } %>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/images/new.html.erb

@@ -1,15 +1,17 @@
-<%= form_for [:admin, @product, @image], :html => { :multipart => true } do |f| %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @product } %>
+
+<% content_for :page_title do %>
+  <%= Spree.t(:new_image) %>
+<% end %>
+
+<%= form_for [:admin, @product, @image], html: { multipart: true } do |f| %>
   <fieldset data-hook="new_image">
-    <legend align="center"><%= Spree.t(:new_image) %></legend>
+    <%= render partial: 'form', locals: { f: f } %>
 
-      <%= render :partial => 'form', :locals => { :f => f } %>
-    
-      <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'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button' %>
-      </div>
+    <div class="form-actions" data-hook="buttons">
+      <%= button Spree.t('actions.update'), 'save' %>
+      <span class="or"><%= Spree.t(:or) %></span>
+      <%= button_link_to Spree.t('actions.cancel'), admin_product_images_url(@product), icon: 'delete', id: 'cancel_link' %>
+    </div>
   </fieldset>
 <% end %>
-
-<%= javascript_include_tag 'spree/backend/images/new.js' %>

data/app/views/spree/admin/inventory_units/adjust.html.erb

@@ -0,0 +1,29 @@
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @level } %>
+
+<%= form_tag do %>
+  <h1><%= Spree.t(:inventory_adjustment) %></h1>
+
+  <table class="basic-table">
+    <thead data-hook="inventory_header">
+      <tr>
+        <th><%= Spree.t(:sku) %></th>
+        <th><%= Spree.t(:product) %></th>
+        <th><%= Spree.t(:options) %></th>
+        <th><%= Spree.t(:adjustment) %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr data-hook="inventory_row">
+        <td><%= @variant.sku %></td>
+        <td><%= @variant.product.name %></td>
+        <td><%= variant_options @variant %></td>
+        <td>
+          <%= text_field :level, :adjustment, :class => 'quantity form-control' %>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <%= submit_tag Spree.t('actions.update') %>
+  <%= Spree.t(:or) %>
+  <%= link_to Spree.t('actions.cancel'), :controller => 'overview', :action => :index %>
+<% end %>

data/app/views/spree/admin/log_entries/index.html.erb

@@ -1,23 +1,25 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }%>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i>
+  /
   <%= I18n.t(:one, scope: "activerecord.models.spree/payment") %>
-  <i class="fa fa-arrow-right"></i>
+  /
   <%= Spree.t(:log_entries) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => 'archive' %></li>
-  <li><%= button_link_to Spree.t(:back_to_payment), spree.admin_order_payment_url(@order, @payment), :icon => 'arrow-left' %></li>
+  <%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => 'file' %>
 <% end %>
 
-<table class='index' id='listing_log_entries'>
+<table class="table" id='listing_log_entries'>
   <% @log_entries.each do |entry| %>
       <thead>
         <tr class="log_entry <%= entry.parsed_details.success? ? 'success' : 'fail' %>">
-          <td colspan='2'>
-            <h4><i class='fa fa-<%= entry.parsed_details.success? ? 'ok-circle' : 'remove-sign' %>'></i> <%= pretty_time(entry.created_at) %></h4>
+          <td colspan="2">
+            <h4>
+              <span class="icon icon-<%= entry.parsed_details.success? ? 'ok' : 'delete' %>"></span>
+              <%= pretty_time(entry.created_at) %>
+            </h4>
           </td>
         </tr>
       </thead>

data/app/views/spree/admin/option_types/_form.html.erb

@@ -1,17 +1,17 @@
-<div data-hook="admin_option_type_form_fields" class="align-center row">
-  <div class="alpha eight columns">
-    <%= f.field_container :name do %>
-      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-      <%= f.text_field :name, :class => "fullwidth" %>
+<div data-hook="admin_option_type_form_fields" class="row">
+  <div class="col-md-6">
+    <%= f.field_container :name, class: ['form-group'] do %>
+      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
+      <%= f.text_field :name, :class => "form-control" %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
 
-  <div class="omega eight columns">
-    <%= f.field_container :presentation do %>
-      <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span><br />
-      <%= f.text_field :presentation, :class => "fullwidth" %>
+  <div class="col-md-6">
+    <%= f.field_container :presentation, class: ['form-group'] do %>
+      <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span>
+      <%= f.text_field :presentation, :class => "form-control" %>
       <%= f.error_message_on :presentation %>
     <% end %>
   </div>
-</div>
+</div>

data/app/views/spree/admin/option_types/_option_value_fields.html.erb

@@ -1,11 +1,9 @@
-<tr class="option_value fields" id="spree_<%= dom_id(f.object) %>"  data-hook="option_value" class="<%= cycle('odd', 'even')%>">
-  <% if f.object.persisted? %>
-    <td class="no-border">
-      <span class="handle"></span>
-      <%= f.hidden_field :id %>
-    </td>
-  <% end %>
-  <td colspan="<%= f.object.persisted? ? '' : '2' %>" class="name"><%= f.text_field :name %></td>
-  <td class="presentation"><%= f.text_field :presentation %></td>
-  <td class="actions"><%= link_to_remove_fields Spree.t(:remove), f, :no_text => true %></td>
+<tr class="option_value fields" id="spree_<%= dom_id(f.object) %>" data-hook="option_value">
+  <td class="move-handle text-center">
+    <span class="icon icon-move handle"></span>
+    <%= f.hidden_field :id %>
+  </td>
+  <td class="name"><%= f.text_field :name, class: "form-control" %></td>
+  <td class="presentation"><%= f.text_field :presentation, class: "form-control" %></td>
+  <td class="actions actions-1 text-center"><%= link_to_icon_remove_fields f %></td>
 </tr>

data/app/views/spree/admin/option_types/edit.html.erb

@@ -1,29 +1,26 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_option_type) %> <span class="green">"<%= @option_type.name %>"</span>
+  <%= Spree.t(:editing_resource, resource: Spree::OptionType.model_name.human) %> <span class="green">"<%= @option_type.name %>"</span>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <span id="new_add_option_value" data-hook>
-      <%= link_to_add_fields Spree.t(:add_option_value), "tbody#option_values", :class => 'button fa fa-plus' %>
-    </span>      
-  </li>
-  <li>
-    <%= button_link_to Spree.t(:back_to_option_types_list), spree.admin_option_types_path, :icon => 'arrow-left' %>
-  </li>
+  <span id="new_add_option_value" data-hook>
+    <%= button_link_to Spree.t(:add_option_value), "javascript:;", { :icon => 'add', :'data-target' => "tbody#option_values", :class => 'btn-success spree_add_fields' } %>
+  </span>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @option_type } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @option_type } %>
 
 <%= form_for [:admin, @option_type] do |f| %>
-  <fieldset>
-    <legend align="center"><%= Spree.t(:option_values) %></legend>
-    
-    <%= render :partial => 'form', :locals => { :f => f } %>
-
-    <table class="index sortable" data-hook data-sortable-link="<%= update_values_positions_admin_option_types_url %>">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h1 class="panel-title">
+        <%= Spree.t(:option_values) %>
+      </h1>
+    </div>
+    <div class="panel-body">
+      <%= render :partial => 'form', :locals => { :f => f } %>
+    </div>
+    <table class="table table-condensed table-bordered sortable" data-hook data-sortable-link="<%= update_values_positions_admin_option_types_url %>">
       <thead data-hook="option_header">
         <tr>
           <th colspan="2"><%= Spree.t(:name) %></th>
@@ -32,12 +29,20 @@
         </tr>
       </thead>
       <tbody id="option_values">
-        <%= f.fields_for :option_values, @option_values do |option_value_form| %>
-          <%= render :partial => 'option_value_fields', :locals => { :f => option_value_form } %>
+        <% if @option_type.option_values.empty? %>
+          <tr id="none" data-hook="option_none">
+            <td colspan="2"><%= Spree.t(:none) %></td>
+            <td class="actions text-center"></td>
+          </tr>
+        <% else %>
+          <%= f.fields_for :option_values do |option_value_form| %>
+            <%= render :partial => 'option_value_fields', :locals => { :f => option_value_form } %>
+          <% end %>
         <% end %>
       </tbody>
     </table>
-
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
-  </fieldset>
+    <div class="panel-footer text-center">
+      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    </div>
+  </div>
 <% end %>