refinerycms-blog 1.5.2 → 1.6.0

data/app/controllers/admin/blog/posts_controller.rb

@@ -11,6 +11,13 @@ class Admin::Blog::PostsController < Admin::BaseController
     })
   end
   
+  def tags
+    @tags = BlogPost.tag_counts_on(:tags).where(
+      ["tags.name LIKE ?", "%#{params[:term].to_s.downcase}%"]
+    ).map { |tag| {:id => tag.id, :value => tag.name}}
+    render :json => @tags.flatten
+  end
+  
   def create
     # if the position field exists, set this object as last object, given the conditions of this class.
     if BlogPost.column_names.include?("position")

data/app/controllers/blog/categories_controller.rb

@@ -2,6 +2,10 @@ class Blog::CategoriesController < BlogController
 
   def show
     @category = BlogCategory.find(params[:id])
+    @blog_posts = @category.posts.live.includes(:comments, :categories).paginate({
+      :page => params[:page],
+      :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
+    })
   end
 
 end

data/app/models/blog_category.rb

@@ -7,7 +7,10 @@ class BlogCategory < ActiveRecord::Base
 
   validates :title, :presence => true, :uniqueness => true
 
-  has_friendly_id :title, :use_slug => true
+  has_friendly_id :title, :use_slug => true,
+                  :default_locale => (::Refinery::I18n.default_frontend_locale rescue :en),
+                  :approximate_ascii => RefinerySetting.find_or_set(:approximate_ascii, false, :scoping => 'blog'),
+                  :strip_non_ascii => RefinerySetting.find_or_set(:strip_non_ascii, false, :scoping => 'blog')
 
   def post_count
     posts.select(&:live?).count

data/app/models/blog_post.rb

@@ -21,7 +21,12 @@ class BlogPost < ActiveRecord::Base
   validates :title, :presence => true, :uniqueness => true
   validates :body,  :presence => true
 
-  has_friendly_id :title, :use_slug => true
+  has_friendly_id :friendly_id_source, :use_slug => true,
+                  :default_locale => (::Refinery::I18n.default_frontend_locale rescue :en),
+                  :approximate_ascii => RefinerySetting.find_or_set(:approximate_ascii, false, :scoping => 'blog'),
+                  :strip_non_ascii => RefinerySetting.find_or_set(:strip_non_ascii, false, :scoping => 'blog')
+
+  attr_accessible :title, :body, :tag_list, :draft, :published_at, :browser_title, :meta_keywords, :meta_description, :user_id, :category_ids, :custom_url
 
   scope :by_archive, lambda { |archive_date|
     where(['published_at between ? and ?', archive_date.beginning_of_month, archive_date.end_of_month])
@@ -56,6 +61,10 @@ class BlogPost < ActiveRecord::Base
     }.compact
   end
 
+  def friendly_id_source
+    custom_url.present? ? custom_url : title
+  end
+
   class << self
     def next current_record
       self.send(:with_exclusive_scope) do

data/app/views/admin/blog/_submenu.html.erb

@@ -88,12 +88,5 @@
   </ul>
 
 </nav>
-<% if Refinery.version < '0.9.9' %>
-  <% content_for :head do %>
-    <%= stylesheet_link_tag('refinery/refinerycms-blog') %>
-    <%# this javascript is not even required in >= 0.9.9 because we made this sort of menu core. %>
-    <%= javascript_include_tag('refinery/refinerycms-blog') %>
-  <% end %>
-<% else %>
-  <% content_for :stylesheets, stylesheet_link_tag('refinery/refinerycms-blog')%>
-<% end %>
+
+<% content_for :stylesheets, stylesheet_link_tag('refinery/refinerycms-blog')%>

data/app/views/admin/blog/comments/show.html.erb

@@ -59,8 +59,5 @@
     </tr>
   </table>
 </div>
