mcms_blog 0.0.2 → 0.0.3

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

@@ -7,14 +7,17 @@
 =end
 class Admin::Blog::CategoriesController < ::ApplicationController
 
+  #prepending before filter for authenticating user via devise
 	prepend_before_filter :authenticate_user!  
 
-   	load_and_authorize_resource 
+  #use of cancan to load authorized resource
+  load_and_authorize_resource :class => "BlogCategory"
+    
   #Assigning a layout admin for admin side controller
-  layout 'admin'
+  layout '/mcms/main_layout'
   
   #calling load_assets method before all method to include css and javascript files
-  before_filter :load_assets1
+  before_filter :load_assets
   
   #Crudify method used for a normal crud methods by crudify gem
   #It creates new, create, edit, update, delete, show methods for blog category
@@ -32,15 +35,15 @@ class Admin::Blog::CategoriesController < ::ApplicationController
     if @blog_category.save
       redirect_to admin_blog_categories_path
     else
-      render new_admin_blog_category_path
+      render 'new'
     end
   end
 
-  protected
+  protected               #protected methods start here
 
   #include css and javascript files to AssetManager class global array
-  def load_assets1
-    AssetManager.include_css [:blog_global, :submenu]
+  def load_assets
+    AssetManager.include_css [:blog_global]
   end
 
   

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

@@ -6,16 +6,18 @@
   @Company  : Mindfire Solutions
 =end
 class Admin::Blog::CommentsController < ApplicationController
-	
-	prepend_before_filter :authenticate_user!  
 
-   	load_and_authorize_resource 
+  #prepending before filter for authenticating user via devise
+	prepend_before_filter :authenticate_user!  
 
+  #use of cancan to load authorized resource
+  load_and_authorize_resource :class => "BlogComment"
 
+  #before filter for loading assets
   before_filter :load_assets
   
   #Assigning a layout admin for admin side controller
-  layout 'admin'
+  layout '/mcms/main_layout'
   
   #Crudify method used for a normal crud methods by crudify gem
   #It creates new, create, edit, update, delete, show methods for blog comment
@@ -57,6 +59,9 @@ class Admin::Blog::CommentsController < ApplicationController
     end
   end
 
+  protected           #protected methods start here
+
+  #Initializing assets array for this controller
   def load_assets
     AssetManager.include_css [:blog_global, :submenu]
   end

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

@@ -7,10 +7,11 @@
 =end
 require 'will_paginate/array'
 class Admin::Blog::PostsController < ::ApplicationController
+	#before_filter :authenticate_user!
+	prepend_before_filter :authenticate_user!
 
-	#prepend_before_filter :authenticate_user!  
-
-   	#load_and_authorize_resource 
+   	#load_and_authorize_resource :class => false
+   	load_and_authorize_resource :class => "BlogPost"
   #include will_paginate
   #
 
@@ -31,7 +32,10 @@ class Admin::Blog::PostsController < ::ApplicationController
 
 
   #Assigning a layout admin for admin side controller
-  layout 'admin'
+  layout '/mcms/main_layout'
+
+  #respond_to :html, :js
+  
   #create method for creating blogbosts
   #parameters: title, body, cached_slug
   def create
@@ -48,7 +52,7 @@ class Admin::Blog::PostsController < ::ApplicationController
     if @blog_post.save
       redirect_to admin_blog_root_path
     else
-      render new_admin_blog_post_path
+      render 'new'
     end
   end
 
@@ -71,9 +75,9 @@ class Admin::Blog::PostsController < ::ApplicationController
   #initailizing the array of javascript and css files by Asset manger for including in page
   def load_js
     AssetManager.include_contrib_library [:core_ui, :jquery_tab]
-    AssetManager.include_local_library [:posts, 'ckeditor/init']
+    AssetManager.include_local_library [ 'ckeditor/init']
 
-    AssetManager.include_css [:blog_global, :submenu]
+    AssetManager.include_css [:blog_global]
   end
 
 end

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

@@ -7,14 +7,17 @@
 =end
 class Admin::Blog::SettingsController < ::ApplicationController
 
+  #prepending before filter for authenticating user via devise
 	prepend_before_filter :authenticate_user!  
 
-   	load_and_authorize_resource 
-   	
+  #use of cancan to load authorized resource
+  load_and_authorize_resource 
+
+  #before filter for loading assets
   before_filter :load_assets
   
   #Assigning a layout admin for admin side controller
-  layout 'admin'
+  layout '/mcms/main_layout'
 
   #Checking for the blog is commentable or not then do commentable or uncommentable
   def comments
@@ -49,7 +52,7 @@ class Admin::Blog::SettingsController < ::ApplicationController
     if request.post?
       BlogComment::Notification.recipients = params[:recipients]
       flash[:notice] = t('admin.blog.settings.notification_recipients.updated',
-                         :recipients => BlogComment::Notification.recipients)
+                         :recipients => params[:recipients])
       unless request.xhr? 
         redirect_to admin_blog_posts_path
       else
