diff options
5 files changed, 43 insertions, 8 deletions
diff --git a/app/assets/stylesheets/refinery/blog/frontend.css.scss b/app/assets/stylesheets/refinery/blog/frontend.css.scss index 59a1180..f520f0c 100644 --- a/app/assets/stylesheets/refinery/blog/frontend.css.scss +++ b/app/assets/stylesheets/refinery/blog/frontend.css.scss @@ -65,7 +65,7 @@ &.flash_notice, &.flash_message { border: 1px solid #00A017; color: #00A017; - background: 7px 7px no-repeat image_url('refinery/blog/icons/accept.png') #E0F5E0; + background: 7px 7px no-repeat image_url('refinery/icons/accept.png') #E0F5E0; } &.flash_notice #flash_close, &.flash_error #flash_close { text-transform: lowercase; @@ -88,7 +88,7 @@ &.flash_error { border: 1px solid #A00027; color: #A00027; - background: 7px 7px no-repeat image_url('refinery/blog/icons/cancel.png') #FFB1B1; + background: 7px 7px no-repeat image_url('refinery/icons/cancel.png') #FFB1B1; a { &, &:hover { display: none; diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index f3274f6..e174a03 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -114,7 +114,7 @@ zh-TW: title: "標簽" categories: show: - no_posts: 此處沒有文章。 + no_posts: 此處沒有文章。 posts: post: filled_in: 用戶體驗 @@ -128,7 +128,7 @@ zh-TW: no_blog_articles_yet: 尚未發布文章。敬請關注。 show: blog_home: 博客首頁 - by: 作者 + by: 作者 categories: 標簽 category: 標簽 comments: @@ -157,4 +157,4 @@ zh-TW: refinery/blog/post: title: Title body: 標題 - teaser: 前言
\ No newline at end of file + teaser: 前言 diff --git a/db/migrate/20140622132537_add_missing_unique_indices.acts_as_taggable_on_engine.rb b/db/migrate/20140622132537_add_missing_unique_indices.acts_as_taggable_on_engine.rb new file mode 100644 index 0000000..4ca676f --- /dev/null +++ b/db/migrate/20140622132537_add_missing_unique_indices.acts_as_taggable_on_engine.rb @@ -0,0 +1,20 @@ +# This migration comes from acts_as_taggable_on_engine (originally 2) +class AddMissingUniqueIndices < ActiveRecord::Migration + def self.up + add_index :tags, :name, unique: true + + remove_index :taggings, :tag_id + remove_index :taggings, [:taggable_id, :taggable_type, :context] + add_index :taggings, + [:tag_id, :taggable_id, :taggable_type, :context, :tagger_id, :tagger_type], + unique: true, name: 'taggings_idx' + end + + def self.down + remove_index :tags, :name + + remove_index :taggings, name: 'taggings_idx' + add_index :taggings, :tag_id + add_index :taggings, [:taggable_id, :taggable_type, :context] + end +end diff --git a/db/migrate/20140622132538_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb b/db/migrate/20140622132538_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb new file mode 100644 index 0000000..8edb508 --- /dev/null +++ b/db/migrate/20140622132538_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb @@ -0,0 +1,15 @@ +# This migration comes from acts_as_taggable_on_engine (originally 3) +class AddTaggingsCounterCacheToTags < ActiveRecord::Migration + def self.up + add_column :tags, :taggings_count, :integer, default: 0 + + ActsAsTaggableOn::Tag.reset_column_information + ActsAsTaggableOn::Tag.find_each do |tag| + ActsAsTaggableOn::Tag.reset_counters(tag.id, :taggings) + end + end + + def self.down + remove_column :tags, :taggings_count + end +end diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec index 088c549..da97018 100644 --- a/refinerycms-blog.gemspec +++ b/refinerycms-blog.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = %q{refinerycms-blog} - s.version = %q{3.0.0.dev} + s.version = %q{3.0.0} s.description = %q{A really straightforward open source Ruby on Rails blog engine designed for integration with Refinery CMS.} s.summary = %q{Ruby on Rails blogging engine for Refinery CMS.} s.email = %q{info@refinerycms.com} @@ -15,8 +15,8 @@ Gem::Specification.new do |s| s.test_files = `git ls-files -- spec/*`.split("\n") # Runtime dependencies - s.add_dependency 'refinerycms-core', '~> 3.0.0.dev' - s.add_dependency 'refinerycms-settings', '~> 3.0.0.dev' + s.add_dependency 'refinerycms-core', '~> 3.0.0' + s.add_dependency 'refinerycms-settings', '~> 3.0.0' s.add_dependency 'filters_spam', '~> 0.2' s.add_dependency 'acts-as-taggable-on' s.add_dependency 'seo_meta', '~> 2.0.0.rc.1' |