-<% if Refinery.version < '0.9.9' %>
-  <% content_for :head, stylesheet_link_tag('refinery/refinerycms-blog') %>
-<% else %>
-  <% content_for :stylesheets, stylesheet_link_tag('refinery/refinerycms-blog') %>
-<% end %>
+
+<% content_for :stylesheets, stylesheet_link_tag('refinery/refinerycms-blog') %>

data/app/views/admin/blog/posts/_form.html.erb

@@ -11,8 +11,33 @@
   </div>
 
   <div class='field'>
-    <%= f.label :body -%>
-    <%= f.text_area :body, :rows => 20, :class => 'wymeditor widest' -%>
+    <div id='page-tabs' class='clearfix ui-tabs ui-widget ui-widget-content ui-corner-all'>
+      <ul id='page_parts'>
+        <li class='ui-state-default'>
+          <%= link_to "Body", "#page_part_body" %>
+        </li>
+        <% Refinery::Blog.tabs.each_with_index do |tab, tab_index| %>
+          <li class='ui-state-default' id="custom_<%= tab.name %>_tab">
+            <%= link_to tab.name.titleize, "#custom_tab_#{tab_index}" %>
+          </li>
+        <% end %>
+      </ul>
+      
+      <div id='page_part_editors'>
+      
+        <% part_index = -1 %>
+          <%= render :partial => 'form_part',
+                     :locals => {
+                       :f => f,
+                       :part_index => (part_index += 1),
+                     } -%>
+        <% Refinery::Blog.tabs.each_with_index do |tab, tab_index| %>
+          <div class='page_part' id='<%= "custom_tab_#{tab_index}" %>'>
+            <%= render :partial => tab.partial, :locals => {:f => f} %>
+          </div>
+        <% end %>
+      </div>
+    </div>
   </div>
   
   <div class='field'>
@@ -48,6 +73,15 @@
       </ul>
       <h3><%= t('.published_at') %></h3>
       <%= f.datetime_select :published_at %>
+
+      <div class='field'>
+        <span class='label_with_help'>
+          <%= f.label :custom_url, t('.custom_url') %>
+          <%= refinery_help_tag t('.custom_url_help') %>
+        </span>
+        <%= f.text_field :custom_url, :class => "widest" %>
+      </div>
+
     </div>
     <div class='hemisquare right_side'>
       <%= render :partial => '/seo_meta/form', :locals => {:form => f} %>
@@ -61,12 +95,6 @@
               } %>
 <% end -%>
 
-<% if Refinery.version < '0.9.9' %>
-  <% content_for :head do %>
-    <%= render :partial => 'form.css' %>
-    <%= render :partial => 'form.js' %>
-  <% end %>
-<% else %>
-  <% content_for :stylesheets, render(:partial => 'form.css') -%>
-  <% content_for :javascripts, render(:partial => 'form.js') -%>
-<% end %>
+<% content_for :stylesheets, render(:partial => 'form.css') -%>
+<% content_for :javascripts, render(:partial => 'form.js') -%>
+<%= render 'shared/admin/autocomplete', :dom_id => '#blog_post_tag_list', :url => tags_admin_blog_posts_url %>

data/app/views/admin/blog/posts/_form.js.erb

@@ -1,13 +1,5 @@
 <script>
-  $(document).ready(function(){
-    $('#toggle_advanced_options').click(function(e){
-      e.preventDefault();
-
-      $('#more_options').animate({opacity: 'toggle', height: 'toggle'}, 250);
-
-      $('html,body').animate({
-        scrollTop: $('#toggle_advanced_options').parent().offset().top
-      }, 250);
-    });
-  });
+  (function($) {
+    $('#page-tabs').tabs();
+  })(jQuery);
 </script>

data/app/views/admin/blog/posts/_form_part.html.erb

@@ -0,0 +1,3 @@
+<div class='page_part' id='page_part_body'>
+  <%= f.text_area :body, :rows => 20, :class => 'wymeditor widest' -%>
+</div>

data/app/views/blog/categories/show.html.erb

@@ -1,10 +1,11 @@
 <% content_for :body_content_title, @category.title %>
 
 <% content_for :body_content_left do %>
