From 6b86baf44dc583eb41da4fe57e1ba6d9d3abc34c Mon Sep 17 00:00:00 2001 From: GarPit Date: Fri, 17 Apr 2015 17:18:30 +0300 Subject: [PATCH 1/7] spree 3.0 dependency --- spree_blogging_spree.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spree_blogging_spree.gemspec b/spree_blogging_spree.gemspec index 791000e7..bd6ad874 100644 --- a/spree_blogging_spree.gemspec +++ b/spree_blogging_spree.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.requirements << 'none' - s.add_dependency 'spree_core', '~> 2.3.0' + s.add_dependency 'spree_core', '~> 3.0.0' s.add_dependency 'acts-as-taggable-on', '~> 3.0.2' s.add_development_dependency 'capybara', '~> 2.2.1' From 0e8d1e70f18f58013dfdaf9e03f10a119e5fd780 Mon Sep 17 00:00:00 2001 From: GarPit Date: Fri, 17 Apr 2015 18:06:36 +0300 Subject: [PATCH 2/7] support for spree 3.0 --- app/overrides/add_blog_admin_menu_tab.rb | 6 +++--- .../shared/._blog_sidebar_menu.html.erb.swo | Bin 0 -> 12288 bytes .../admin/shared/_blog_sidebar_menu.html.erb | 5 +++++ config/locales/ru.yml | 5 +++-- 4 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 app/views/spree/admin/shared/._blog_sidebar_menu.html.erb.swo create mode 100644 app/views/spree/admin/shared/_blog_sidebar_menu.html.erb diff --git a/app/overrides/add_blog_admin_menu_tab.rb b/app/overrides/add_blog_admin_menu_tab.rb index fd8ae16a..f5023d0e 100644 --- a/app/overrides/add_blog_admin_menu_tab.rb +++ b/app/overrides/add_blog_admin_menu_tab.rb @@ -1,5 +1,5 @@ -Deface::Override.new(:virtual_path => "spree/admin/shared/_menu", +Deface::Override.new(:virtual_path => "spree/layouts/admin", :name => "blog_admin_tabs", - :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]", - :text => "<%= tab(:blog_entries, :label => 'Blog', :url => spree.admin_blog_entries_path, :icon => 'file') if can? :manage, Spree::BlogEntry %>", + :insert_bottom => "#main-sidebar", + :partial => 'spree/admin/shared/blog_sidebar_menu', :disabled => false) diff --git a/app/views/spree/admin/shared/._blog_sidebar_menu.html.erb.swo b/app/views/spree/admin/shared/._blog_sidebar_menu.html.erb.swo new file mode 100644 index 0000000000000000000000000000000000000000..6ef5d442aa9c0b9e5d7bd76f5ceba2d843760afa GIT binary patch literal 12288 zcmeI&L2J}N6bJBW!J}Ffym)!8EZagi)3pU9?5#62lkskiQb;7^jtBs=f7x80W>y?^tTo<}E2#-39Acy>1W@kQ+}l&Wp0 zd_RB9_}6uxhK0Irst=rnRu_$FTiw|sX!N2(-(Ku@w3^{)6o-p_~2|yAy761AOHaf zKmY;|fB*!xS0L0o>PpJrmE4i+Y$68?2tWV=5P$##AOHafKmY;|fB*z;iGazK`gTvL zNB5;5`TxKF4d7DFKTGx{BS@}c>7NU<|1J6bGh($7w0rfY`lq1ihc zn!A5Bb+bHSxlL*l*0RiIl^>p4S;vzDvMb7re@Ss^yeatbj}O~ys&kY%X)a%kyg4Vy zbki+9S}NK7-(E8x#*Hidz51xEa(0O~B}eN{w!NQKoewe1qS?VsA^yM0;hX7S^AjrK B%?AJg literal 0 HcmV?d00001 diff --git a/app/views/spree/admin/shared/_blog_sidebar_menu.html.erb b/app/views/spree/admin/shared/_blog_sidebar_menu.html.erb new file mode 100644 index 00000000..9ba91cf1 --- /dev/null +++ b/app/views/spree/admin/shared/_blog_sidebar_menu.html.erb @@ -0,0 +1,5 @@ +<% if can? :manage, Spree::BlogEntry %> +
    + <%= tab Spree::BlogEntry, :label => Spree::BlogEntry.model_name.human(count: 1.1), :url => spree.admin_blog_entries_path, :icon => 'file' %> +
+<% end %> diff --git a/config/locales/ru.yml b/config/locales/ru.yml index b7250843..06eba7ee 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -5,8 +5,9 @@ ru: activerecord: models: spree/blog_entry: - one: Blog Entry - other: Blog Entries + one: Публикация + other: Публикации + many: Публикаций attributes: spree/blog_entry: title: Заголовок From faaab094777b04bb4889be91cff40521b3fa75a1 Mon Sep 17 00:00:00 2001 From: GarPit Date: Fri, 5 Aug 2016 09:34:24 +0300 Subject: [PATCH 3/7] dependency on spree 3.1.0 --- spree_blogging_spree.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spree_blogging_spree.gemspec b/spree_blogging_spree.gemspec index bd6ad874..c490ea85 100644 --- a/spree_blogging_spree.gemspec +++ b/spree_blogging_spree.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.requirements << 'none' - s.add_dependency 'spree_core', '~> 3.0.0' + s.add_dependency 'spree_core', '~> 3.1.0' s.add_dependency 'acts-as-taggable-on', '~> 3.0.2' s.add_development_dependency 'capybara', '~> 2.2.1' From 4e2046f2a469bda002dc7e739afee24181bc1fc9 Mon Sep 17 00:00:00 2001 From: GarPit Date: Fri, 5 Aug 2016 09:46:46 +0300 Subject: [PATCH 4/7] add some missing translations --- config/locales/en.yml | 2 ++ config/locales/ru.yml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 84b03f04..c571275d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -51,6 +51,8 @@ en: blog_tag: Tag blog_category: Category blog_author: Author + view_in_store: View in Store + back_to_blog_list: Back to blog list admin: tab: blog_entries: Blog entries diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 06eba7ee..adfc1208 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -27,7 +27,7 @@ ru: spree: title: Заголовок body: Содержимое - summary: Summary + summary: Анонс permalink: Постоянная ссылка published_at: Дата публикации visible: Показывать @@ -52,6 +52,8 @@ ru: blog_tag: Ключевое слово blog_category: Категория blog_author: Автор + view_in_store: Посмотреть в Магазине + back_to_blog_list: Назад к списку admin: tab: blog_entries: Блог From 72b5d92d9f86b1dade632ce50270b431599032bc Mon Sep 17 00:00:00 2001 From: GarPit Date: Fri, 5 Aug 2016 10:02:12 +0300 Subject: [PATCH 5/7] change some html --- app/helpers/spree/admin/navigation_helper_decorator.rb | 2 +- app/views/spree/admin/blog_entries/index.html.erb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/helpers/spree/admin/navigation_helper_decorator.rb b/app/helpers/spree/admin/navigation_helper_decorator.rb index 6b9c098d..2e7302e2 100644 --- a/app/helpers/spree/admin/navigation_helper_decorator.rb +++ b/app/helpers/spree/admin/navigation_helper_decorator.rb @@ -2,6 +2,6 @@ def link_to_blog_in_store(resource, options={}) url = options[:url] || blog_entry_permalink(resource) #options[:data] = {:action => 'show'} - link_to_with_icon('icon-view', Spree.t(:view_in_store), url, options) + link_to_with_icon('ok', Spree.t(:view_in_store), url, options.merge(class: 'btn btn-default btn-sm')) end end diff --git a/app/views/spree/admin/blog_entries/index.html.erb b/app/views/spree/admin/blog_entries/index.html.erb index b1b721ee..3c8e2169 100644 --- a/app/views/spree/admin/blog_entries/index.html.erb +++ b/app/views/spree/admin/blog_entries/index.html.erb @@ -32,7 +32,7 @@ <%= blog_entry.title %> <%= blog_entry.summary.truncate(300) if blog_entry.summary %> - <%= content_tag(:i, '', :class => 'fa fa-ok green') if blog_entry.visible %> + <%= content_tag(:i, '', :class => 'icon icon-ok text-success') if blog_entry.visible %> <%= link_to_blog_in_store blog_entry, :no_text => true, target: '_blank' %> @@ -51,4 +51,3 @@ <%= link_to Spree.t(:add_one), spree.new_admin_blog_entry_path %>! <% end %> - From 9f0871ff04e25c7a6fcf32143ec3c76f3fd2ac87 Mon Sep 17 00:00:00 2001 From: GarPit Date: Thu, 22 Dec 2016 09:38:35 +0300 Subject: [PATCH 6/7] update author info fields html --- .../admin/users/_author_info_fields.html.erb | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/app/views/spree/admin/users/_author_info_fields.html.erb b/app/views/spree/admin/users/_author_info_fields.html.erb index e16bd14c..2378b556 100644 --- a/app/views/spree/admin/users/_author_info_fields.html.erb +++ b/app/views/spree/admin/users/_author_info_fields.html.erb @@ -1,26 +1,28 @@ -
-
- <%= f.field_container :nickname do %> - <%= f.label :nickname, Spree.t(:nickname) %> - <%= f.text_field :nickname, :class => 'fullwidth' %> - <%= error_message_on :user, :nickname %> - <% end %> - <%= f.field_container :website_url do %> - <%= f.label :website_url, Spree.t(:website_url) %> - <%= f.text_field :website_url, :class => 'fullwidth' %> - <%= error_message_on :user, :website_url %> - <% end %> - <%= f.field_container :google_plus_url do %> - <%= f.label :google_plus_url, Spree.t(:google_plus_url) %> - <%= f.text_field :google_plus_url, :class => 'fullwidth' %> - <%= f.error_message_on :google_plus_url %> - <% end %> +
+
+
+ <%= f.field_container :nickname do %> + <%= f.label :nickname, Spree.t(:nickname) %> + <%= f.text_field :nickname, :class => 'form-control' %> + <%= error_message_on :user, :nickname %> + <% end %> + <%= f.field_container :website_url do %> + <%= f.label :website_url, Spree.t(:website_url) %> + <%= f.text_field :website_url, :class => 'form-control' %> + <%= error_message_on :user, :website_url %> + <% end %> + <%= f.field_container :google_plus_url do %> + <%= f.label :google_plus_url, Spree.t(:google_plus_url) %> + <%= f.text_field :google_plus_url, :class => 'form-control' %> + <%= f.error_message_on :google_plus_url %> + <% end %> +
+
+ <%= f.field_container :bio_info do %> + <%= f.label :bio_info, Spree.t(:bio_info) %> + <%= f.text_area :bio_info, {:rows => 4, :class => 'form-control'} %> + <%= f.error_message_on :bio_info %> + <% end %> +
-
- <%= f.field_container :bio_info do %> - <%= f.label :bio_info, Spree.t(:bio_info) %> - <%= f.text_area :bio_info, {:rows => 4, :class => 'fullwidth'} %> - <%= f.error_message_on :bio_info %> - <% end %> -
-
\ No newline at end of file +
From a0d6471340a145b6aa66279dd7ec1d7b5dedf464 Mon Sep 17 00:00:00 2001 From: GarPit Date: Tue, 31 Jan 2017 11:27:44 +0300 Subject: [PATCH 7/7] update acts-as-taggable-on + style form --- .../spree/admin/blog_entries/_form.html.erb | 50 ++++++++++--------- .../spree/admin/blog_entries/edit.html.erb | 2 +- .../spree/admin/blog_entries/index.html.erb | 2 +- .../spree/admin/blog_entries/new.html.erb | 2 +- config/locales/en.yml | 1 + config/locales/ru.yml | 1 + ...128124852_acts_as_taggable_on_migration.rb | 1 + spree_blogging_spree.gemspec | 2 +- 8 files changed, 34 insertions(+), 27 deletions(-) diff --git a/app/views/spree/admin/blog_entries/_form.html.erb b/app/views/spree/admin/blog_entries/_form.html.erb index 67b5fcff..b2a0943c 100644 --- a/app/views/spree/admin/blog_entries/_form.html.erb +++ b/app/views/spree/admin/blog_entries/_form.html.erb @@ -1,16 +1,15 @@ -
-
+
<%= form.field_container :title do %> <%= form.label :title, Spree.t(:title) %> *
- <%= form.text_field :title, :class => 'fullwidth title' %> + <%= form.text_field :title, :class => 'form-control' %> <%= form.error_message_on :title %> <% end %> <%= form.field_container :permalink do %> <%= form.label :permalink, Spree.t(:permalink) %> *
- <%= form.text_field :permalink, :class => 'fullwidth' %> + <%= form.text_field :permalink, :class => 'form-control' %> <%= form.error_message_on :permalink %> <% end %> @@ -30,9 +29,10 @@ $("#blog_entry_category_list").select2({tags: <%= Spree::BlogEntry.tag_counts_on(:categories).map{|t| t.name }.to_json.html_safe %> }); <% end %> +
-
+
<%= form.field_container :published_at do %> <%= form.label :published_at, Spree.t(:published_at) %>
<%= form.error_message_on :published_at %> @@ -41,11 +41,8 @@ <% else %> <% published_at = nil %> <% end %> - <%= form.text_field :published_at, :value => published_at, :class => 'datepicker' %> + <%= form.text_field :published_at, :value => published_at, :class => 'datepicker form-control' %> <% end %> -
- -
<%= form.field_container :visible do %> <%= form.label :visible, Spree.t(:visible) %>
<%= form.check_box :visible %> @@ -53,9 +50,11 @@ <% end %>
-
-
+
+
+ +
<%= form.field_container :author_id do %> <%= form.label :author_id, Spree.t(:author_id) %>
@@ -78,7 +77,7 @@ <%= form.field_container :blog_entry_image_alt do %> <%= blog_entry_image_field.label :alt, Spree.t(:alt_text) %>
- <%= blog_entry_image_field.text_field :alt %> + <%= blog_entry_image_field.text_field :alt, class: 'form-control' %> <% end %> <% end %> <% end %> @@ -86,14 +85,19 @@
-<%= form.field_container :body do %> - <%= form.label :body %> *
- <%= form.text_area :body, {:cols => 60, :rows => 4, :class => 'fullwidth', :id => 'blog_entry_body'} %> - <%= form.error_message_on :body %> -<% end %> - -<%= form.field_container :summary do %> - <%= form.label :summary %>
- <%= form.text_area :summary, {:cols => 60, :rows => 4, :class => 'fullwidth', :id => 'blog_entry_summary'} %> - <%= form.error_message_on :summary %> -<% end %> +
+ +
+ <%= form.field_container :body do %> + <%= form.label :body %> *
+ <%= form.text_area :body, {:cols => 60, :rows => 4, :class => 'form-control', :id => 'blog_entry_body'} %> + <%= form.error_message_on :body %> + <% end %> + + <%= form.field_container :summary do %> + <%= form.label :summary %>
+ <%= form.text_area :summary, {:cols => 60, :rows => 4, :class => 'form-control', :id => 'blog_entry_summary'} %> + <%= form.error_message_on :summary %> + <% end %> +
+
diff --git a/app/views/spree/admin/blog_entries/edit.html.erb b/app/views/spree/admin/blog_entries/edit.html.erb index 8725ee2d..22692ed7 100644 --- a/app/views/spree/admin/blog_entries/edit.html.erb +++ b/app/views/spree/admin/blog_entries/edit.html.erb @@ -3,7 +3,7 @@ <% end %> <% content_for :page_actions do %> -
  • <%= button_link_to Spree.t(:back_to_blog_list), spree.admin_blog_entries_url, :icon => 'arrow-left' %>
    • + <%= button_link_to Spree.t(:back_to_blog_list), spree.admin_blog_entries_url, :icon => 'arrow-left' %> <% end %> <%= render "spree/shared/error_messages", :target => @blog_entry %> diff --git a/app/views/spree/admin/blog_entries/index.html.erb b/app/views/spree/admin/blog_entries/index.html.erb index 3c8e2169..79f266e0 100644 --- a/app/views/spree/admin/blog_entries/index.html.erb +++ b/app/views/spree/admin/blog_entries/index.html.erb @@ -3,7 +3,7 @@ <% end %> <% content_for :page_actions do %> -
  • <%= button_link_to Spree.t(:new_blog_entry), new_object_url, :icon => 'plus' %>
    • + <%= button_link_to Spree.t(:new_blog_entry), new_object_url, :icon => 'plus' %> <% end %> <% if @blog_entries.any? %> diff --git a/app/views/spree/admin/blog_entries/new.html.erb b/app/views/spree/admin/blog_entries/new.html.erb index 4221259b..c6d08553 100644 --- a/app/views/spree/admin/blog_entries/new.html.erb +++ b/app/views/spree/admin/blog_entries/new.html.erb @@ -3,7 +3,7 @@ <% end %> <% content_for :page_actions do %> -
  • <%= button_link_to Spree.t(:back_to_blog_list), spree.admin_blog_entries_url, :icon => 'arrow-left' %>
    • + <%= button_link_to Spree.t(:back_to_blog_list), spree.admin_blog_entries_url, :icon => 'arrow-left' %> <% end %> <%= render "spree/shared/error_messages", :target => @blog_entry %> diff --git a/config/locales/en.yml b/config/locales/en.yml index c571275d..fd59e833 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -24,6 +24,7 @@ en: google_plus_url: Google Plus URL bio_info: Biographical info spree: + editing: Editing title: Title body: Body summary: Summary diff --git a/config/locales/ru.yml b/config/locales/ru.yml index adfc1208..e01b9277 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -25,6 +25,7 @@ ru: google_plus_url: Ссылка на профиль в Google Plus bio_info: Биография spree: + editing: Редактирование title: Заголовок body: Содержимое summary: Анонс diff --git a/db/migrate/20130128124852_acts_as_taggable_on_migration.rb b/db/migrate/20130128124852_acts_as_taggable_on_migration.rb index e8b978d9..563e875e 100644 --- a/db/migrate/20130128124852_acts_as_taggable_on_migration.rb +++ b/db/migrate/20130128124852_acts_as_taggable_on_migration.rb @@ -2,6 +2,7 @@ class ActsAsTaggableOnMigration < ActiveRecord::Migration def self.up create_table :tags do |t| t.string :name + t.integer :taggings_count, default: 0 end create_table :taggings do |t| diff --git a/spree_blogging_spree.gemspec b/spree_blogging_spree.gemspec index c490ea85..81d253cf 100644 --- a/spree_blogging_spree.gemspec +++ b/spree_blogging_spree.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.requirements << 'none' s.add_dependency 'spree_core', '~> 3.1.0' - s.add_dependency 'acts-as-taggable-on', '~> 3.0.2' + s.add_dependency 'acts-as-taggable-on', '~> 3.5.0' s.add_development_dependency 'capybara', '~> 2.2.1' s.add_development_dependency 'coffee-rails', '~> 4.0.0'