activeadmin-blog 0.4.1 → 0.4.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activeadmin-blog (0.4.1)
+    activeadmin-blog (0.4.2)
       activeadmin-mongoid
       activeadmin-mongoid-reorder
       activeadmin-settings
@@ -198,7 +198,7 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     stringex (1.4.0)
     subexec (0.2.2)
-    thor (0.15.4)
+    thor (0.16.0)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot

data/app/models/activeadmin_blog/blog_post.rb

@@ -27,8 +27,7 @@ class ActiveadminBlog::BlogPost
   has_and_belongs_to_many :categories, :class_name => "ActiveadminBlog::BlogCategory"
 
   # Scopes
-  default_scope order_by(:date => :desc)
-  scope         :ideas,     where(published: false)
+  default_scope order_by(:published => :asc).order_by({:date => :desc})
   scope         :published, where(published: true)
 
   # Helpers

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

@@ -1,26 +1,18 @@
 <fieldset class="inputs"><legend><span>Details</span></legend><ol>
   <%= f.input :name, :required => true %>
-  <%= f.input :permalink %>
+  <% if not f.object.new? %>
+    <%= f.input :permalink %>
+  <% end %>
 </ol></fieldset>
 
 <fieldset class="buttons">
 <ol>
   <li class="commit button">
-    <input class="update" id="proposal_submit" name="commit" type="submit"
+    <input class="update" name="commit" type="submit"
      value="<% if f.object.new? %>Create<% else %>Update<% end %> Category">
   </li>
   <li class="cancel">
     <a href="<%= admin_posts_path %>">Cancel</a>
   </li>
-<!--  
-  <% if not f.object.new? %>
-  <li style="float:right;">
-    <%= link_to "Delete Category", resource_path(f.object),
-          :method => :delete,
-          :confirm => "Are you sure, you want to delte this category?",
-          :class => "delete button" %>
-  </li>
-  <% end %>
--->
 </ol>
 </fieldset>

data/app/views/admin/categories/_show.html.erb

@@ -0,0 +1,5 @@
+<% if category.blog_posts.size > 0 %>
+  <%= render :partial => "admin/posts/table", :locals => {:posts => category.blog_posts} %>
+<% else %>
+  <p>No posts here yet.</p>
+<% end %>

data/app/views/admin/posts/_categories.html.erb

@@ -1,3 +1,5 @@
+<%= link_to "All Posts", all_admin_posts_path %>
+
 <% if categories.size > 0 %>
 <ul id="blog_categories_list">
   <% categories.each do |c| %>

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

@@ -0,0 +1,57 @@
+<fieldset class="inputs"><legend><span>Title</span></legend><ol>
+  <%= f.input :title, :required => true %>
+</ol></fieldset>
+
+<fieldset class="inputs<% if f.object.new? %> collapsed<% end %>">
+<legend>
+  <span>Details
+    <a class="collapse-button-hide" href="#" title="Hide details">Hide</a>
+    <a class="collapse-button-show" href="#" title="Show details">Show</a>
+  </span>
+</legend>
+<ol>
+  <%= f.input :featured_image, :hint => f.object.has_featured_image? ? image_tag(f.object.featured_image.thumb.url, :size => "118x100") : "" %>
+
+  <% if f.object.has_featured_image? %>
+    <%= f.input :remove_featured_image, :as => :boolean %>
+  <% end %>
+
+  <% if not f.object.new? %>
+    <%= f.input :permalink %>
+  <% end %>
+
+  <%= f.input :date,  :input_html => { :class => "datepicker", :placeholder => "Click field to pick date" } %>
+
+  <% categories = ActiveadminBlog::BlogCategory.all
+     if categories.size > 0 %>
+    
+    <%= f.input :categories,  :as             => :select,
+                              :label          => "Published in",
+                              :input_html     => { :multiple => true, :class => "select2" },
+                              :collection     => categories,
+                              :include_blank  => false,
+                              :hint           => "Select one or several categories" %>
+  <% end %>
+
+  <%= f.input :tags,  :hint       => "Tags separted by comma",
+                      :input_html => { "data-url"  => "/admin/posts/tags" } %>
+
+  <%= f.input :published, :as => :boolean, :label => "Published" %>
+
+</ol></fieldset>
+
+<fieldset class="inputs"><legend><span>Content</span></legend><ol>
+  <%= f.input :content, :as => :text, :input_html => { :class => "redactor" }%>
+</ol></fieldset>
+
+<fieldset class="buttons">
+<ol>
+  <li class="commit button">
+    <input class="update" name="commit" type="submit"
+     value="<% if f.object.new? %>Create<% else %>Update<% end %> Post">
+  </li>
+  <li class="cancel">
+    <a href="<%= admin_posts_path %>">Cancel</a>
+  </li>
+</ol>
+</fieldset>