-  <% if @category.posts.any? %>
-  <article id="blog_posts">
-    <%= render :partial => "/blog/shared/post", :collection => @category.posts %>
-  </article>
+  <% if @blog_posts.any? %>
+    <section id="blog_posts">
+      <%= render :partial => "/blog/shared/post", :collection => @blog_posts %>
+      <%= will_paginate @blog_posts %>
+    </section>
   <% else %>
     <p>
       <%= t('.no_posts') %>

data/app/views/blog/posts/_post.html.erb

@@ -6,10 +6,10 @@
 <article id="blog_post">
   <header>
     <h1><%= @blog_post.title %></h1>
-    <details>
+    <section class='details'>
       <time datetime="<%=l @blog_post.published_at.to_date, :format => :default %>" class='posted_at'>
-        <%= t('blog.shared.posts.created_at', :when => l(@blog_post.published_at.to_date, :format => :short)) %>.
-      </time><%= " by #{@blog_post.author.username}" if @blog_post.author.present? %>
+        <%= t('blog.shared.posts.created_at', :when => l(@blog_post.published_at.to_date, :format => :short)) %>
+      </time><%= "#{t('blog.posts.show.by')} #{@blog_post.author.username}" if @blog_post.author.present? %>.
       <% if (categories = @blog_post.categories).any? %>
         <aside class='filed_in'>
           <%= t('blog.posts.show.filed_in') %>
@@ -18,7 +18,7 @@
           <% end %>
         </aside>
       <% end %>
-    </details>
+    </section>
   </header>
   <%= @blog_post.body.html_safe %>
 

data/app/views/blog/posts/show.html.erb

@@ -57,24 +57,11 @@
 
 <%= render :partial => "/shared/content_page", :locals => { :remove_automatic_sections => true }  %>
 
-<% if Refinery.version < '0.9.9' %>
-  <% content_for :head_libraries, jquery_include_tags(:jquery_ui => false) %>
-  <% content_for :head do %>
-    <%= stylesheet_link_tag 'refinerycms-blog' %>
-    <%# enable AJAX'd post nav at your own risk until html5 history API implemented. %>
-    <%#= javascript_include_tag('refinerycms-blog') %>
-    <% if BlogPost::ShareThis.enabled? %>
-      <script src="http://w.sharethis.com/button/buttons.js"></script>
-      <script>stLight.options({publisher:'<%= BlogPost::ShareThis.key %>'});</script>
-    <% end %>
-  <% end %>
-<% else %>
-  <% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %>
-  <% content_for :before_javascript_libraries, jquery_include_tags(:jquery_ui => false) %>
-  <% content_for :javascripts do %>
-    <%# enable AJAX'd post nav at your own risk until html5 history API implemented. %>
-    <%#= javascript_include_tag('refinerycms-blog') %>
-    <script src="http://w.sharethis.com/button/buttons.js"></script>
-    <script>stLight.options({publisher:'<%= BlogPost::ShareThis.key %>'});</script>
-  <% end if BlogPost::ShareThis.enabled? %>
-<% end %>
+<% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %>
+<% content_for :before_javascript_libraries, jquery_include_tags(:jquery_ui => false) %>
+<% content_for :javascripts do %>
+  <%# enable AJAX'd post nav at your own risk until html5 history API implemented. %>
+  <%#= javascript_include_tag('refinerycms-blog') %>
+  <script src="http://w.sharethis.com/button/buttons.js"></script>
+  <script>stLight.options({publisher:'<%= BlogPost::ShareThis.key %>'});</script>
+<% end if BlogPost::ShareThis.enabled? %>

data/app/views/blog/posts/tagged.html.erb

@@ -1,4 +1,4 @@
-<% content_for :body_content_title, "Posts tagged &#8220;#{@tag_name.titleize}&#8221;".html_safe -%>
+<% content_for :body_content_title, "#{t('.posts_tagged')} &#8220;#{@tag_name.titleize}&#8221;".html_safe -%>
 
 <% content_for :body_content_left do %>
   <% if @blog_posts.any? %>