@@ -59,8 +62,9 @@ class Admin::Blog::SettingsController < ::ApplicationController
     end
   end
 
-  protected
+  protected       #protected methods start here
 
+  #Initializing assets array for this controller
   def load_assets
     AssetManager.include_css [:blog_global, :submenu]
   end

data/app/controllers/blog/posts_controller.rb

@@ -20,7 +20,7 @@ class Blog::PostsController < BlogController
   #before_filter :layout_include
 
 
-  respond_to :html, :js, :rss
+  respond_to :html, :js
 
   
   #Crudify method used for a normal crud methods by crudify gem

data/app/models/ckeditor/asset.rb

@@ -1,5 +1,5 @@
 class Ckeditor::Asset < ActiveRecord::Base
-	self.table_name = 'mcms_assets'
+	set_table_name  'mcms_assets'
   include Ckeditor::Orm::ActiveRecord::AssetBase
   include Ckeditor::Backend::Paperclip
 end

data/app/models/setting.rb

@@ -14,7 +14,7 @@ class Setting < ActiveRecord::Base
   include SettingsHelper
 
   #attr_accessibles
-  attr_accessible :name, :value, :destroyable
+  attr_accessible :name, :value, :destroyable, :created_at, :updated_at
 
   #make settings for blogs to be uncommentable by updating attribute value to 0
   def self.blog_uncommentable_setting

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

@@ -2,88 +2,115 @@
   @Name: admin/blog/_submenu.html.erb
   @Use:  This is a page for displaying menu parts in admin side
   @Created date: 13-06-2012
-  @Modified Date: 13-06-2012
+  @Modified Date: 13-07-2012
   @Company:  Mindfire Solutions
 -->
-<nav id='actions' class='multilist'>
-  
-  <ul class='collapsible-menu'>
-    <li class='not-a-link'>
-      <%= link_to t('.posts.title'), '#',
-                   :class => 'page-copy-icon' %>
-    </li>
-    <li>
-      <%= link_to t('.posts.manage'), admin_blog_posts_path,
-                   :class => 'page-icon' %>
-    </li>
-    <li>
-      <%= link_to t('.posts.uncategorized'), uncategorized_admin_blog_posts_url,
-                  :class => 'page-icon' %>
-    </li>
-    <li>
-       <%= link_to t('.posts.new'), new_admin_blog_post_url,
-                   :class => 'page-add-icon' %>
-    </li>
-  </ul>
-
-
-  <ul class='collapsible-menu'>
-    <li class='not-a-link'>
-      <%= link_to t('.categories.title'), '#',
-                  :class => 'folder-icon' %>
-    </li>
-    <li>
-      <%= link_to t('.categories.manage'), admin_blog_categories_url,
-                  :class => 'folder-edit-icon' %>
-    </li>
-    <li>
-      <%= link_to t('.categories.new'), new_admin_blog_category_url,
-                  :class => 'folder-add-icon' %>
-    </li>
-  </ul>
-
-    <% if BlogPost::CommentSetting.is_comments_allowed? %>
-    <ul class='collapsible-menu'>
-      <li class='not-a-link'>
+<%= javascript_include_tag  'jquery','admin/blog/mcms-blog-submenu.js' %>
+<div id="your-repos" class="repos">
+    <div class="top-bar">
+      <h2>Submenu Lists </h2>
+      <%= link_to t('.posts.new'),  new_admin_blog_post_url, :class =>"button new-repo" %>
+    </div>
    
-        <%= link_to 'Comments', '#',
-                    :class => 'comments-icon' %>
-      </li>
-      <li>
-        <%= link_to t('.comments.new'), admin_blog_comments_path,
-                    :class => 'comment-icon' %>
+    <ul class="repo-list" id="repo-listing">
+      <li class="submenu">
+          <%= link_to t('.posts.title'), 'javascript:void(0);', :class=>"parent-menu-link owner" %>
+          <span class="arrow"></span>
+          <ul id="repo-listing-child">
+            <li class="child-menu">
+              <%= link_to t('.posts.manage'), admin_blog_posts_path, :class=>"owner"%>
+            
+            </li>
+
+            <li class="child-menu">
+                <%= link_to t('.posts.uncategorized'), uncategorized_admin_blog_posts_url, :class=>"owner" %>
+                    
+            </li>
+
+            <li class="child-menu">
+                <%= link_to t('.posts.new'), new_admin_blog_post_url, :class=> 'owner' %>          
+                  
+            </li>
+          </ul>
       </li>