data/app/views/admin/posts/_table.html.erb

@@ -0,0 +1,51 @@
+<table border="0" cellspacing="0" cellpadding="0" id="posts" class="index_table">
+  <thead>
+    <tr>
+      <th class=""></th>
+      <th class="">Post</th>
+      <th class="">Status</th>
+      <th class=""></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% posts.each do |p| %>
+      <tr>
+        <td class="featured-image">
+          <% if p.featured_image.thumb.url.nil? %>
+            <%= image_tag("http://placehold.it/118x100&text=NO+IMAGE", :alt=>p.title, :size=>"118x100") %>
+          <% else %>
+            <%= image_tag(p.featured_image.thumb.url, :alt=>p.title, :size=>"118x100") %>
+          <% end %>
+        </td>
+
+        <td class="post-details">
+          <p>
+            <strong><%= p.title %></strong>
+            <br/>
+            <em><%= truncate(p.excerpt, :length => 90) %></em>
+          </p>
+          
+          <% if not p.tags.empty? %>
+            Tags: <em><%= p.tags.gsub(',', ', ') %></em>
+            <br/>
+          <% end %>
+          
+          <% if p.categories.size > 0 %>
+            Published in: <%= p.categories.collect{ |c| link_to(c.name, admin_category_path(c)) }.join(", ").html_safe %>
+          <% end %>
+        </td>
+
+        <td class="post-status">
+          <%= p.date.to_s.gsub('-', '/') %>
+          <br/>
+          <i><%= p.published ? 'Published' : 'Not Published' %></i>
+        </td>
+        
+        <td class="actions">
+          <%= link_to("Edit",   edit_admin_post_path(p), :class => "member_link") %>
+          <%= link_to("Delete", admin_post_path(p),      :class => "member_link", :method => :delete, :confirm => "Are you sure?") %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/admin/posts/all.html.erb

@@ -0,0 +1,5 @@
+<% if @posts.size > 0 %>
+  <%= render :partial => "table", :locals => {:posts => @posts} %>
+<% else %>
+  <p>No posts here yet.</p>
+<% end %>

data/lib/activeadmin-blog/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminBlog
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/generators/activeadmin_blog/templates/admin/blog_categories.rb

@@ -26,50 +26,7 @@ ActiveAdmin.register ActiveadminBlog::BlogCategory, :as => "Category" do
   end
 
   show :title => :name do
-    ol :id => "category_posts_page" do
-      li :class => "links" do
-        link_to "All Posts", admin_posts_path, :class => "all-posts-button"
-      end
-      li do
-        if category.blog_posts.size > 0
-          table_for(category.blog_posts, {:class => "index_table category_posts"}) do |t|
-    
-            t.column("") do |p| # Blog post featured image thumbnail
-              url = p.featured_image.thumb.url
-              if url.nil?
-                url = "http://placehold.it/118x100&text=NO+IMAGE"
-              end
-              image_tag(url, :alt => p.title, :size=>"118x100")
-            end
-            
-            t.column("Title") do |p|
-              html = "<p><strong>#{p.title}</strong><br/><em>#{truncate(p.excerpt, :length => 90)}</em></p>"
-              
-              if not p.tags.empty?
-                html << "Tags: <em>" + p.tags.gsub(',', ', ') + "</em><br/>"
-              end
-              
-              if p.categories.size > 0
-                html << "Published in: " + p.categories.collect{|c| link_to(c.name, admin_category_path(c))}.join(", ")
-              end
-              html.html_safe
-            end
-            
-            t.column("Status") do |p|
-              """#{p.date.to_s.gsub('-', '/')}<br/>
-                 <i>#{p.published ? 'Published' : 'Not Finished'}</i>""".html_safe
-            end
-    
-            t.column "" do |p|
-              link_to("Edit",   edit_admin_post_path(p), :class => "member_link") +
-              link_to("Delete", admin_post_path(p),      :class => "member_link", :method => :delete, :confirm => "Are you sure?")
-            end
-          end
-        else
-          p "No posts here yet."
-        end
-      end
-    end
+    render :partial => "show", :locals => { :category => category }
   end
 
   sidebar :categories, :only => :show do

