Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI fixes for admin locale select #2684

Merged
merged 4 commits into from
Apr 9, 2018
Merged

UI fixes for admin locale select #2684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eef2b4a
Fix admin locale select position
tvdeyen Apr 6, 2018
e65a7fd
Use select2 for available locales select
tvdeyen Apr 6, 2018
48eae3f
Two columns in store administration form
tvdeyen Apr 6, 2018
d512e53
Add a hint to available locales in store form
tvdeyen Apr 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions backend/app/assets/stylesheets/spree/backend/components/_navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ nav.menu {

.admin-locale-selection {
margin: 1em;
margin-bottom: 0;
}

.admin-nav.fits .admin-nav-footer {
Expand All @@ -175,8 +174,8 @@ nav.menu {

.admin-login-nav {
list-style: none;
margin: 0;
padding: 1rem 0;
padding: 0;
margin: 1rem 0;

li {
padding: 0.3rem 1.2rem;
Expand Down
132 changes: 69 additions & 63 deletions backend/app/views/spree/admin/stores/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,71 +1,77 @@
<%= f.field_container :name do %>
<%= f.label :name, class: 'required' %>
<%= f.text_field :name, required: true, class: 'fullwidth' %>
<%= f.error_message_on :name %>
<% end %>
<div class="row">
<div class="col-12 col-md-6">
<%= f.field_container :name do %>
<%= f.label :name, class: 'required' %>
<%= f.text_field :name, required: true, class: 'fullwidth' %>
<%= f.error_message_on :name %>
<% end %>

<%= f.field_container :code do %>
<%= f.label :code, class: 'required' %>
<%= f.text_field :code, required: true, class: 'fullwidth' %>
<%= f.error_message_on :code %>
<% end %>
<%= f.field_container :code do %>
<%= f.label :code, class: 'required' %>
<%= f.text_field :code, required: true, class: 'fullwidth' %>
<%= f.error_message_on :code %>
<% end %>

<%= f.field_container :seo_title do %>
<%= f.label :seo_title %>
<%= f.text_field :seo_title, class: 'fullwidth' %>
<%= f.error_message_on :seo_title %>
<% end %>
<%= f.field_container :seo_title do %>
<%= f.label :seo_title %>
<%= f.text_field :seo_title, class: 'fullwidth' %>
<%= f.error_message_on :seo_title %>
<% end %>

<%= f.field_container :meta_keywords do %>
<%= f.label :meta_keywords %>
<%= f.text_field :meta_keywords, class: 'fullwidth' %>
<%= f.error_message_on :meta_keywords %>
<% end %>
<%= f.field_container :meta_keywords do %>
<%= f.label :meta_keywords %>
<%= f.text_field :meta_keywords, class: 'fullwidth' %>
<%= f.error_message_on :meta_keywords %>
<% end %>

<%= f.field_container :meta_description do %>
<%= f.label :meta_description %>
<%= f.text_field :meta_description, class: 'fullwidth' %>
<%= f.error_message_on :meta_description %>
<% end %>
<%= f.field_container :meta_description do %>
<%= f.label :meta_description %>
<%= f.text_area :meta_description, class: 'fullwidth' %>
<%= f.error_message_on :meta_description %>
<% end %>
</div>
<div class="col-12 col-md-6">
<%= f.field_container :url do %>
<%= f.label :url, class: 'required' %>
<%= f.text_field :url, required: true, class: 'fullwidth' %>
<%= f.error_message_on :url %>
<% end %>

<%= f.field_container :url do %>
<%= f.label :url, class: 'required' %>
<%= f.text_field :url, required: true, class: 'fullwidth' %>
<%= f.error_message_on :url %>
<% end %>
<%= f.field_container :mail_from_address do %>
<%= f.label :mail_from_address, class: 'required' %>
<%= f.text_field :mail_from_address, required: true, class: 'fullwidth' %>
<%= f.error_message_on :mail_from_address %>
<% end %>

<%= f.field_container :mail_from_address do %>
<%= f.label :mail_from_address, class: 'required' %>
<%= f.text_field :mail_from_address, required: true, class: 'fullwidth' %>
<%= f.error_message_on :mail_from_address %>
<% end %>
<%= f.field_container :default_currency do %>
<%= f.label :default_currency %>
<%= f.select :default_currency,
Spree::Config.available_currencies.map(&:iso_code),
{ include_blank: true },
{ class: 'custom-select fullwidth' } %>
<%= f.error_message_on :default_currency %>
<% end %>

<%= f.field_container :default_currency do %>
<%= f.label :default_currency %>
<%= f.select :default_currency,
Spree::Config.available_currencies.map(&:iso_code),
{ include_blank: true },
{ class: 'select2 fullwidth' } %>
<%= f.error_message_on :default_currency %>
<% end %>
<%= f.field_container :cart_tax_country_iso do %>
<%= f.label :cart_tax_country_iso %>
<%= f.field_hint :cart_tax_country_iso %>
<%= f.select :cart_tax_country_iso,
Spree::Country.all.map { |c| [c.name, c.iso] },
{ include_blank: t(".no_cart_tax_country") },
{ class: "custom-select fullwidth" } %>
<%= f.error_message_on :cart_tax_country_iso %>
<% end %>

<%= f.field_container :cart_tax_country_iso do %>
<%= f.label :cart_tax_country_iso %>
<%= f.field_hint :cart_tax_country_iso %>
<%= f.select :cart_tax_country_iso,
Spree::Country.all.map { |c| [c.name, c.iso] },
{ include_blank: t(".no_cart_tax_country") },
{ class: "custom-select fullwidth" } %>
<%= f.error_message_on :cart_tax_country_iso %>
<% end %>

<%= f.field_container :available_locales do %>
<%= f.label :available_locales %>
<%= f.select :available_locales,
Spree.i18n_available_locales.map { |locale|
[I18n.t('spree.i18n.this_file_language', locale: locale, default: locale.to_s, fallback: false), locale]
}.sort,
{ },
{ class: 'custom-select fullwidth', multiple: true } %>
<%= f.error_message_on :default_currency %>
<% end %>
<%= f.field_container :available_locales do %>
<%= f.label :available_locales %>
<%= f.field_hint :available_locales %>
<%= f.select :available_locales,
Spree.i18n_available_locales.map { |locale|
[I18n.t('spree.i18n.this_file_language', locale: locale, default: locale.to_s, fallback: false), locale]
}.sort,
{ },
{ class: 'select2 fullwidth', multiple: true } %>
<%= f.error_message_on :default_currency %>
<% end %>
</div>
</div>
2 changes: 2 additions & 0 deletions core/config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ en:
name: Site Name
mail_from_address: Mail From Address
cart_tax_country_iso: Tax Country for Empty Carts
available_locales: Locales available in the storefront
spree/store_credit:
amount: Amount
amount_authorized: Amount Authorized
Expand Down Expand Up @@ -1297,6 +1298,7 @@ en:
check_stock_on_transfer: "When checked, inventory levels will be checked when performing stock transfers.<br/> Default: Checked"
spree/store:
cart_tax_country_iso: "This determines which country is used for taxes on carts (orders which don't yet have an address).<br/> Default: None."
available_locales: "This determines which locales are available for your customers to choose from in the storefront."
spree/variant:
tax_category: "This determines what kind of taxation is applied to this variant.<br/> Default: Use tax category of the product associated with this variant"
deleted: "Deleted Variant"
Expand Down