refinerycms-blog 1.1 → 1.2

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

@@ -1,4 +1,4 @@
-<% form_for [:admin, @blog_category] do |f| -%>
+<%= form_for [:admin, @blog_category] do |f| -%>
   <%= render :partial => "/shared/admin/error_messages",
              :locals => {
                :object => f.object,

data/app/views/admin/blog/categories/index.html.erb

@@ -10,15 +10,11 @@
     <% end %>
   <% else %>
     <% if @blog_categories.any? %>
-      <%= will_paginate @blog_categories,
-                        :previous_label => '&laquo;',
-                        :next_label => '&raquo;' %>
+      <%= will_paginate @blog_categories %>
 
       <%= render :partial => "sortable_list" %>
 
-      <%= will_paginate @blog_categories,
-                        :previous_label => '&laquo;',
-                        :next_label => '&raquo;' %>
+      <%= will_paginate @blog_categories %>
     <% else %>
       <p>
         <strong>

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

@@ -1,12 +1,12 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= "comment-#{comment.to_param}" -%>">
   <span class='title'>
-    <%=h comment.name %>
+    <%= comment.name %>
     <span class="preview"> - <%= truncate(comment.message, :length => 75) %></span>
   </span>
   <span class='actions'>
     <%= link_to refinery_icon_tag("application_go.png"),
                 blog_post_url(comment.post, :anchor => "comment-#{comment.to_param}"),
-                :title => t('.view_live'),
+                :title => t('.view_live_html'),
                 :target => "_blank" unless comment.unmoderated? %>
     <%= link_to refinery_icon_tag('zoom.png'), admin_blog_comment_path(comment),
                 :title => t('.read') %>

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

@@ -1,4 +1,4 @@
-<% form_for [:admin, @blog_post] do |f| -%>
+<%= form_for [:admin, @blog_post] do |f| -%>
   <%= render :partial => "/shared/admin/error_messages",
              :locals => {
                :object => f.object,

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

@@ -1,18 +1,18 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(post) -%>">
   <span class='title'>
-    <%=h post.title %>
-    <span class="preview">&nbsp;</span>
+    <%= post.title %>
+    <span class="preview"><%= post.published_at.try(:strftime, '%b %d, %Y') || 'draft' %><%= " by #{post.author.username}" if post.author.present? %></span>
   </span>
   <span class='actions'>
     <%= link_to refinery_icon_tag("application_go.png"), blog_post_url(post),
-        :title => t('.view_live'),
+        :title => t('.view_live_html'),
         :target => "_blank" %>
     <%= link_to refinery_icon_tag("application_edit.png"), edit_admin_blog_post_path(post),
          :title => t('.edit') %>
     <%= link_to refinery_icon_tag("delete.png"), admin_blog_post_path(post),
         :class => "cancel confirm-delete",
         :title => t('.delete'),
-        :'data-method' => 'delete',
-        :'data-confirm' => t('shared.admin.delete.message', :title => post.title) %>
+        :method => :delete,
+        :confirm => t('shared.admin.delete.message', :title => post.title) %>
   </span>
 </li>

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

@@ -10,15 +10,11 @@
     <% end %>
   <% else %>
     <% if @blog_posts.any? %>
-      <%= will_paginate @blog_posts,
-                        :previous_label => '&laquo;',
-                        :next_label => '&raquo;' %>
+      <%= will_paginate @blog_posts %>
 
       <%= render :partial => "sortable_list" %>
 
-      <%= will_paginate @blog_posts,
-                        :previous_label => '&laquo;',
-                        :next_label => '&raquo;' %>
+      <%= will_paginate @blog_posts %>
     <% else %>
       <p>
         <strong>

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

@@ -0,0 +1,26 @@
+<%= render :partial => '/admin/blog/submenu' %>
+<div id='records'>
+  <% if searching? %>
+    <h2><%= t('shared.admin.search.results_for', :query => params[:search]) %></h2>
+    <% if @blog_posts.any? %>
+      <%= render :partial => "blog_posts",
+                 :collection => @blog_posts %>
+    <% else %>
+      <p><%= t('admin.search_no_results') %></p>
+    <% end %>
+  <% else %>
+    <% if @blog_posts.any? %>
+      <%= will_paginate @blog_posts %>
+
+      <%= render :partial => "sortable_list" %>
+
+      <%= will_paginate @blog_posts %>
+    <% else %>
+      <p>
+        <strong>
+          <%= t('.no_items_yet', :create => t('admin.blog.submenu.posts.new')) %>
+        </strong>
+      </p>
+    <% end %>
+  <% end %>
+</div>

data/app/views/admin/blog/settings/notification_recipients.html.erb

@@ -1,4 +1,4 @@
-<% form_tag do %>
+<%= form_tag do %>
 
   <div class='field'>
     <span class='label_with_help'>

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

@@ -1,13 +1,11 @@
-<% if next_or_previous?(@blog_post) -%>
-  <nav id="next_prev_article">
-    <% if @blog_post.next.present? -%>
-      <%= link_to raw(truncate(@blog_post.next.title) + "&nbsp;&#187;"), @blog_post.next, :class => 'next' %>
-    <% end -%>
+<nav id="next_prev_article">
+  <% if @blog_post.next.present? -%>
+    <%= link_to (truncate(@blog_post.next.title) + " &#187;").html_safe, @blog_post.next, :class => 'next' %>
+  <% end -%>
 
-    <%= link_to 'Blog Home', blog_root_path, :class => 'home' %>
+  <%= link_to t('blog.posts.show.blog_home'), blog_root_path, :class => 'home' %>
 
-    <% if @blog_post.prev.present? -%>
-      <%= link_to "&#171;&nbsp;".html_safe + truncate(@blog_post.prev.title), @blog_post.prev, :class => 'prev' %>
-    <% end -%>
-  </nav><!-- /next_prev_article -->
-<% end -%>
+  <% if @blog_post.prev.present? -%>
+    <%= link_to ("&#171; " + truncate(@blog_post.prev.title)).html_safe, @blog_post.prev, :class => 'prev' %>
+  <% end -%>
+</nav><!-- /next_prev_article -->

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

@@ -7,12 +7,12 @@
   <header>
     <h1><%= @blog_post.title %></h1>
     <details>
-      <time datetime="<%= @blog_post.published_at.strftime('%Y-%m-%d') %>" class='posted_at'>
-        <%= t('blog.shared.posts.created_at', :when => @blog_post.published_at.strftime('%d %B %Y')) %>.
-      </time>
+      <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? %>
       <% if (categories = @blog_post.categories).any? %>
         <aside class='filed_in'>
-          <%= t('.filed_in') %>
+          <%= t('blog.posts.show.filed_in') %>
           <% categories.each_with_index do |category, index| %>
               <%= link_to category.title, blog_category_url(category) -%><%= ',' if index < ((categories.length) - 1) %>
           <% end %>
@@ -28,7 +28,5 @@
 </article>
 <%= render :partial => '/shared/draft_page_message' unless @blog_post.nil? or @blog_post.live? -%>
 <% if next_or_previous?(@blog_post) -%>
-  <nav id="next_prev_article">
-    <%= render 'nav' %>
-  </nav><!-- /next_prev_article -->
+  <%= render 'nav' %>
 <% end -%>

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

@@ -1,11 +1,13 @@
 <% content_for :body_content_left do %>
   <%= @page[Page.default_parts.first.to_sym] %>
-  <h1>Blog Archive for <%= @archive_date.strftime('%B %Y') %></h1>
-  <section id="blog_posts">
-    <%= render :partial => "/blog/shared/post", :collection => @blog_posts %>
-  </section>
-  <%= "There are no blog articles posted for #{@archive_date.strftime('%B %Y')}. Stay tuned." unless @blog_posts.any? %>
-  <%# TODO: Add locale logic here - hubble is a n00b at that %>
+  <h1><%= t('.blog_archive_for', :date => @archive_date.strftime('%B %Y')) %></h1>
+  <% if @blog_posts.any? %>
+    <section id="blog_posts">
+      <%= render :partial => "/blog/shared/post", :collection => @blog_posts %>
+    </section>
+  <% else %>
+    <p><%= t('.no_blog_articles_posted', :date => @archive_date.strftime('%B %Y')) %></p>
+  <% end %>
 <% end %>
 
 <% content_for :body_content_right do %>

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

@@ -1,15 +1,18 @@
 <% content_for :body_content_left do %>
-  <%= @page[Page.default_parts.first.to_sym] %>
+  <%=raw @page[Page.default_parts.first.to_sym] if Page.default_parts.any? %>
 
-  <section id="blog_posts">
-    <%= render :partial => "/blog/shared/post", :collection => @blog_posts %>
-  </section>
-  <%= "<p>There are no blog articles posted yet. Stay tuned.</p>".html_safe unless @blog_posts.any? %>
-  <%# TODO: Add locale logic here - hubble is a n00b at that %>
+  <% 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_blog_articles_yet') %></p>
+  <% end %>
 <% end %>
 
 <% content_for :body_content_right do %>
-  <%= @page[Page.default_parts.second.to_sym] %>
+  <%=raw @page[Page.default_parts.second.to_sym] if Page.default_parts.many? %>
 
   <%= render :partial => "/blog/shared/categories" %>
   <%= render :partial => "/blog/shared/rss_feed" %>

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

@@ -6,7 +6,6 @@
   <% if BlogPost.comments_allowed? %>
     <aside id="comments">
       <h2><%= t('.comments.title') %></h2>
-
       <% if (comments = @blog_post.comments.approved).any? %>
         <%= render :partial => "comment", :collection => comments %>
       <% else %>
@@ -22,7 +21,7 @@
       <% end %>
 
       <h2><%= t('.comments.add') %></h2>
-      <% form_for [:blog_post, @blog_comment] do |f| %>
+      <%= form_for [:blog_post, @blog_comment] do |f| %>
         <%= render :partial => "/shared/admin/error_messages",
                    :locals => {
                      :object => f.object,
@@ -61,7 +60,8 @@
   <% content_for :head_libraries, jquery_include_tags(:jquery_ui => false) %>
   <% content_for :head do %>
     <%= stylesheet_link_tag 'refinerycms-blog' %>
-    <%= javascript_include_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>
@@ -71,7 +71,8 @@
   <% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %>
   <% content_for :before_javascript_libraries, jquery_include_tags(:jquery_ui => false) %>
   <% content_for :javascripts do %>
-    <%= javascript_include_tag 'refinerycms-blog' %>
+    <%# 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/shared/_categories.html.erb

@@ -1,8 +1,10 @@
-<h2><%= t('.title') %></h2>
-<ul id='categories'>
-  <% @blog_categories.each do |category| %>
-    <li<%= " class='selected'" if @category.present? and @category.id == category.id %>>
-      <%= link_to "#{category.title} (#{category.post_count})", blog_category_url(category) %>
-    </li>
-  <% end %>
-</ul>
+<% if @blog_categories.any? %>
+  <h2><%= t('.title') %></h2>
+  <ul id='categories'>
+    <% @blog_categories.each do |category| %>
+      <li<%= " class='selected'" if @category.present? and @category.id == category.id %>>
+        <%= link_to "#{category.title} (#{category.post_count})", blog_category_url(category) %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>

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

@@ -3,9 +3,9 @@
     <header>
       <h1><%= link_to post.title, blog_post_url(post) %></h1>
       <details>
-        <time datetime="<%= post.published_at.strftime('%Y-%m-%d') %>" class='posted_at'>
-          <%= t('blog.shared.posts.created_at', :when => post.published_at.strftime('%d %B %Y')) %>.
-        </time>
+        <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? %>
         <% if (categories = post.categories).any? %>
           <aside class='filed_in'>
             <%= t('filed_in', :scope => 'blog.posts.show') %>
@@ -26,10 +26,12 @@
         <%= link_to t('blog.shared.posts.read_more'), blog_post_url(post) %>
 
         <aside class='comment_count'>
-          <% if post.comments.any? %>
-             (<%= pluralize(post.comments.approved.count, t('blog.shared.comments.singular')) %>)
-          <% else %>
-            (<%= t('blog.shared.comments.none') %>)
+          <% if BlogPost.comments_allowed? %>
+            <% if post.comments.any? %>
+               (<%= pluralize(post.comments.approved.count, t('blog.shared.comments.singular')) %>)
+            <% else %>
+                  (<%= t('blog.shared.comments.none') %>)
+            <% end %>
           <% end %>
         </aside>
       </p>

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

@@ -1,8 +1,10 @@
-<h2><%= t('.other') %></h2>
-<ul id="blog_posts">
-  <% @blog_posts.each do |blog_post| %>
-    <li class='clearfix'>
-      <%= link_to blog_post.title, blog_post_url(blog_post) %>
-    </li>
-  <% end %>
-</ul>
+<% if @blog_posts.many? %>
+  <h2><%= t('.other') %></h2>
+  <ul id="blog_posts">
+    <% @blog_posts.each do |blog_post| %>
+      <li class='clearfix'>
+        <%= link_to blog_post.title, blog_post_url(blog_post) %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>

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

@@ -1,2 +1,2 @@
 <h2><%= t('.title') %></h2>
-<%= link_to "Subscribe", blog_rss_feed_url, :id => "rss_feed_subscribe"%>
+<%= link_to t('.subscribe'), blog_rss_feed_url, :id => "rss_feed_subscribe"%>

data/changelog.md

@@ -0,0 +1,24 @@
+## 1.2 [01 March 2011]
+
+* Posts can be authored [joemsak](https://github.com/joemsak)
+* Front-end pagination [joemsak](https://github.com/joemsak)
+* Archives start grouping by year after 2 years [joemsak](https://github.com/joemsak)
+* Removed ajax blog post navigation [joemsak](https://github.com/joemsak)
+* Administrate uncategorized posts [joemsak](https://github.com/joemsak)
+* Categories in has_many :through relationship [joemsak](https://github.com/joemsak)
+* General bug fixing & test coverage [parndt](https://github.com/parndt) [joemsak](https://github.com/joemsak)
+* Russian translation [iband](https://github.com/iband)
+* French translation [AdrienGiboire](https://github.com/AdrienGiboire)
+* Polish translation [murbanski](https://github.com/murbanski)
+* German translation [gern](https://github.com/gern)
+* Spanish translation help [xavib](https://github.com/xavib)
+* Rails 3 cleanup & optimization [ugisozols](https://github.com/ugisozols)
+* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.1...1.2)
+
+
+## 1.1 [02 December 2010]
+
+* Rails 3 Support
+* Archives
+* Categories
+* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.0...1.1)

data/config/locales/de.yml

@@ -0,0 +1,128 @@
+de:
+  plugins:
+    refinerycms_blog:
+      title: Blog
+  admin:
+    blog:
+      categories:
+        category:
+          edit: Diese Kategorie bearbeiten 
+          delete: Diese Kategorie dauerhaft entfernen 
+        index:
+          no_items_yet: 'Es sind noch keine Kategorien vorhanden. Klicken Sie auf "%{create}", um Ihre erste Kategorie hinzuzufügen.'
+      comments:
+        approved: 'Der Kommentar von "%{author}" wurde genehmigt.'
+        comment:
+          view_live: Diesen Kommentar live betrachten <br/><em>(öffnet sich in einem neuen Fenster)</em>
+          read: Kommentar lesen 
+          reject: Kommentar ablehnen 
+          approve: Kommentar genehmigen 
+        rejected: 'Der Kommentar von "%{author}" wurde abgelehnt.'
+        index:
+          no_items_yet: 'Es sind keine %{type}en Kommentare vorhanden.'
+        show:
+          comment: Kommentar 
+          blog_post: Artikel 
+          from: Verfasst von 
+          date: Verfasst am 
+          message: Kommentar 
+          details: Details
+          age: Alter
+          actions: Aktionen
+          back: Zurück zu allen Kommentaren 
+          reject: Kommentar ablehnen
+          approve: Kommentar genehmigen 
+      posts:
+        form:
+          advanced_options: Erweiterte Optionen 
+          toggle_advanced_options: Klicken, um auf Meta-Tag-Einstellungen und Menüoptionen zuzugreifen
+          save_as_draft: Als Entwurf speichern
+          published_at: Veröffentlichungsdatum 
+        index:
+          no_items_yet: 'Es sind noch keine Artikel vorhanden. Klicken Sie auf "%{create}", um Ihren ersten Artikel hinzuzufügen.'
+        uncategorized:
+          no_items_yet: 'Es sind keine unkategorisierten Artikel vorhanden.'
+        post:
+          view_live: Diesen Artikel live betrachten <br/><em>(öffnet sich in einem neuen Fenster)</em>
+          edit: Diesen Artikel bearbeiten
+          delete: Diesen Artikel dauerhaft entfernen
+      settings:
+        notification_recipients:
+          value: Sende Benachrichtigungen an 
+          explanation: 'Jedes Mal, wenn jemand einen Artikel kommentiert, sendet Refinery eine E-Mail Benachrichtigung aus, um über den neuen Kommentar zu informieren.'
+          hint: 'Refinery sendet eine E-Mail Benachrichtigung an Sie, wenn ein neuer Kommentar hinzugefügt wurde.'
+          example: "Geben Sie Ihre E-Mail-Adresse(n) wie folgt ein: jack@work.com, jill@office.com"
+          updated: 'Empfänger für Benachrichtigungen wurden auf "%{recipients}" gesetzt'
+      submenu:
+        categories:
+          title: Kategorien
+          manage: Verwalten
+          new: Neue Kategorie anlegen
+        comments:
+          title: Kommentare
+          title_with_count: 'Kommentare (%{new_count} neu)'
+          new: Neu
+          unmoderated: Neu
+          approved: Genehmigt
+          rejected: Abgelehnt
+        posts:
+          title: Artikel
+          manage: Artikel verwalten 
+          new: Neuen Artikel anlegen 
+          uncategorized: Unkategorisierte Artikel
+        settings:
+          title: Einstellungen 
+          moderation: Moderation
+          update_notified: Empfänger für Benachrichtigungen bearbeiten 
+          comments: Kommentare 
+  blog:
+    comment_mailer:
+      notification:
+        greeting: Hallo 
+        you_recieved_new_comment: Auf Ihrer Website wurde soeben ein neuer Kommentar hinzugefügt.
+        comment_starts: --- Kommentar beginnt ---
+        comment_ends: --- Kommentar endet ---
+        from: Von 
+        email: E-Mail
+        message: Nachricht
+        closing_line: Mit besten Grüßen
+        ps: P.S. Alle Kommentare sind im "Blog" Abschnitt von Refinery - im Untermenü "Kommentare" - gespeichert, falls Sie diese später dort lesen möchten.
+    shared:
+      categories:
+        title: Kategorien
+      rss_feed:
+        title: RSS Feed
+        subscribe: Abonnieren
+      posts:
+        other: Andere Artikel 
+        created_at: 'Verfasst am %{when}'
+        read_more: Mehr lesen 
+      comments:
+        singular: Kommentar 
+        none: Keine Kommentare 
+      archives: Archiv
+    categories:
+      show:
+        no_posts: Es sind noch keine Artikel vorhanden.
+    posts:
+      post:
+        filed_in: Gespeichert unter
+      comment: Kommentar 
+      comments:
+        by: 'Verfasst von %{who}'
+        time_ago: 'vor %{time}'
+        thank_you: 'Danke für den Kommentar.'
+        thank_you_moderated: 'Danke für den Kommentar. Die Nachricht wurde in die Warteschlange der Moderation gestellt und erscheint in Kürze.'
+      index:
+        no_blog_articles_yet: Es wurden noch keine Artikel verfasst.
+      show:
+        blog_home: Blog Startseite 
+        comments:
+          title: Kommentare 
+          add: Neuen Kommentar hinzufügen
+        other: Andere Artikel 
+        filed_in: Gespeichert unter 
+        submit: Kommentar senden 
+      archive:
+        blog_archive_for: Blog Archiv für %{date}
+        no_blog_articles_posted: Für %{date} wurden keine Artikel verfasst.