data/lib/generators/activeadmin_blog/templates/admin/blog_posts.rb

@@ -3,99 +3,29 @@ ActiveAdmin.register ActiveadminBlog::BlogPost, :as => "Post" do
 
   actions :all, :except => [:show]
 
-  # Scopes
-  scope :published, :default => true
-  scope :ideas
-
   controller do
-    defaults :finder => :find_by_permalink
-  end
-
-  index do
-    column("") do |p| # Blog post featured image thumbnail
-      url = p.featured_image.thumb.url
-      if url.nil?
-        url = "http://placehold.it/118x100&text=NO+IMAGE"
-      end
-      image_tag(url, :alt => p.title, :size=>"118x100")
-    end
-    
-    column("Title") do |p|
-      html = "<p><strong>#{p.title}</strong><br/><em>#{truncate(p.excerpt, :length => 90)}</em></p>"
-      
-      if not p.tags.empty?
-        html << "Tags: <em>" + p.tags.gsub(',', ', ') + "</em><br/>"
-      end
-      
-      if p.categories.size > 0
-        html << "Published in: " + p.categories.collect{|c| link_to(c.name, admin_category_path(c))}.join(", ")
-      end
-      html.html_safe
-    end
-    
-    column("Status") do |p|
-      """#{p.date.to_s.gsub('-', '/')}<br/>
-         <i>#{p.published ? 'Published' : 'Not Finished'}</i>""".html_safe
+    def index
+      redirect_to all_admin_posts_path
     end
 
-    default_actions
-  end
-
-  sidebar :categories, :only => :index do
-    render :partial => "categories", :locals => { :categories => ActiveadminBlog::BlogCategory.all }
+    defaults :finder => :find_by_permalink
   end
 
   form do |f|
-    f.inputs "Title" do
-      f.input :title, :required => true
-    end
-    f.inputs "Content" do
-      f.input :content, :as => :text,
-                        :input_html => { :class => "redactor" }
-    end
-    f.inputs "Details" do
-      
-      if f.object.has_featured_image?
-        featured_image_hint = image_tag f.object.featured_image.thumb.url, :size => "118x100"
-      else
-        featured_image_hint = ""
-      end
-      f.input :featured_image, :hint => featured_image_hint
-
-      if f.object.has_featured_image?
-        f.input :remove_featured_image, :as => :boolean
-      end
-
-      unless f.object.new?
-        f.input :permalink
-      end
-
-      f.input :published, :as             => :select,
-                          :label          => "State",
-                          :collection     => [["published", "true"], ["not finished", "false"]],
-                          :include_blank  => false,
-                          :input_html     => { :class => "select2" }
-
-      f.input :date,  :input_html => { :class => "datepicker", :placeholder => "Click field to pick date" }
-
-      categories = ActiveadminBlog::BlogCategory.all
-      if categories.size > 0
-        f.input :categories,  :as             => :select,
-                              :label          => "Published in",
-                              :input_html     => { :multiple => true, :class => "select2" },
-                              :collection     => categories,
-                              :include_blank  => false,
-                              :hint => "Click on field and select category from dropdown"
-      end
-
-      f.input :tags,  :hint       => "Select from the list or type a new one and press ENTER",
-                      :input_html => { "data-url"  => "/admin/posts/tags" }
-    end
-    f.buttons
+    render :partial => "form", :locals => { :f => f }
   end
 
   collection_action :tags, :method => :get do
     tags    = ActiveadminBlog::BlogPost.all.collect{ |p| p.tags }.join(",").split(',').uniq
     render :json => tags
   end
