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

Update hints and remove them where not needed #5435

Merged
merged 1 commit into from
Oct 19, 2023
Merged

Update hints and remove them where not needed #5435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions admin/app/components/solidus_admin/products/show/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<%= render component("ui/forms/field").text_area(f, :description) %>
<% end %>

<%= render component('ui/panel').new(title: 'SEO', title_hint: 'Search Engine Optimization') do %>
<%= render component('ui/panel').new(title: 'SEO') do %>
<%= render component("ui/forms/field").text_field(f, :meta_title) %>
<%= render component("ui/forms/field").text_field(f, :meta_description) %>
<%= render component("ui/forms/field").text_area(f, :meta_keywords) %>
Expand Down Expand Up @@ -109,8 +109,8 @@

<aside class="justify-center items-start gap-4 flex flex-col w-full max-w-sm">
<%= render component('ui/panel').new(title: "Publishing") do %>
<%= render component("ui/forms/field").text_field(f, :available_on, tip: t(".hints.available_on_html"), type: :date) %>
<%= render component("ui/forms/field").text_field(f, :discontinue_on, tip: t(".hints.discontinue_on_html"), type: :date) %>
<%= render component("ui/forms/field").text_field(f, :available_on, hint: t(".available_on_html"), type: :date) %>
<%= render component("ui/forms/field").text_field(f, :discontinue_on, hint: t(".discontinue_on_html"), type: :date) %>

<label class="flex gap-2 items-center">
<%= render component("ui/forms/checkbox").new(
Expand Down
10 changes: 5 additions & 5 deletions admin/app/components/solidus_admin/products/show/component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ en:
manage_properties: "Manage product specifications"
manage_stock: "Manage stock"
delete_confirmation: "Are you sure you want to delete this product?"
available_on_html: 'Product availability starts from the set date.<br> Empty date indicates no availability.'
discontinue_on_html: 'Product availability ends from the set date.<br> Empty date indicates continuous availability.'
hints:
available_on_html: This sets the availability date for the product. If this value is not set, or it is set to a date in the future, then the product is not available on the storefront.
discontinue_on_html: This sets the discontinue date for the product. If this value is set to a date, then the product is not available on the storefront from that day on anymore.
promotionable_html: 'This determines whether or not promotions can apply to this product.<br>Default: Checked'
shipping_category_html: 'This determines what kind of shipping this product requires.<br> Default: Default'
tax_category_html: 'This determines what kind of taxation is applied to this product.<br> Default: %{default_tax_category}'
promotionable_html: Promotions can apply to this product
shipping_category_html: Manage Shipping in Settings
tax_category_html: Manage Taxes in Settings
6 changes: 3 additions & 3 deletions admin/spec/components/previews/solidus_admin/ui/panel/component_preview/overview.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
With title and hint
</h6>

<%= render current_component.new(title: "SEO", title_hint: "Search Engine Optimization") do %>
<%= render current_component.new(title: "SEO") do %>
<label>
SKU:
ABC-123
Expand All @@ -42,7 +42,7 @@
With title, hint, and actions
</h6>

<%= render current_component.new(title: "SEO", title_hint: "Search Engine Optimization") do |panel| %>
<%= render current_component.new(title: "SEO") do |panel| %>
<label>
SKU:
ABC-123
Expand All @@ -57,7 +57,7 @@
With no content
</h6>

<%= render current_component.new(title: "SEO", title_hint: "Search Engine Optimization") do |panel| %>
<%= render current_component.new(title: "SEO") do |panel| %>
<% panel.with_action(name: "Foo", href: "#foo") %>
<% end %>
</div>