Skip to content

Commit

Permalink
Merge pull request solidusio#1476 from omnistegan/bootstrap_grid_classes
Browse files Browse the repository at this point in the history 
Enabled bootstrap classes
  • Loading branch information
@jhawthorn
jhawthorn committed Sep 28, 2016
2 parents ac2d68f + d7077c9 commit 6d6426c
Show file tree
Hide file tree
Showing 5 changed files with 180 additions and 176 deletions.
2 changes: 1 addition & 1 deletion backend/app/assets/stylesheets/spree/backend/_bootstrap_custom.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ $enable-shadows: false !default;
$enable-gradients: false !default;
$enable-transitions: false !default;
$enable-hover-media-query: false !default;
$enable-grid-classes: false !default;
$enable-grid-classes: true !default;


// Spacing
Expand Down
17 changes: 0 additions & 17 deletions backend/app/assets/stylesheets/spree/backend/sections/_products.scss
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
[data-hook="admin_products_index_search"] {
@include make-row();

> * {
@include make-col();
@include padding(0 null); // override the padding on .field
}
}

.product-search-field-name {
@include make-col-span(6);
}

.product-search-field-sku {
@include make-col-span(4);
}

.product-search-field-show-deleted.field.checkbox {
// extra specificity to override styles
@include make-col-span(2);
Expand Down
293 changes: 154 additions & 139 deletions backend/app/views/spree/admin/products/_form.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,174 +1,189 @@
<div data-hook="admin_product_form_fields">

<div class="left twelve columns alpha" data-hook="admin_product_form_left">
<div data-hook="admin_product_form_name">
<%= f.field_container :name do %>
<%= f.label :name, class: 'required' %>
<%= f.text_field :name, :class => 'fullwidth title', :required => true %>
<%= f.error_message_on :name %>
<% end %>
</div>
<div class="row">

<div class="left col-xs-9" data-hook="admin_product_form_left">
<div data-hook="admin_product_form_name">
<%= f.field_container :name do %>
<%= f.label :name, class: 'required' %>
<%= f.text_field :name, :class => 'fullwidth title', :required => true %>
<%= f.error_message_on :name %>
<% end %>
</div>

<div data-hook="admin_product_form_slug">
<%= f.field_container :slug do %>
<%= f.label :slug, class: 'required' %>
<%= f.text_field :slug, :class => 'fullwidth title', :required => true %>
<%= f.error_message_on :slug %>
<% end %>
</div>
<div data-hook="admin_product_form_slug">
<%= f.field_container :slug do %>
<%= f.label :slug, class: 'required' %>
<%= f.text_field :slug, :class => 'fullwidth title', :required => true %>
<%= f.error_message_on :slug %>
<% end %>
</div>

<div data-hook="admin_product_form_description">
<%= f.field_container :description do %>
<%= f.label :description %>
<%= f.text_area :description, {:rows => "#{unless @product.has_variants? then '22' else '15' end}", :class => 'fullwidth'} %>
<%= f.error_message_on :description %>
<% end %>
<div data-hook="admin_product_form_description">
<%= f.field_container :description do %>
<%= f.label :description %>
<%= f.text_area :description, {:rows => "#{unless @product.has_variants? then '22' else '15' end}", :class => 'fullwidth'} %>
<%= f.error_message_on :description %>
<% end %>
</div>
</div>
</div>

<div class="right four columns omega" data-hook="admin_product_form_right">
<div data-hook="admin_product_form_price" class="alpha omega four columns">
<%= f.field_container :price do %>
<%= f.label :price, class: 'required' %>
<%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :required => true %>
<%= f.error_message_on :price %>
<div class="right col-xs-3" data-hook="admin_product_form_right">
<div data-hook="admin_product_form_price">
<%= f.field_container :price do %>
<%= f.label :price, class: 'required' %>
<%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :required => true %>
<%= f.error_message_on :price %>
<% end %>
</div>

<% if show_rebuild_vat_checkbox? %>
<%= render "spree/admin/shared/rebuild_vat_prices_checkbox", form: f, model_name: "product"%>
<div class="clearfix"></div>
<% end %>
</div>

<% if show_rebuild_vat_checkbox? %>
<%= render "spree/admin/shared/rebuild_vat_prices_checkbox", form: f, model_name: "product", wrapper_class: "alpha omega field four columns" %>
<div class="clearfix"></div>
<% end %>
<div class="row">

<div data-hook="admin_product_form_cost_price" class="alpha two columns">
<%= f.field_container :cost_price do %>
<%= f.label :cost_price %>
<%= f.text_field :cost_price, :value => number_to_currency(@product.cost_price, :unit => '') %>
<%= f.error_message_on :cost_price %>
<% end %>
</div>
<div data-hook="admin_product_form_cost_price" class="col-xs-6">
<%= f.field_container :cost_price do %>
<%= f.label :cost_price %>
<%= f.text_field :cost_price, :value => number_to_currency(@product.cost_price, :unit => '') %>
<%= f.error_message_on :cost_price %>
<% end %>
</div>

<div data-hook="admin_product_form_cost_currency" class="omega two columns">
<%= f.field_container :cost_currency do %>
<%= f.label :cost_currency %>
<%= f.text_field :cost_currency %>
<%= f.error_message_on :cost_currency %>
<% end %>
</div>
<div data-hook="admin_product_form_cost_currency" class="col-xs-6">
<%= f.field_container :cost_currency do %>
<%= f.label :cost_currency %>
<%= f.text_field :cost_currency %>
<%= f.error_message_on :cost_currency %>
<% end %>
</div>

<div class="clear"></div>
</div>

<div data-hook="admin_product_form_available_on">
<%= f.field_container :available_on do %>
<%= f.label :available_on %>
<%= f.error_message_on :available_on %>
<%= f.text_field :available_on, :value => datepicker_field_value(@product.available_on), :class => 'datepicker' %>
<% end %>
</div>
<div class="clear"></div>

<div data-hook="admin_product_form_promotionable">
<%= f.field_container :promotionable do %>
<%= f.label :promotionable do %>
<%= f.check_box :promotionable %> <%= Spree::Product.human_attribute_name(:promotionable) %>
<div data-hook="admin_product_form_available_on">
<%= f.field_container :available_on do %>
<%= f.label :available_on %>
<%= f.error_message_on :available_on %>
<%= f.text_field :available_on, :value => datepicker_field_value(@product.available_on), :class => 'datepicker' %>
<% end %>
<%= f.field_hint :promotionable %>
<% end %>
</div>
</div>

<div data-hook="admin_product_form_promotionable">
<%= f.field_container :promotionable do %>
<%= f.label :promotionable do %>
<%= f.check_box :promotionable %> <%= Spree::Product.human_attribute_name(:promotionable) %>
<% end %>
<%= f.field_hint :promotionable %>
<% end %>
</div>

<% if @product.has_variants? %>
<div data-hook="admin_product_form_multiple_variants">
<%= f.label :skus, Spree.t(:skus) %>
<span class="info">
<%= Spree.t(:info_product_has_multiple_skus, count: @product.variants.count) %>
<ul class="text_list">
<% @product.variants.first(5).each do |variant| %>
<li><%= link_to variant.sku, spree.edit_admin_product_variant_path(@product, variant) %></li>
<% if @product.has_variants? %>
<div data-hook="admin_product_form_multiple_variants">
<%= f.label :skus, Spree.t(:skus) %>
<span class="info">
<%= Spree.t(:info_product_has_multiple_skus, count: @product.variants.count) %>
<ul class="text_list">
<% @product.variants.first(5).each do |variant| %>
<li><%= link_to variant.sku, spree.edit_admin_product_variant_path(@product, variant) %></li>
<% end %>
</ul>
<% if @product.variants.count > 5 %>
<%= Spree.t(:info_number_of_skus_not_shown, count: @product.variants.count - 5) %>
<% end %>
</span>
<div class="info-actions">
<% if can?(:admin, Spree::Variant) %>
<%= link_to_with_icon 'th-large', Spree.t(:manage_variants), admin_product_variants_url(@product) %>
<% end %>
</ul>
<% if @product.variants.count > 5 %>
<%= Spree.t(:info_number_of_skus_not_shown, count: @product.variants.count - 5) %>
</div>
</div>
<% else %>
<div data-hook="admin_product_form_sku">
<%= f.field_container :sku do %>
<%= f.label :sku, Spree::Variant.human_attribute_name(:sku) %>
<%= f.text_field :sku, :size => 16 %>
<% end %>
</span>
<div class="info-actions">
<% if can?(:admin, Spree::Variant) %>
<%= link_to_with_icon 'th-large', Spree.t(:manage_variants), admin_product_variants_url(@product) %>
</div>

<div id="shipping_specs" class="row">
<% [:height, :width, :depth, :weight].each_with_index do |field, index| %>
<div id="shipping_specs_<%= field %>_field" class="col-xs-6">
<div class="field">
<%= f.label field %>
<%= f.text_field field, value: number_with_precision(@product.send(field), precision: 2) %>
</div>
</div>
<% end %>
</div>
</div>
<% else %>
<div data-hook="admin_product_form_sku">
<%= f.field_container :sku do %>
<%= f.label :sku, Spree::Variant.human_attribute_name(:sku) %>
<%= f.text_field :sku, :size => 16 %>

<% end %>

<div data-hook="admin_product_form_shipping_categories">
<%= f.field_container :shipping_categories do %>
<%= f.label :shipping_category_id, Spree::ShippingCategory.model_name.human %>
<%= f.field_hint :shipping_category %>
<%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
<%= f.error_message_on :shipping_category %>
<% end %>
</div>

<div id="shipping_specs">
<% [:height, :width, :depth, :weight].each_with_index do |field, index| %>
<div id="shipping_specs_<%= field %>_field" class="field two columns <%= index.even? ? 'alpha' : 'omega' %>">
<%= f.label field %>
<%= f.text_field field, value: number_with_precision(@product.send(field), precision: 2) %>
</div>
<div data-hook="admin_product_form_tax_category">
<%= f.field_container :tax_category do %>
<%= f.label :tax_category_id, Spree::TaxCategory.model_name.human %>
<%= f.field_hint :tax_category %>
<%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
<%= f.error_message_on :tax_category %>
<% end %>
</div>
<% end %>

<div data-hook="admin_product_form_shipping_categories">
<%= f.field_container :shipping_categories do %>
<%= f.label :shipping_category_id, Spree::ShippingCategory.model_name.human %>
<%= f.field_hint :shipping_category %>
<%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
<%= f.error_message_on :shipping_category %>
<% end %>
</div>

<div data-hook="admin_product_form_tax_category">
<%= f.field_container :tax_category do %>
<%= f.label :tax_category_id, Spree::TaxCategory.model_name.human %>
<%= f.field_hint :tax_category %>
<%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
<%= f.error_message_on :tax_category %>
<% end %>
</div>
</div>

<div class="twelve columns alpha omega">
<div data-hook="admin_product_form_taxons">
<%= f.field_container :taxons do %>
<%= f.label :taxon_ids, plural_resource_name(Spree::Taxon) %><br />
<%= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') %>
<% end %>
</div>
<div class="row">

<div data-hook="admin_product_form_option_types">
<%= f.field_container :option_types do %>
<%= f.label :option_type_ids, plural_resource_name(Spree::OptionType) %>
<%= f.hidden_field :option_type_ids, :value => @product.option_type_ids.join(',') %>
<% end %>
</div>
</div>
<div class="col-xs-9">
<div data-hook="admin_product_form_taxons">
<%= f.field_container :taxons do %>
<%= f.label :taxon_ids, plural_resource_name(Spree::Taxon) %><br />
<%= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') %>
<% end %>
</div>

<div data-hook="admin_product_form_meta" class="alpha omega twelve columns">
<div data-hook="admin_product_form_meta_title">
<%= f.field_container :meta_title do %>
<%= f.label :meta_title %>
<%= f.text_field :meta_title, :class => 'fullwidth' %>
<% end %>
</div>
<div data-hook="admin_product_form_option_types">
<%= f.field_container :option_types do %>
<%= f.label :option_type_ids, plural_resource_name(Spree::OptionType) %>
<%= f.hidden_field :option_type_ids, :value => @product.option_type_ids.join(',') %>
<% end %>
</div>

<div data-hook="admin_product_form_meta_keywords">
<%= f.field_container :meta_keywords do %>
<%= f.label :meta_keywords %>
<%= f.text_field :meta_keywords, :class => 'fullwidth' %>
<% end %>
</div>
<div data-hook="admin_product_form_meta">
<div data-hook="admin_product_form_meta_title">
<%= f.field_container :meta_title do %>
<%= f.label :meta_title %>
<%= f.text_field :meta_title, :class => 'fullwidth' %>
<% end %>
</div>

<div data-hook="admin_product_form_meta_description">
<%= f.field_container :meta_description do %>
<%= f.label :meta_description %>
<%= f.text_field :meta_description, :class => 'fullwidth' %>
<% end %>
<div data-hook="admin_product_form_meta_keywords">
<%= f.field_container :meta_keywords do %>
<%= f.label :meta_keywords %>
<%= f.text_field :meta_keywords, :class => 'fullwidth' %>
<% end %>
</div>

<div data-hook="admin_product_form_meta_description">
<%= f.field_container :meta_description do %>
<%= f.label :meta_description %>
<%= f.text_field :meta_description, :class => 'fullwidth' %>
<% end %>
</div>
</div>
</div>

</div>

<div class="clear"></div>
Expand All @@ -180,6 +195,6 @@

<% unless Rails.env.test? %>
<script>
$('.select2-container').css({width: '20em'})
$('.select2-container').css({width: '20em'})
</script>
<% end %>
Loading

0 comments on commit 6d6426c

Please sign in to comment.