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

Jump to bottom

created partial for order page title to resolve French translation of… #5482

Merged
merged 1 commit into from Jun 11, 2020
Merged

created partial for order page title to resolve French translation of… #5482

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/views/spree/admin/adjustments/edit.html.haml
View file
Open in desktop
@@ -1,4 +1,5 @@
= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' }
= render :partial => 'spree/admin/shared/order_page_title'
This conversation was marked as resolved.
Show resolved Hide resolved
= render :partial => 'spree/admin/shared/order_tabs', locals: { current: 'Adjustments' }

- content_for :page_title do
%i.icon-arrow-right
Expand Down
3 changes: 2 additions & 1 deletion app/views/spree/admin/adjustments/index.html.haml
View file
Open in desktop
@@ -1,4 +1,5 @@
= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' }
= render partial: 'spree/admin/shared/order_page_title'
= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Adjustments' }

- content_for :page_title do
%i.icon-arrow-right
Expand Down
3 changes: 2 additions & 1 deletion app/views/spree/admin/adjustments/new.html.haml
View file
Open in desktop
@@ -1,4 +1,5 @@
= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' }
= render partial: 'spree/admin/shared/order_page_title'
= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Adjustments' }

- content_for :page_title do
%i.icon-arrow-right
Expand Down
3 changes: 2 additions & 1 deletion app/views/spree/admin/orders/customer_details/edit.html.haml
View file
Open in desktop
@@ -1,4 +1,5 @@
= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Details' }
= render partial: 'spree/admin/shared/order_page_title'
= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Details' }

= csrf_meta_tags

Expand Down
3 changes: 2 additions & 1 deletion app/views/spree/admin/orders/edit.html.haml
View file
Open in desktop
Expand Up @@ -8,7 +8,8 @@
- if can?(:admin, Spree::Order)
%li= button_link_to t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left'

= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Order Details' }
= render partial: "spree/admin/shared/order_page_title"
= render partial: "spree/admin/shared/order_tabs", locals: { current: 'Order Details' }

%div{"data-hook" => "admin_order_edit_header"}
-# Suppress errors when manually creating a new order - needs to proceed to edit page
Expand Down
4 changes: 3 additions & 1 deletion app/views/spree/admin/orders/new.html.haml
View file
Open in desktop
@@ -1,5 +1,7 @@
- content_for :page_title do
= t(:new)
= t(:new_order)
\#
= @order.number

- content_for :page_actions do
%li= button_link_to t(:back_to_orders_list), spree.admin_orders_path, :icon => 'icon-arrow-left'
Expand Down
8 changes: 5 additions & 3 deletions app/views/spree/admin/orders/set_distribution.html.haml
View file
Open in desktop
@@ -1,12 +1,14 @@
- content_for :page_title do
= t(:new)

- content_for :page_actions do
%li= button_link_to t(:back_to_orders_list), spree.admin_orders_path, :icon => 'icon-arrow-left'

= admin_inject_shops(module: 'admin.orders')
= admin_inject_order_cycles

- content_for :page_title do
= t(:new_order)
\#
= @order.number

= render 'spree/admin/shared/order_tabs', :current => 'Order Details'
This conversation was marked as resolved.
Show resolved Hide resolved

= csrf_meta_tags
Expand Down
1 change: 1 addition & 0 deletions app/views/spree/admin/payments/index.html.haml
View file
Open in desktop
@@ -1,3 +1,4 @@
= render partial: 'spree/admin/shared/order_page_title'
= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }

This conversation was marked as resolved.
Show resolved Hide resolved
- content_for :page_actions do
Expand Down
1 change: 1 addition & 0 deletions app/views/spree/admin/payments/new.html.haml
View file
Open in desktop
@@ -1,3 +1,4 @@
= render partial: 'spree/admin/shared/order_page_title'
= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }
This conversation was marked as resolved.
Show resolved Hide resolved

- content_for :page_title do
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doesn't this conflict with the order_page_title partial?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, it adds to it, content_for appends content.

Expand Down
1 change: 1 addition & 0 deletions app/views/spree/admin/payments/show.html.haml
View file
Open in desktop
@@ -1,3 +1,4 @@
= render partial: 'spree/admin/shared/order_page_title'
= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }

- content_for :page_title do
This conversation was marked as resolved.
Show resolved Hide resolved
Expand Down
1 change: 1 addition & 0 deletions app/views/spree/admin/return_authorizations/edit.html.haml
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@
- if @return_authorization.can_cancel?
= button_link_to t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: t('.are_you_sure') }, icon: 'icon-remove'

= render partial: 'spree/admin/shared/order_page_title'
= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Return Authorizations' }

- content_for :page_title do
Expand Down
1 change: 1 addition & 0 deletions app/views/spree/admin/return_authorizations/index.html.haml
View file
Open in desktop
@@ -1,3 +1,4 @@
= render partial: 'spree/admin/shared/order_page_title'
= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Return Authorizations' }

- content_for :page_actions do
Expand Down
1 change: 1 addition & 0 deletions app/views/spree/admin/return_authorizations/new.html.haml
View file
Open in desktop
@@ -1,3 +1,4 @@
= render partial: 'spree/admin/shared/order_page_title'
= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Return Authorizations' }

- content_for :page_title do
Expand Down
4 changes: 4 additions & 0 deletions app/views/spree/admin/shared/_order_page_title.html.haml
View file
Open in desktop
@@ -0,0 +1,4 @@
- content_for :page_title do
= t(:order)
\#
= @order.number
5 changes: 0 additions & 5 deletions app/views/spree/admin/shared/_order_tabs.html.haml
View file
Open in desktop
@@ -1,8 +1,3 @@
- content_for :page_title do
= t(:order)
\#
= @order.number

- if @order.bill_address.present?
= @order.bill_address.firstname
= @order.bill_address.lastname
Expand Down