From 49404806ab181cdd3bf76c4f8bdcb1e9d9f71a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80lex?= Date: Thu, 10 Nov 2011 16:34:51 +0100 Subject: [PATCH 01/28] Added Rails 3 name app requirement --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 32bf487..8e923db 100644 --- a/readme.md +++ b/readme.md @@ -12,6 +12,7 @@ Options: ## Requirements Refinery CMS version 1.0.0 or above. +Your Rails 3 application should not be called "blog" ## Install From c7615725931a1bc5992a591d4012eeca957cfced Mon Sep 17 00:00:00 2001 From: Justin Grevich Date: Fri, 11 Nov 2011 11:07:32 -0800 Subject: [PATCH 02/28] use live scope in blog_archive_list helper method to prevent counting of draft posts --- app/helpers/blog_posts_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/blog_posts_helper.rb b/app/helpers/blog_posts_helper.rb index 0848632..74eb521 100644 --- a/app/helpers/blog_posts_helper.rb +++ b/app/helpers/blog_posts_helper.rb @@ -1,6 +1,6 @@ module BlogPostsHelper def blog_archive_list - posts = BlogPost.select('published_at').all_previous + posts = BlogPost.live.select('published_at').all_previous return nil if posts.blank? html = '

' html << t('archives', :scope => 'blog.shared') @@ -20,7 +20,7 @@ module BlogPostsHelper links.each do |l| year = l.split('/')[1] month = l.split('/')[0] - count = BlogPost.by_archive(Time.parse(l)).size + count = BlogPost.live.by_archive(Time.parse(l)).size text = t("date.month_names")[month.to_i] + " #{year} (#{count})" html << "
  • " html << link_to(text, archive_blog_posts_path(:year => year, :month => month)) @@ -28,7 +28,7 @@ module BlogPostsHelper end super_old_links.each do |l| year = l.split('/')[1] - count = BlogPost.by_year(Time.parse(l)).size + count = BlogPost.live.by_year(Time.parse(l)).size text = "#{year} (#{count})" html << "
  • " html << link_to(text, archive_blog_posts_path(:year => year)) From d5fadb45233ef72c6b839c27dece6b635364148e Mon Sep 17 00:00:00 2001 From: Joe Sak Date: Fri, 11 Nov 2011 14:19:00 -0600 Subject: [PATCH 03/28] Updated the changelog with 1.6.3 details + full list links between all releases --- changelog.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/changelog.md b/changelog.md index e6415e6..6357a19 100644 --- a/changelog.md +++ b/changelog.md @@ -1,16 +1,22 @@ ## 1.6.3 [UNRELEASED] * Bulgarian translations [mirosr](https://github.com/mirosr) * posts/tagged... params[:tag_name] is optional [joemsak](https://github.com/joemsak) +* Bug Fix on Categorization relationship: destroying a post produced error because no primary key existed on join table [joemsak](https://github.com/joemsak) +* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.6.2...1.6.3) ## 1.6.2 [29 June 2011] * Custom teaser field to overwrite the automatic truncation of the body [wikyd](https://github.com/wikyd) * Tagging URL strategy updated again [joemsak](https://github.com/joemsak) * Tagging bug fixed [ruprict](https://github.com/ruprict) * Refactored specs [parndt](https://github.com/parndt) +* * [See full list](https://github.com/resolve/refinerycms-blog/compare/1.6.1...1.6.2) + ## 1.6.1 [21 June 2011] * Tagging URL strategy updated for reliability /blog/posts/tagged/ID-name-parameterized [joemsak](https://github.com/joemsak) * Heroku/PostgreSQL support for autocomplete tags [joemsak](https://github.com/joemsak) +* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.6...1.6.1) + ## 1.6 [20 June 2011] * Category bug fixes and cleanup [wikyd](https://github.com/wikyd) @@ -20,11 +26,14 @@ * More testing [wakeless](https://github.com/wakeless) * Tag list autocomplete baked in [joemsak](https://github.com/joemsak) * Customize the URL of your blog post [wikyd](https://github.com/wikyd) +* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.5...1.6) + ## 1.5 [28 May 2011] * Added Gravatar support. [parndt](https://github.com/parndt) * Added support for Refinery CMS 1.0.0 and above. [parndt](https://github.com/parndt) +* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.4...1.5) ## 1.4 [26 May 2011] From eb160aa3540b6686a146491b4697f0e3091bdabe Mon Sep 17 00:00:00 2001 From: Joe Sak Date: Fri, 11 Nov 2011 14:20:59 -0600 Subject: [PATCH 04/28] 1.6.3 bump --- lib/refinery/blog/version.rb | 2 +- readme.md | 2 +- refinerycms-blog.gemspec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/refinery/blog/version.rb b/lib/refinery/blog/version.rb index 0390414..3902da5 100644 --- a/lib/refinery/blog/version.rb +++ b/lib/refinery/blog/version.rb @@ -3,7 +3,7 @@ module Refinery class Version @major = 1 @minor = 6 - @tiny = 2 + @tiny = 3 class << self attr_reader :major, :minor, :tiny diff --git a/readme.md b/readme.md index 8e923db..ab4abf9 100644 --- a/readme.md +++ b/readme.md @@ -18,7 +18,7 @@ Your Rails 3 application should not be called "blog" Open up your ``Gemfile`` and add at the bottom this line: - gem 'refinerycms-blog', '~> 1.6.1' + gem 'refinerycms-blog', '~> 1.6.3' Now, run ``bundle install`` diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec index 51682fb..49dcf14 100644 --- a/refinerycms-blog.gemspec +++ b/refinerycms-blog.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = %q{refinerycms-blog} - s.version = %q{1.6.2} + s.version = %q{1.6.3} s.description = %q{A really straightforward open source Ruby on Rails blog engine designed for integration with RefineryCMS.} s.date = %q{2011-06-29} s.summary = %q{Ruby on Rails blogging engine for RefineryCMS.} From 81bf46cd7a3650aef41472c8291578230d9fd207 Mon Sep 17 00:00:00 2001 From: Joe Sak Date: Fri, 11 Nov 2011 15:14:35 -0600 Subject: [PATCH 05/28] Changelog update --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 6357a19..2c30068 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,7 @@ * Bulgarian translations [mirosr](https://github.com/mirosr) * posts/tagged... params[:tag_name] is optional [joemsak](https://github.com/joemsak) * Bug Fix on Categorization relationship: destroying a post produced error because no primary key existed on join table [joemsak](https://github.com/joemsak) +* Bug fix on archive listing, don't include draft posts [jgrevich](https://github.com/jgrevich) * [See full list](https://github.com/resolve/refinerycms-blog/compare/1.6.2...1.6.3) ## 1.6.2 [29 June 2011] From d9387e32c3f9d9ad84f35d928fe5c4061298c65f Mon Sep 17 00:00:00 2001 From: Joe Sak Date: Mon, 14 Nov 2011 16:26:43 -0600 Subject: [PATCH 06/28] Version bump: 1.7.0 --- changelog.md | 6 +++--- db/migrate/1_create_blog_structure.rb | 2 +- lib/refinery/blog/version.rb | 6 +++--- readme.md | 4 ++-- refinerycms-blog.gemspec | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/changelog.md b/changelog.md index 2c30068..e4ad59b 100644 --- a/changelog.md +++ b/changelog.md @@ -1,9 +1,9 @@ -## 1.6.3 [UNRELEASED] +## 1.7.0 [UNRELEASED] * Bulgarian translations [mirosr](https://github.com/mirosr) * posts/tagged... params[:tag_name] is optional [joemsak](https://github.com/joemsak) * Bug Fix on Categorization relationship: destroying a post produced error because no primary key existed on join table [joemsak](https://github.com/joemsak) * Bug fix on archive listing, don't include draft posts [jgrevich](https://github.com/jgrevich) -* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.6.2...1.6.3) +* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.6.2...1.7.0) ## 1.6.2 [29 June 2011] * Custom teaser field to overwrite the automatic truncation of the body [wikyd](https://github.com/wikyd) @@ -76,4 +76,4 @@ * Rails 3 Support * Archives * Categories -* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.0...1.1) \ No newline at end of file +* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.0...1.1) diff --git a/db/migrate/1_create_blog_structure.rb b/db/migrate/1_create_blog_structure.rb index a93d2d4..197efb1 100644 --- a/db/migrate/1_create_blog_structure.rb +++ b/db/migrate/1_create_blog_structure.rb @@ -30,7 +30,7 @@ class CreateBlogStructure < ActiveRecord::Migration add_index :blog_categories, :id - create_table :blog_categories_blog_posts, :id => true do |t| + create_table :blog_categories_blog_posts, :id => false do |t| t.integer :blog_category_id t.integer :blog_post_id end diff --git a/lib/refinery/blog/version.rb b/lib/refinery/blog/version.rb index 3902da5..e571d18 100644 --- a/lib/refinery/blog/version.rb +++ b/lib/refinery/blog/version.rb @@ -2,8 +2,8 @@ module Refinery module Blog class Version @major = 1 - @minor = 6 - @tiny = 3 + @minor = 7 + @tiny = 0 class << self attr_reader :major, :minor, :tiny @@ -14,4 +14,4 @@ module Refinery end end end -end \ No newline at end of file +end diff --git a/readme.md b/readme.md index ab4abf9..704349c 100644 --- a/readme.md +++ b/readme.md @@ -18,7 +18,7 @@ Your Rails 3 application should not be called "blog" Open up your ``Gemfile`` and add at the bottom this line: - gem 'refinerycms-blog', '~> 1.6.3' + gem 'refinerycms-blog', '~> 1.7.0' Now, run ``bundle install`` @@ -28,4 +28,4 @@ Next, to install the blog plugin run: Finally migrate your database and you're done. - rake db:migrate \ No newline at end of file + rake db:migrate diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec index 49dcf14..59c0cc1 100644 --- a/refinerycms-blog.gemspec +++ b/refinerycms-blog.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = %q{refinerycms-blog} - s.version = %q{1.6.3} + s.version = %q{1.7.0} s.description = %q{A really straightforward open source Ruby on Rails blog engine designed for integration with RefineryCMS.} s.date = %q{2011-06-29} s.summary = %q{Ruby on Rails blogging engine for RefineryCMS.} From 8b4be5638b19f2a87fad08ff5803a1c3999d25ba Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Tue, 15 Nov 2011 11:34:07 +1300 Subject: [PATCH 07/28] Ensure we ignore future files in this branch. --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 9c1a2c5..b6983d3 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,7 @@ nbproject # Capybara Bug capybara-*html + +# Future stuff +Gemfile.lock +spec/dummy \ No newline at end of file From b1d05554d67d8ae563f27f08b53aedc160fba427 Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Mon, 5 Dec 2011 12:15:27 -0800 Subject: [PATCH 08/28] Regenerated gemspec for 1.7.0 --- refinerycms-blog.gemspec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec index 59c0cc1..873caf8 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{1.7.0} s.description = %q{A really straightforward open source Ruby on Rails blog engine designed for integration with RefineryCMS.} - s.date = %q{2011-06-29} + s.date = %q{2011-12-05} s.summary = %q{Ruby on Rails blogging engine for RefineryCMS.} s.email = %q{info@refinerycms.com} s.homepage = %q{http://refinerycms.com/blog} @@ -99,12 +99,14 @@ Gem::Specification.new do |s| changelog.md config config/locales + config/locales/bg.yml config/locales/cs.yml config/locales/de.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/it.yml + config/locales/ja.yml config/locales/nb.yml config/locales/nl.yml config/locales/pl.yml @@ -122,6 +124,7 @@ Gem::Specification.new do |s| db/migrate/5_add_cached_slugs.rb db/migrate/6_add_custom_url_field_to_blog_posts.rb db/migrate/7_add_custom_teaser_field_to_blog_posts.rb + db/migrate/8_add_primary_key_to_categorizations.rb db/seeds db/seeds/refinerycms_blog.rb features @@ -138,6 +141,8 @@ Gem::Specification.new do |s| features/support/step_definitions/category_steps.rb features/support/step_definitions/tags_steps.rb features/tags.feature + Gemfile + Gemfile.lock lib lib/gemspec.rb lib/generators @@ -197,6 +202,7 @@ Gem::Specification.new do |s| spec/models/blog_category_spec.rb spec/models/blog_comment_spec.rb spec/models/blog_post_spec.rb + todo.md ) end From 22f398c7249f7ea47708d65eba74596b52d7140c Mon Sep 17 00:00:00 2001 From: Joe Sak Date: Mon, 5 Dec 2011 14:19:06 -0600 Subject: [PATCH 09/28] Update changelog.md --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index e4ad59b..2e89ee6 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,4 @@ -## 1.7.0 [UNRELEASED] +## 1.7.0 [05 December 2011] * Bulgarian translations [mirosr](https://github.com/mirosr) * posts/tagged... params[:tag_name] is optional [joemsak](https://github.com/joemsak) * Bug Fix on Categorization relationship: destroying a post produced error because no primary key existed on join table [joemsak](https://github.com/joemsak) From 92ed22cce2e24838afcea1dfa8eafeb7aae26a58 Mon Sep 17 00:00:00 2001 From: Joe Sak Date: Mon, 5 Dec 2011 14:57:06 -0600 Subject: [PATCH 10/28] Add development_dependency "rake" for travis-ci --- refinerycms-blog.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec index 873caf8..5e9d527 100644 --- a/refinerycms-blog.gemspec +++ b/refinerycms-blog.gemspec @@ -17,6 +17,7 @@ Gem::Specification.new do |s| # Development dependencies s.add_development_dependency 'factory_girl' + s.add_development_dependency "rake" s.files = %w( app From 5ab4ef464b42b93678f1d844583294b5116f5e37 Mon Sep 17 00:00:00 2001 From: Joe Sak Date: Mon, 5 Dec 2011 15:20:30 -0600 Subject: [PATCH 11/28] Add travis yml for 1.9.2 ruby --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..cc599cc --- /dev/null +++ b/.travis.yml @@ -0,0 +1,2 @@ +rvm: + - 1.9.2 From 2ed293f74a272062e9f7c52a71b06ff9a0551d5b Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Mon, 5 Dec 2011 13:51:52 -0800 Subject: [PATCH 12/28] Only rails-3-1 for testing pls travis. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index cc599cc..8fd075d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,5 @@ rvm: - 1.9.2 +branches: + only: + - rails-3-1 \ No newline at end of file From 8ca270774fc6d2b4b993d35eda401e7be6c232f9 Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Mon, 5 Dec 2011 13:52:53 -0800 Subject: [PATCH 13/28] Revert "Add development_dependency "rake" for travis-ci" This reverts commit 92ed22cce2e24838afcea1dfa8eafeb7aae26a58. --- refinerycms-blog.gemspec | 1 - 1 file changed, 1 deletion(-) diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec index 5e9d527..873caf8 100644 --- a/refinerycms-blog.gemspec +++ b/refinerycms-blog.gemspec @@ -17,7 +17,6 @@ Gem::Specification.new do |s| # Development dependencies s.add_development_dependency 'factory_girl' - s.add_development_dependency "rake" s.files = %w( app From f3d32c1ac523e19ba76e3f1f0be23c0610c799b3 Mon Sep 17 00:00:00 2001 From: Nic Haynes Date: Thu, 8 Dec 2011 10:47:55 -0600 Subject: [PATCH 14/28] Rename posts partial to related posts --- app/views/blog/posts/_post.html.erb | 31 ---------------- app/views/blog/posts/show.html.erb | 37 +++++++++++++++++-- app/views/blog/shared/_related_posts.html.erb | 10 +++++ 3 files changed, 44 insertions(+), 34 deletions(-) delete mode 100644 app/views/blog/posts/_post.html.erb create mode 100644 app/views/blog/shared/_related_posts.html.erb diff --git a/app/views/blog/posts/_post.html.erb b/app/views/blog/posts/_post.html.erb deleted file mode 100644 index 12978d3..0000000 --- a/app/views/blog/posts/_post.html.erb +++ /dev/null @@ -1,31 +0,0 @@ -<% flash.each do |key, value| %> -
    - <%= value %> -
    -<% end %> -
    -
    -

    <%= @blog_post.title %>

    -
    - - <%= "#{t('by', :scope => 'blog.posts.show')} #{@blog_post.author.username}" if @blog_post.author.present? %>. - <% if (categories = @blog_post.categories).any? %> - - <% end %> -
    -
    - <%= @blog_post.body.html_safe %> - - <% if BlogPost::ShareThis.enabled? %> - - <% end %> -
    -<%= render :partial => '/shared/draft_page_message' unless @blog_post.nil? or @blog_post.live? -%> -<%= render 'nav' if next_or_previous?(@blog_post) %> diff --git a/app/views/blog/posts/show.html.erb b/app/views/blog/posts/show.html.erb index cc763a8..99e984c 100644 --- a/app/views/blog/posts/show.html.erb +++ b/app/views/blog/posts/show.html.erb @@ -1,6 +1,37 @@ <% content_for :body_content_left do %>
    - <%= render 'post' %> + <% flash.each do |key, value| %> +
    + <%= value %> +
    + <% end %> +
    +
    +

    <%= @blog_post.title %>

    +
    + + <%= "#{t('by', :scope => 'blog.posts.show')} #{@blog_post.author.username}" if @blog_post.author.present? %>. + <% if (categories = @blog_post.categories).any? %> + + <% end %> +
    +
    + <%= @blog_post.body.html_safe %> + + <% if BlogPost::ShareThis.enabled? %> + + <% end %> +
    + <%= render :partial => '/shared/draft_page_message' unless @blog_post.nil? or @blog_post.live? -%> + <%= render 'nav' if next_or_previous?(@blog_post) %> +
    <% if BlogPost.comments_allowed? %> @@ -50,9 +81,9 @@ <% content_for :body_content_right do %> <%= render :partial => "/blog/shared/categories" %> <%= render :partial => "/blog/shared/tags" %> - <%= render :partial => "/blog/shared/posts" %> + <%= render :partial => "/blog/shared/related_posts" %> <%= render :partial => "/blog/shared/rss_feed" %> - <%= blog_archive_list %> + <%= render :partial => "/blog/shared/archive_list" %> <% end %> <%= render :partial => "/shared/content_page", :locals => { :remove_automatic_sections => true } %> diff --git a/app/views/blog/shared/_related_posts.html.erb b/app/views/blog/shared/_related_posts.html.erb new file mode 100644 index 0000000..24a8199 --- /dev/null +++ b/app/views/blog/shared/_related_posts.html.erb @@ -0,0 +1,10 @@ +<% if @blog_posts.many? %> +

    <%= t('.other') %>

    +
      + <% @blog_posts.each do |blog_post| %> +
    • + <%= link_to blog_post.title, blog_post_url(blog_post) %> +
      • + <% end %> +
    +<% end %> \ No newline at end of file From 7d8588dfd2eac755cdabef6b39725dcb0af439d3 Mon Sep 17 00:00:00 2001 From: Nic Haynes Date: Thu, 8 Dec 2011 10:48:11 -0600 Subject: [PATCH 15/28] Refactor archive helper Now returns a list in an li instead of full markup --- app/helpers/blog_posts_helper.rb | 5 +---- app/views/blog/posts/archive.html.erb | 2 +- app/views/blog/posts/index.html.erb | 2 +- app/views/blog/posts/tagged.html.erb | 2 +- app/views/blog/shared/_archive_list.html.erb | 9 +++++++++ app/views/blog/shared/_posts.html.erb | 10 ---------- 6 files changed, 13 insertions(+), 17 deletions(-) create mode 100644 app/views/blog/shared/_archive_list.html.erb delete mode 100644 app/views/blog/shared/_posts.html.erb diff --git a/app/helpers/blog_posts_helper.rb b/app/helpers/blog_posts_helper.rb index 74eb521..92e2bae 100644 --- a/app/helpers/blog_posts_helper.rb +++ b/app/helpers/blog_posts_helper.rb @@ -2,9 +2,7 @@ module BlogPostsHelper def blog_archive_list posts = BlogPost.live.select('published_at').all_previous return nil if posts.blank? - html = '

    ' - html << t('archives', :scope => 'blog.shared') - html << '

    ' html.html_safe end diff --git a/app/views/blog/posts/archive.html.erb b/app/views/blog/posts/archive.html.erb index a2044e8..893e44d 100644 --- a/app/views/blog/posts/archive.html.erb +++ b/app/views/blog/posts/archive.html.erb @@ -13,7 +13,7 @@ <%= render :partial => "/blog/shared/categories" %> <%= render :partial => "/blog/shared/tags" %> <%= render :partial => "/blog/shared/rss_feed" %> - <%= blog_archive_list %> + <%= render :partial => "/blog/shared/archive_list" %> <% end %> <%= render :partial => "/shared/content_page" %> diff --git a/app/views/blog/posts/index.html.erb b/app/views/blog/posts/index.html.erb index 8c3801a..74bc2c7 100644 --- a/app/views/blog/posts/index.html.erb +++ b/app/views/blog/posts/index.html.erb @@ -17,7 +17,7 @@ <%= render :partial => "/blog/shared/categories" %> <%= render :partial => "/blog/shared/tags" %> <%= render :partial => "/blog/shared/rss_feed" %> - <%= blog_archive_list %> + <%= render :partial => "/blog/shared/archive_list" %> <% end %> <%= render :partial => "/shared/content_page" %> diff --git a/app/views/blog/posts/tagged.html.erb b/app/views/blog/posts/tagged.html.erb index 904150f..e7ee221 100644 --- a/app/views/blog/posts/tagged.html.erb +++ b/app/views/blog/posts/tagged.html.erb @@ -15,7 +15,7 @@ <%= render :partial => "/blog/shared/categories" %> <%= render :partial => "/blog/shared/tags" %> <%= render :partial => "/blog/shared/rss_feed" %> - <%= blog_archive_list %> + <%= render :partial => "/blog/shared/archive_list" %> <% end %> <%= render :partial => "/shared/content_page" %> diff --git a/app/views/blog/shared/_archive_list.html.erb b/app/views/blog/shared/_archive_list.html.erb new file mode 100644 index 0000000..ddd7b39 --- /dev/null +++ b/app/views/blog/shared/_archive_list.html.erb @@ -0,0 +1,9 @@ +<% + archive_posts = blog_archive_list +%> +<% if archive_posts.any? %> +

    <%= t('archives', :scope => 'blog.shared') %>

    +
      + <%= archive_posts %> +
    +<% end %> \ No newline at end of file diff --git a/app/views/blog/shared/_posts.html.erb b/app/views/blog/shared/_posts.html.erb deleted file mode 100644 index 24a8199..0000000 --- a/app/views/blog/shared/_posts.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -<% if @blog_posts.many? %> -

    <%= t('.other') %>

    -
      - <% @blog_posts.each do |blog_post| %> -
    • - <%= link_to blog_post.title, blog_post_url(blog_post) %> -
      • - <% end %> -
    -<% end %> \ No newline at end of file From 9840c56b4027fe1db7dd0c103c32aed2f5b886db Mon Sep 17 00:00:00 2001 From: Nic Haynes Date: Thu, 8 Dec 2011 11:01:08 -0600 Subject: [PATCH 16/28] Add draft UI label in index --- app/views/admin/blog/posts/_post.html.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/views/admin/blog/posts/_post.html.erb b/app/views/admin/blog/posts/_post.html.erb index a7f09e0..d7e5ba2 100644 --- a/app/views/admin/blog/posts/_post.html.erb +++ b/app/views/admin/blog/posts/_post.html.erb @@ -6,6 +6,9 @@ <%= " by #{post.author.username}" if post.author.present? %> + <% if post.draft? %> + Draft + <% end %> <%= link_to refinery_icon_tag("application_go.png"), blog_post_url(post), :title => t('.view_live_html'), From 57619d69936ff37d7d3bda3f7728005613ca8e0d Mon Sep 17 00:00:00 2001 From: Nic Haynes Date: Thu, 8 Dec 2011 11:35:57 -0600 Subject: [PATCH 17/28] Fix archive partial --- app/views/blog/shared/_archive_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/blog/shared/_archive_list.html.erb b/app/views/blog/shared/_archive_list.html.erb index ddd7b39..dd758da 100644 --- a/app/views/blog/shared/_archive_list.html.erb +++ b/app/views/blog/shared/_archive_list.html.erb @@ -1,7 +1,7 @@ <% archive_posts = blog_archive_list %> -<% if archive_posts.any? %> +<% if archive_posts.present? %>

    <%= t('archives', :scope => 'blog.shared') %>

      <%= archive_posts %> From 5c78c38e98acf0af8713d56ae65d905140e374be Mon Sep 17 00:00:00 2001 From: Nic Haynes Date: Thu, 8 Dec 2011 11:36:28 -0600 Subject: [PATCH 18/28] Move Draft checkbox under title for better usability --- app/views/admin/blog/posts/_form.html.erb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/views/admin/blog/posts/_form.html.erb b/app/views/admin/blog/posts/_form.html.erb index c891b63..3da6cd3 100644 --- a/app/views/admin/blog/posts/_form.html.erb +++ b/app/views/admin/blog/posts/_form.html.erb @@ -9,7 +9,12 @@ <%= f.label :title -%> <%= f.text_field :title, :class => 'larger widest' -%> - +
      +

      + <%= f.check_box :draft %> + <%= f.label :draft, t('.save_as_draft'), :class => "stripped" %> +

      +
        @@ -59,10 +64,7 @@ :id => 'toggle_advanced_options', :title => t('.toggle_advanced_options') %>

        - - <%= f.check_box :draft %> - <%= f.label :draft, t('.save_as_draft'), :class => "stripped" %> - +