Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Improve Admin page titles and added favicon

Damian Legawiec0096f2d39507
diff --git a/admin/app/assets/config/spree_admin_manifest.js b/admin/app/assets/config/spree_admin_manifest.js
index 869b66b313..e9e72f45bf 100644
--- a/admin/app/assets/config/spree_admin_manifest.js
+++ b/admin/app/assets/config/spree_admin_manifest.js
@@ -1,6 +1,8 @@
//= link spree/admin/actiontext.css
//= link spree/admin/application.css
+//= link_tree ../images
+
//= link_tree ../../javascript/spree/admin/controllers .js
//= link_tree ../../javascript/spree/admin/helpers .js
//= link_tree ../../../vendor/javascript .js
diff --git a/admin/app/assets/images/favicon_256x256.png b/admin/app/assets/images/favicon_256x256.png
new file mode 100644
index 0000000000..2976246c38
Binary files /dev/null and b/admin/app/assets/images/favicon_256x256.png differ
diff --git a/admin/app/views/spree/admin/shared/_head.html.erb b/admin/app/views/spree/admin/shared/_head.html.erb
index eaf7544928..92538c6566 100644
--- a/admin/app/views/spree/admin/shared/_head.html.erb
+++ b/admin/app/views/spree/admin/shared/_head.html.erb
@@ -8,17 +8,12 @@
<% if content_for? :title %>
<%= yield :title %>
<% else %>
- <% if @object.present? %>
- <%= @object.try(:name) || @object.try(:title) || Spree.t(controller_name.singularize, default: controller_name.singularize.titleize)%>
- <% elsif @parent.present? %>
- <%= @parent.try(:name) || @parent.try(:title) || Spree.t(controller_name.singularize, default: controller_name.singularize.titleize) %>
- <% elsif @order.present? %>
- <%= Spree.t('order') %> #<%= @order.number %>
- <% elsif action_name == 'index' %>
- <%= Spree.t(controller_name, default: controller_name.titleize) %>
- <% else %>
- <%= Spree.t(controller_name.singularize, default: controller_name.singularize.titleize) %>
+ <% if @object.present? && @object.persisted? %><%= @object.try(:name) || @object.try(:title) %> - <% end %>
+ <% if @order.present? && @order.persisted? %><%= @order.number %> - <% end %>
+ <% if @parent.present? && @parent.persisted? %>
+ - <%= @parent.try(:name) || @parent.try(:title) || @parent.try(:number) %>
<% end %>
+ <%= Spree.t(controller_name, default: controller_name.titleize) %>
<% end %>
-
<% if defined?(current_store) && current_store.present? %>
@@ -36,6 +31,8 @@
<%= stylesheet_link_tag 'spree/admin/actiontext', media: :all, data: { turbo_track: "reload" } %>
<%= action_cable_meta_tag %>
+<%= favicon_link_tag 'favicon_256x256.png' %>
+
<link
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/@tabler/[email protected]/dist/tabler-icons.min.css"