+
+  collection_action :all do
+    @page_title = "All Posts"
+    @posts = ActiveadminBlog::BlogPost.all
+  end
+
+  sidebar :categories, :only => :all do
+    render :partial => "categories", :locals => { :categories => ActiveadminBlog::BlogCategory.all }
+  end
 end

data/vendor/assets/javascripts/activeadmin_blog.js.coffee

@@ -4,27 +4,33 @@
 if !Array.prototype.last
   Array.prototype.last = () -> return this[this.length - 1]
 
-$ ->
-  # Fix header menu for category pages
+enable_collapsable_details = ->
+  $('.collapsed .collapse-button-show').live 'click', (e) ->
+    e.preventDefault()
+    $(this).closest('.collapsed').removeClass('collapsed')
+
+  $('form .collapse-button-hide').click (e) ->
+    e.preventDefault()
+    $(this).closest('fieldset').addClass('collapsed')
+
+enable_header_link_highlight = ->
   if $('.admin_categories').length > 0
     $('#header #blog').addClass("current")
-  
-  # Enable redactor
-  $('.redactor').redactor 
-    imageUpload:  "/redactor_rails/pictures"
-    imageGetJson: "/redactor_rails/pictures"
 
-  # Enable select2
+enable_redactor = ->
+  $('.redactor').redactor()
+
+enable_select2 = ->
   $('.select2').select2
     minimumResultsForSearch: 10
 
   tags_input = $("#post_tags")
+  
   if tags_input.length > 0
     tags_url = tags_input.attr("data-url")
     $.get tags_url, (tags) => tags_input.select2({tags: tags })
 
-# Reorder functionality
-$ ->
+categories_reorder = ->
   categories_sortable_options = (url) ->
     options =
       stop: (e, ui) ->
@@ -53,4 +59,9 @@ $ ->
     .disableSelection()
 
 
-
+$ ->
+  enable_collapsable_details()
+  enable_header_link_highlight()
+  enable_redactor()
+  #enable_select2()
+  categories_reorder()

data/vendor/assets/stylesheets/activeadmin_blog.css.scss

@@ -6,8 +6,8 @@
 
   #post_title { font-size:2em; }
   
-  #post_category_ids { width:76%; }
-  #post_draft { width:160px; }
+  //#post_category_ids { width:76%; }
+  #post_category_ids { width:160px; }
   #post_date { width:138px; }
 }
 
@@ -29,7 +29,6 @@
 }
 
 #categories_sidebar_section {
-  margin-top:36px;
   ul {
     margin:0px; padding:0px;
     list-style:none;
@@ -48,4 +47,26 @@
     height:22px;
     margin-bottom:14px;
   }
-}
+}
+
+.admin_posts, .admin_categories {
+  .breadcrumb { display:none; }
+}
+
+// Collapse blog post details
+.admin_posts form {
+  .inputs.collapsed {
+    padding:0;
+
+    .collapse-button-hide { display: none; }
+    .collapse-button-show { display: inline; }
+
+    ol { display:none; }
+  }  
+
+  .collapse-button-hide, .collapse-button-show { float:right; }
+
+  .collapse-button-show {
+    display:none;
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-blog
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -133,7 +133,11 @@ files:
 - app/views/activeadmin_blog/posts/show.html.erb
 - app/views/activeadmin_blog/posts/tag.html.erb
 - app/views/admin/categories/_form.html.erb
+- app/views/admin/categories/_show.html.erb
 - app/views/admin/posts/_categories.html.erb
+- app/views/admin/posts/_form.html.erb
+- app/views/admin/posts/_table.html.erb
+- app/views/admin/posts/all.html.erb
 - config/routes.rb
 - install.sh
 - lib/activeadmin-blog.rb
@@ -161,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 234615040285968818
+      hash: -3963232444574075549
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -170,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 234615040285968818
+      hash: -3963232444574075549
 requirements: []
 rubyforge_project: nowarning
 rubygems_version: 1.8.24