-      <li>
-        <%= link_to t('.comments.approved'), approved_admin_blog_comments_path,
-                    :class => 'comment-tick-icon' %>
+
+      
+
+      <li class="submenu">
+          <%= link_to t('.categories.title'), 'javascript:void(0);', :class => 'parent-menu-link folder-icon' %>
+          <span class="arrow"></span>
+          <ul>
+            <li class="child-menu">
+              <%= link_to t('.categories.manage'), admin_blog_categories_url, :class => 'folder-edit-icon' %>
+            
+            </li>
+
+            <li class="child-menu">
+                <%= link_to t('.categories.new'), new_admin_blog_category_url, :class => 'folder-add-icon' %>
+                
+            </li>
+          </ul>
+          
       </li>
-      <li>
-        <%= link_to t('.comments.rejected'), rejected_admin_blog_comments_path,
-                    :class => 'comment-cross-icon' %>
+
+      
+
+      <% if BlogPost::CommentSetting.is_comments_allowed? %>
+
+        <li class='submenu'>
+
+          <%= link_to 'Comments', 'javascript:void(0);', :class => 'parent-menu-link comments-icon' %>
+          <span class="arrow"></span>
+          <ul>
+            <li class='child-menu' >
+              <%= link_to t('.comments.new'), admin_blog_comments_path %>
+            
+            </li>
+
+            <li class='child-menu' >
+              <%= link_to t('.comments.approved'), approved_admin_blog_comments_path %>
+              
+            </li>
+
+            <li class='child-menu' >
+              <%= link_to t('.comments.rejected'), rejected_admin_blog_comments_path %>
+              
+            </li>
+          </ul>
+        </li>
+
+        
+
+      <% end %>
+
+      <li class="submenu">
+          <%= link_to t('.settings.title'), 'javascript:void(0);', :class => 'parent-menu-link settings-icon' %>
+          <span class="arrow"></span>
+          <ul>
+            <li class="child-menu">
+             <% @link_name =  BlogPost::CommentSetting.is_comments_allowed? ? 'Comments allowed' : 'Comments not allowed' %>
+                <%= link_to @link_name, comments_admin_blog_settings_url, :class => "#{BlogPost::CommentSetting.is_comments_allowed? ? 'success' : 'failure'}-icon" %>
+                
+            </li>
+
+            <li class="child-menu">
+              <% @link_name =  BlogPost::CommentSetting.is_comments_moderated? ? 'Moderation allowed' : 'Moderation not allowed' %>
+                <%= link_to @link_name, moderation_admin_blog_settings_url, :class => "#{BlogPost::CommentSetting.is_comments_moderated? ? 'success' : 'failure'}-icon" %>
+                
+            </li>
+
+            <li class="child-menu">
+                <%= link_to t('.settings.update_notified'),
+                      notification_recipients_admin_blog_settings_url,
+                      :class => 'user-comment-icon' %>
+              
+            </li>
+          </ul>
+
       </li>
-    </ul>
-  <% end %>
-
-  <ul class='collapsible-menu'>
-    <li class='not-a-link'>
-      <%= link_to t('.settings.title'), admin_blog_settings_path,
-                  :class => 'settings-icon' %>
-    </li>
-    <li>
-      <%= link_to t('.settings.comments'), comments_admin_blog_settings_url,
-                  :class => "#{BlogPost::CommentSetting.is_comments_allowed? ? 'success' : 'failure'}-icon" %>
-    </li>
-    <li>
-      <%= link_to t('.settings.moderation'), moderation_admin_blog_settings_url,
-                  :class => "#{BlogPost::CommentSetting.is_comments_moderated? ? 'success' : 'failure'}-icon" %>
-    </li>
-    <li>
-      <%= link_to t('.settings.update_notified'),
-                  notification_recipients_admin_blog_settings_url,
-                  :class => 'user-comment-icon' %>
-    </li>
-  </ul>
-
-</nav>
 
+    </ul>
+    <div class="bottom-bar">
+    </div>
+  </div>
 

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

@@ -1,20 +1,30 @@
-<li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(category) -%>">
-  <span class='title'>
-    <%= category.title %>
-    <span class="preview">&nbsp;</span>
-  </span>
+<!--
+  @Name: admin/blog/categories/_category.html.erb
+  @Use:  This is a partial for showing post records
+  @Created date: 08-06-2012
+  @Modified Date: 13-07-2012
+  @Company:  Mindfire Solutions
+-->
 
-  <span class='actions'>
+<div class="alert issues-comment">
+  <div class="body">
+    <span class="mini-icon mini-icon-issue-comment"></span>
+      <span class='title'>
+        <%= category.title %>
+        <span class="preview">&nbsp;</span>
+      </span>
 