data/app/views/blog/shared/_post.html.erb

@@ -2,10 +2,10 @@
   <article class="blog_post" id="<%= dom_id(post) %>">
     <header>
       <h1><%= link_to post.title, blog_post_url(post) %></h1>
-      <details>
+      <section class='details'>
         <time datetime="<%=l post.published_at.to_date, :format => :default %>" class='posted_at'>
-          <%= t('blog.shared.posts.created_at', :when => l(post.published_at.to_date, :format => :short)) %>.
-        </time><%= " by #{post.author.username}" if post.author.present? %>
+          <%= t('blog.shared.posts.created_at', :when => l(post.published_at.to_date, :format => :short)) %>
+        </time><%= "#{t('blog.posts.show.by')} #{post.author.username}" if post.author.present? %>.
         <% if (categories = post.categories).any? %>
           <aside class='filed_in'>
             <%= t('filed_in', :scope => 'blog.posts.show') %>
@@ -18,7 +18,7 @@
             <%=raw tags.collect { |tag| link_to tag, tagged_posts_path(tag.parameterize) }.to_sentence %>
           </aside>
         <% end %>
-      </details>
+      </section>
     </header>
     <section class='clearfix'>
       <%= truncate(post.body,

data/app/views/blog/shared/_tags.html.erb

@@ -1,4 +1,4 @@
-<% unless @tags.nil? %>
+<% if @tags.any? %>
   <h2><%= t('.title') %></h2>
   <nav id='tags'>
     <% tag_cloud(@tags, %w(tag1 tag2 tag3 tag4)) do |tag, css_class| %>

data/app/views/shared/admin/_autocomplete.html.erb

@@ -0,0 +1,55 @@
+<% content_for :stylesheets, stylesheet_link_tag("ui-lightness/jquery-ui-1.8.13.custom.css") -%>
+
+<% content_for :javascripts do %>
+  <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js" %>
+  <script>
+    function split( val ) {
+   		return val.split( /,\s*/ );
+		}
+		function extractLast( term ) {
+			return split( term ).pop();
+		}
+		
+		
+    $(document).ready(function(){
+      page_options.init(false, '', '')
+
+      $('<%= dom_id %>')
+        .bind( "keydown", function( event ) {
+  				if ( event.keyCode === $.ui.keyCode.TAB &&
+  						$( this ).data( "autocomplete" ).menu.active ) {
+  					event.preventDefault()
+  				}
+  			})
+  			.autocomplete({
+  			  source: function( request, response ) {
+  					$.getJSON( "<%= url %>", {
+  						term: extractLast( request.term )
+  					}, response );
+  				},
+  				search: function() {
+  					// custom minLength
+  					var term = extractLast( this.value );
+  					if ( term.length < 2 ) {
+  						return false;
+  					}
+  				},
+  				focus: function() {
+  					// prevent value inserted on focus
+  					return false;
+  				},
+  				select: function( event, ui ) {
+  					var terms = split( this.value );
+  					// remove the current input
+  					terms.pop();
+  					// add the selected item
+  					terms.push( ui.item.value );
+  					// add placeholder to get the comma-and-space at the end
+  					terms.push( "" );
+  					this.value = terms.join( ", " );
+  					return false;
+  				}
+  			})
+    });
+  </script>
+<% end %>

data/changelog.md

@@ -1,3 +1,12 @@
+## 1.6 [20 June 2011]
+* Category bug fixes and cleanup [wikyd](https://github.com/wikyd)
+* Cleaned up deprecated code [ugisozols](https://github.com/ugisozols)
+* Performance boosts (cached slugs) [joemsak](https://github.com/joemsak)
+* More translations [cerebroso](https://github.com/cerebroso), [peresleguine](https://github.com/peresleguine)
+* 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)
+
 ## 1.5 [28 May 2011]
 
 * Added Gravatar support. [parndt](https://github.com/parndt)

data/config/locales/de.yml

@@ -101,6 +101,8 @@ de:
         singular: Kommentar
         none: Keine Kommentare
       archives: Archiv
+      tags:
+        title: Kategorien
     categories:
       show:
         no_posts: Es sind noch keine Artikel vorhanden.

data/config/locales/en.yml

@@ -38,6 +38,8 @@ en:
           toggle_advanced_options: Click to access meta tag settings and menu options
           save_as_draft: Save as Draft
           published_at: Publish Date
+          custom_url: Custom Url
+          custom_url_help: Generate the url for the blog post from this text instead of the title.
         index:
           no_items_yet: 'There are no Blog Posts yet. Click "%{create}" to add your first blog post.'
         uncategorized:
@@ -126,8 +128,28 @@ en:
         filed_in: Filed in
         tagged: Tagged
         submit: Send comment
+        name: Name
+        email: Email
+        message: Message
+        by: by
       tagged:
         no_blog_articles_yet: There are no blog articles posted yet. Stay tuned.
+        posts_tagged: Posts tagged
       archive:
         blog_archive_for: 'Blog Archive for %{date}'
-        no_blog_articles_posted: 'There are no blog articles posted for %{date}. Stay tuned.'
+        no_blog_articles_posted: 'There are no blog articles posted for %{date}. Stay tuned.'  
+  activerecord:
+    models:
+      blog_category: Category
+      blog_comment: Comment
+      blog_post: Blog post
+    attributes:
+      blog_category:
+        title: Title
+      blog_comment:
+        name: Name
+        email: Email
+        message: Message
+      blog_post:
+        title: Title
+        body: Body

data/config/locales/fr.yml

@@ -40,6 +40,8 @@ fr:
           published_at: Date de publication
         index:
           no_items_yet: 'Il n''y a aucun article pour l''instant. Cliquez sur "%{create}" pour ajouter votre premier article.'
+        uncategorized:
+          no_items_yet: 'Il n''y a aucun article non catégorisé.'
         post:
           view_live_html: 'Voir cet article sur le site<br/><em>(Ouvre une nouvelle fenêtre)</em>'
           edit: Modifier cet article
@@ -67,6 +69,7 @@ fr:
           title: Articles
           manage: Gérer les articles
           new: Créer un nouvel article
+          uncategorized: Aricles non catégorisés
         settings:
           title: Paramêtres
           moderation: Modération
@@ -88,16 +91,19 @@ fr:
       categories:
         title: Catégories
       rss_feed:
-        title: RSS Feed
+        title: Flux RSS
         subscribe: Souscrire
       posts:
         other: Autres articles
         created_at: 'Écrit le %{when}'
         read_more: Lire la suite
+        by: 'par'
       comments:
         singular: commentaire
         none: aucun commentaire
       archives: Archives
+      tags:
+        title: "Mots clés"
     categories:
       show:
         no_posts: 'Il n''y a aucun article pour cette catégorie.'
@@ -119,7 +125,30 @@ fr:
           add: Ajouter un commentaire
         other: Autres articles
         filed_in: Classé dans
+        tagged: Taggé
         submit: Envoyer le commentaire
+        name: Nom
+        email: Email
+        message: Message
+        by: par
+      tagged:
+        no_blog_articles_yet: "Il n'y a aucun article pour l'instant. Restez en alerte."
+        posts_tagged: Articles taggés
       archive:
         blog_archive_for: 'Archive du blog pour le %{date}'
-        no_blog_articles_posted: "Il n'y a aucun article pour la date du %{date}. Restez à l'écoute."
+        no_blog_articles_posted: "Il n'y a aucun article pour la date du %{date}. Restez en alerte."
+  activerecord:
+    models:
+      blog_category: Categorie
+      blog_comment: Commentaire
+      blog_post: Article
+    attributes:
+      blog_category:
+        title: Titre
+      blog_comment:
+        name: Nom
+        email: Email
+        message: Message
+      blog_post:
+        title: Titre
+        body: Corps