-    <%= link_to image_tag("icons/application_edit.png"), edit_admin_blog_category_path(category),
-         :title => 'Edit' %>
-    <%= link_to image_tag("icons/delete.png"), admin_blog_category_path(category),
-        :class => "cancel confirm-delete",
-        :title => 'Delete',
-        :method => :delete,
-        :confirm => "Are you sure to delete ?" %>
-    <%= link_to image_tag("icons/application_go.png"), blog_category_path(category),
-        :title => 'Show' %>
-  </span>
-  
-</li>
+      <span class='actions'>
+        <%= link_to image_tag("icons/application_edit.png"), edit_admin_blog_category_path(category),
+             :title => 'Edit' %>
+        <%= link_to image_tag("icons/delete.png"), admin_blog_category_path(category),
+            :class => "cancel confirm-delete",
+            :title => 'Delete',
+            :method => :delete,
+            :confirm => "Are you sure to delete ?" %>
+        <%= link_to image_tag("icons/application_go.png"), blog_category_path(category),
+            :title => 'Show',  :target => "_blank" %>
+      </span>
+
+  </div>
+</div>

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

@@ -5,6 +5,7 @@
   @Modified Date: 05-07-2012
   @Company:  Mindfire Solutions
 -->
+<%= render :partial => "/shared/admin/includes" %>
 <%= form_for [:admin, @blog_category] do |f| %>
  <%= render :partial => "/shared/admin/error_messages",
              :locals => {

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

@@ -2,11 +2,11 @@
   @Name: admin/blog/categories/index.html.erb
   @Use:  This is a page for displaying categories records
   @Created date: 13-06-2012
-  @Modified Date: 13-06-2012
+  @Modified Date: 13-07-2012
   @Company:  Mindfire Solutions
 -->
-<%=render :partial=>'/admin/blog/submenu' %>
-<div id='records'>
+
+<div id='records' class="news">
     <% if @blog_categories.any? %>
       <%= will_paginate @blog_categories %>
 
@@ -21,3 +21,4 @@
       </p>
     <% end %>
 </div>
+<%=render :partial=>'/admin/blog/submenu' %>

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

@@ -5,23 +5,26 @@
   @Modified Date: 19-06-2012
   @Company:  Mindfire Solutions
 -->
-<li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= "comment-#{comment.to_param}" -%>">
-  <span class='title'>
-    <%= comment.name %>
-    <span class="preview">  <%= truncate(comment.body, :length => 75) %></span>
-  </span>
-  <span class='actions'>
-    <%= link_to image_tag("icons/application_go.png"),
-                blog_post_url(comment.post, :anchor => "comment-#{comment.to_param}"),
-                :title => t('.view_live_html'),
-                :target => "_blank" unless comment.is_unmoderated? %>
-    <%= link_to image_tag('icons/zoom.png'), admin_blog_comment_path(comment),
-                :title => t('.read') %>
-    <%= link_to image_tag("icons/cross.png"),
-                rejected_admin_blog_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
-                :title => t('.reject') unless comment.is_rejected? %>
-    <%= link_to image_tag("icons/tick.png"),
-                approved_admin_blog_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
-                :title => t('.approve') unless comment.is_approved? %>
-  </span>
-</li>
+<div class="alert issues-comment">
+  <div class="body">
+    <span class="mini-icon mini-icon-issue-comment"></span>
+    <span class='title'>
+      <%= comment.name %>
+      <span class="preview">  <%= truncate(comment.body, :length => 75) %></span>
+    </span>
+    <span class='actions'>
+      <%= link_to image_tag("icons/application_go.png"),
+                  blog_post_url(comment.post, :anchor => "comment-#{comment.to_param}"),
+                  :title => t('.view_live_html'),
+                  :target => "_blank" unless comment.is_unmoderated? %>
+      <%= link_to image_tag('icons/zoom.png'), admin_blog_comment_path(comment),
+                  :title => t('.read') %>
+      <%= link_to image_tag("icons/cross.png"),
+                  rejected_admin_blog_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
+                  :title => t('.reject') unless comment.is_rejected? %>
+      <%= link_to image_tag("icons/tick.png"),
+                  approved_admin_blog_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
+                  :title => t('.approve') unless comment.is_approved? %>
+    </span>
+  </div>
+</div>

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

@@ -1,5 +1,11 @@
-<%= render :partial => '/admin/blog/submenu' %>
-<div id='records'>
+<!--
+  @Name: admin/blog/comments/index.html.erb
+  @Use:  This is a page for displaying comments records
+  @Created date: 13-06-2012
+  @Modified Date: 13-07-2012
+  @Company:  Mindfire Solutions
+-->
+<div id='records' class="news">
  
     <% if @blog_comments.any? %>
       <%= render :partial => "sortable_list" %>
@@ -10,3 +16,4 @@
       </h3>
     <% end %>
 </div>
+<%= render :partial => '/admin/blog/submenu' %>