spree_cms 0.0.3 → 0.0.4

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in how_are_we_doing.gemspec
 gemspec

data/app/controllers/admin/pages_controller.rb

@@ -34,10 +34,15 @@ class Admin::PagesController < Admin::BaseController
         #  base_scope = base_scope.not_deleted
         #end
 
-        @search = Page.search(params[:search])
-        @search.order ||= "ascend_by_title"
+        @search = Page.searchlogic(params[:search])
 
-        @collection = @search.paginate(:page => params[:page])
+        # @search = Post.search(params[:search])
+        # @search.order ||= "ascend_by_title"
+
+        @collection = @search.do_search.paginate(
+          :per_page => (Spree::Config[:per_page]||50),
+          :page     => params[:page]
+        )
       else
         @collection = Page.title_contains(params[:q]).all(:include => includes, :limit => 10)
         @collection.uniq!

data/app/controllers/admin/posts_controller.rb

@@ -33,11 +33,16 @@ class Admin::PostsController < Admin::BaseController
         #if params[:search].nil? || params[:search][:deleted_at_not_null].blank?
         #  base_scope = base_scope.not_deleted
         #end
+        
+        @search = Post.searchlogic(params[:search])
 
-        @search = Post.search(params[:search])
-        @search.order ||= "ascend_by_title"
+        # @search = Post.search(params[:search])
+        # @search.order ||= "ascend_by_title"
 
-        @collection = @search.paginate( :page  => params[:page] )
+        @collection = @search.do_search.paginate(
+          :per_page => (Spree::Config[:per_page]||50),
+          :page     => params[:page]
+        )
       else
         @collection = Post.title_contains(params[:q]).all(:include => includes, :limit => 10)
         @collection.uniq!

data/app/views/admin/cms_settings/edit.html.erb

@@ -2,7 +2,7 @@
 
 <h1><%= t('cms.settings') %></h1>
 
-<% form_tag(admin_cms_settings_path, :method => :put) do -%>
+<%= form_tag(admin_cms_settings_path, :method => :put) do -%>
 
 
   
@@ -10,6 +10,22 @@
 	<label><%= t('cms.posts_per_page') %></label>
 	<%= text_field_tag('preferences[cms_posts_per_page]', Spree::Config[:cms_posts_per_page]) %>
   </p>
+  
+  <!-- <p>
+  <label><%= t("cms.disqus.account") %></label>
+  <%= text_field_tag('preferences[cms_disqus_account]', Spree::Config[:cms_disqus_account]) %>
+  </p>
+  
+  <p>
+  <label><%= t("cms.disqus.api_key") %></label>
+  <%= text_field_tag('preferences[cms_disqus_api_key]', Spree::Config[:cms_disqus_api_key]) %>
+  </p>
+  
+  <p>
+  <label><%= t("cms.disqus.developer") %></label>
+  <%= text_field_tag('preferences[cms_disqus_developer]', Spree::Config[:cms_disqus_developer]) %>
+  </p> -->
+  
   <p>
 	<label><%= t('cms.posts_recent') %></label>
 	<%= text_field_tag('preferences[cms_posts_recent]', Spree::Config[:cms_posts_recent])%>

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

@@ -1,20 +1,20 @@
 <div class="yui-gc">
   <div class="yui-u first">
     <%- locals = {:f => f} -%>
-    <% hook :admin_page_form_left, locals do %>
-      <% f.field_container :title do %>
+    <%= hook :admin_page_form_left, locals do %>
+      <%= f.field_container :title do %>
         <%= f.label :title, t("cms.title") %> <span class="required">*</span><br />
         <%= f.text_field :title, :class => 'fullwidth title'  %>
         <%= f.error_message_on :title %>
       <% end %>
 
-      <% f.field_container :permalink do %>
+      <%= f.field_container :permalink do %>
         <%= f.label :permalink, t("cms.permalink") %> <span class="required">*</span><br />
         <%= f.text_field :permalink, :class => 'fullwidth title'  %>
         <%= f.error_message_on :permalink %>
       <% end %>
 
-      <% f.field_container :body_raw do %>
+      <%= f.field_container :body_raw do %>
         <%= f.label :body_raw, t("cms.body")%><br />
         <%= f.text_area :body_raw, {:cols => 60, :rows => 4, :class => 'fullwidth'} %>
         <%= f.error_message_on :body_raw %>
@@ -22,7 +22,7 @@
     <% end %>
   </div>
   <div class="yui-u">
-    <% hook :admin_page_form_right, locals do %>
+    <%= hook :admin_page_form_right, locals do %>
     
       <p>
         <%= f.label :is_active, t("cms.status")%><br />
@@ -32,7 +32,7 @@
         <%= f.error_message_on :is_active%>
       </p>
       <h2><%= t("metadata") %></h2>
-      <% hook :admin_page_form_meta, locals do %>
+      <%= hook :admin_page_form_meta, locals do %>
         <p>
           <%= f.label :meta_keywords, t("cms.meta_keywords")%><br />
           <%= f.text_field :meta_keywords, :class => 'fullwidth' %>

data/app/views/admin/pages/edit.html.erb

@@ -1,6 +1,6 @@
 <h1><%= t("cms.editing_page") + " &ldquo;#{@page.title}&rdquo;" %></h1>
 
-<% form_for(@page, :url => object_url, :html => { :method => :put, :multipart => true }) do |f| %>
+<%= form_for(@page, admin_post_path(@page), :html => { :method => :put, :multipart => true }) do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= render :partial => 'admin/shared/edit_resource_links' %>
 <% end %>

data/app/views/admin/pages/index.html.erb

@@ -1,10 +1,10 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li id="new_ot_link">
-      <%= button_link_to_remote t("cms.new_page"),
-                         {:url => new_object_url,
-                         :method => :get,
-                         :update => "new-page"}, :icon => 'add' %>
+      <%= button_link_to t("cms.new_page"), new_object_url,
+                         {:remote => true,
+                         :icon => 'add',
+                         'data-update' => 'new-page'} %>
     </li>
   </ul>
   <br class='clear' />
@@ -18,7 +18,7 @@
 
 <table class="index">
   <tr>
-    <% hook :admin_pages_index_headers do %>
+    <%= hook :admin_pages_index_headers do %>
       <th><%= order @search, :by => :title, :as => t("cms.title") %></th>
       <th><%= order @search, :by => :date, :as => t("cms.date") %></th>
     <% end %>
@@ -30,12 +30,12 @@
 <% @collection.each do |page| %>
   <%- locals = {:page => page} -%>
   <tr>
-    <% hook :admin_pages_index_rows, locals do %>
+    <%= hook :admin_pages_index_rows, locals do %>
       <td><%= link_to h(page.title), [:edit,:admin,page] %> (<%= page.is_active == 1 ? t("cms.published") : t("cms.draft") %>) </td>
       <td><%= (page.published_at.blank? ? page.updated_at : page.published_at).strftime("%B %d, %Y at %I:%M%p") %></td>
     <% end %>
     <td class="actions">
-      <% hook :admin_pages_index_row_actions, locals do %>
+      <%= hook :admin_pages_index_row_actions, locals do %>
         <%= link_to_edit page %>
         &nbsp;
         <%= link_to_delete page %>
@@ -46,14 +46,14 @@
 </table>
 <%= will_paginate(:previous_label => "&#171; #{t('previous')}", :next_label => "#{t('next')} &#187;") %>
 
-<% content_for :sidebar do %>
+<%= content_for :sidebar do %>
 
-  <% form_for @search do |f| %>
+  <%= form_for @search do |f| %>
     <div class="box">
       <h3><%= t(:search) %></h3>
 
       <%- locals = {:f => f} -%>
-      <% hook :admin_pages_index_search, locals do %>
+      <%= hook :admin_pages_index_search, locals do %>
         <p>
           <label><%= t("cms.title") %></label><br />
           <%= f.text_field :title_contains, :size => 15 %>
@@ -79,7 +79,7 @@
         </p>
       <% end %>
 
-      <% hook :admin_pages_index_search_buttons, locals do %>
+      <%= hook :admin_pages_index_search_buttons, locals do %>
         <p class="form-buttons">
           <%= button t("search") %>
         </p>

data/app/views/admin/pages/new.html.erb

@@ -1,9 +1,9 @@
-<%= error_messages_for :page %>
+<%= render "shared/error_messages", :target => @page %>
 
-<% form_for(:page,  :url => collection_url, :html => { :multipart => true }) do |f| %>
+<%= form_for(:page,  :url => collection_url, :html => { :multipart => true }) do |f| %>
 <fieldset>
 
-  <% f.field_container :title do %>
+  <%= f.field_container :title do %>
     <%= f.label :title, t("cms.title") %> <span class="required">*</span><br />
     <%= f.text_field :title, :class => 'fullwidth title'  %>
     <%= f.error_message_on :title %>
@@ -12,7 +12,7 @@
   <div class="yui-gb">
     <div class="yui-u first">
 
-      <% f.field_container :body_raw do %>
+      <%= f.field_container :body_raw do %>
         <%= f.label :body_raw, t("cms.body")%> <span class="required">*</span><br />
         <%= f.text_area :body_raw, {:cols => 120, :rows => 4, :class => 'fullwidth'} %>
         <%= f.error_message_on :body_raw %>

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

@@ -1,26 +1,26 @@
 <div class="yui-gc">
   <div class="yui-u first">
     <%- locals = {:f => f} -%>
-    <% hook :admin_post_form_left, locals do %>
-      <% f.field_container :title do %>
+    <%= hook :admin_post_form_left, locals do %>
+      <%= f.field_container :title do %>
         <%= f.label :title, t("cms.title") %> <span class="required">*</span><br />
         <%= f.text_field :title, :class => 'fullwidth title'  %>
         <%= f.error_message_on :title %>
       <% end %>
 
-      <% f.field_container :permalink do %>
+      <%= f.field_container :permalink do %>
         <%= f.label :permalink, t("cms.permalink") %> <span class="required">*</span><br />
         <%= f.text_field :permalink, :class => 'fullwidth title'  %>
         <%= f.error_message_on :permalink %>
       <% end %>
 
-      <% f.field_container :excerpt do %>
+      <%= f.field_container :excerpt do %>
         <%= f.label :excerpt, t("cms.excerpt")%><br />
         <%= f.text_area :excerpt, {:cols => 120, :rows => 3, :class => 'fullwidth'} %>
         <%= f.error_message_on :excerpt %>
       <% end %>
     
-      <% f.field_container :body_raw do %>
+      <%= f.field_container :body_raw do %>
         <%= f.label :body_raw, t("cms.body")%> <span class="required">*</span><br />
         <%= f.text_area :body_raw, {:cols => 120, :rows => 4, :class => 'fullwidth'} %>
         <%= f.error_message_on :body_raw %>
@@ -28,11 +28,11 @@
     <% end %>
   </div>
   <div class="yui-u">
-    <% hook :admin_post_form_right, locals do %>
+    <%= hook :admin_post_form_right, locals do %>
     
       <p>
         <%= f.label :user_id, t("cms.author")%><br />
-        <%= f.collection_select :user_id, User.roles_name_equals("cms.admin"), :id, :display_name, {:prompt => t("cms.select_author")} %>
+        <%= f.collection_select :user_id, User.roles_name_equals("admin"), :id, :display_name, {:prompt => t("cms.select_author")} %>
         <%= f.error_message_on :user_id %>
       </p>
 
@@ -51,7 +51,7 @@
       </p>
       
       <h2><%= t("cms.metadata") %></h2>
-      <% hook :admin_page_form_meta, locals do %>
+      <%= hook :admin_page_form_meta, locals do %>
         <p>
           <%= f.label :meta_keywords, t("cms.meta_keywords")%><br />
           <%= f.text_field :meta_keywords, :class => 'fullwidth' %>

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

@@ -1,4 +1,4 @@
-<% content_for :sub_menu do %>
+<%= content_for :sub_menu do %>
   <ul id="sub_nav">
     <%= tab :cms_settings, :label => 'cms.settings' %>
     <%= tab :posts %>    

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

@@ -1,8 +1,8 @@
 <%= render :partial => 'sub_menu' %>
 
-<h1><%= t("cms.editing_post") + " &ldquo;#{@post.title}&rdquo;" %></h1>
-
-<% form_for(@post, :url => object_url, :html => { :method => :put, :multipart => true }) do |f| %>
+<h1><%= raw t("cms.editing_post") + " &ldquo;#{@post.title}&rdquo;" %></h1>
+d
+<%= form_for([:admin,@post], :html => { :method => :put, :multipart => true }) do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= render :partial => 'admin/shared/edit_resource_links' %>
 <% end %>

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

@@ -3,10 +3,10 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li id="new_ot_link">
-      <%= button_link_to_remote t("cms.new_post"),
-                         {:url => new_object_url,
-                         :method => :get,
-                         :update => "new-post"}, :icon => 'add' %>
+      <%= button_link_to t("cms.new_post"), new_object_url,
+                         {:remote => true,
+                         'data-update' => 'new-post',
+                         :icon => 'add'} %>
     </li>
   </ul>
   <br class='clear' />
@@ -20,7 +20,7 @@
 
 <table class="index">
   <tr>
-    <% hook :admin_posts_index_headers do %>
+    <%= hook :admin_posts_index_headers do %>
       <th><%= order @search, :by => :title, :as => t("cms.title") %></th>
       <th><%= order @search, :by => :author, :as => t("cms.author") %></th>
       <th><%= t("cms.tags") %></th>
@@ -34,13 +34,13 @@
 <% @collection.each do |post| %>
   <%- locals = {:post => post} -%>
   <tr>
-    <% hook :admin_posts_index_rows, locals do %>
+    <%= hook :admin_posts_index_rows, locals do %>
       <td><%= link_to h(post.title), [:edit,:admin,post] %> (<%= post.is_active == 1 ? t("cms.published") : t("cms.draft") %>) </td>      
       <td><%= link_to post.user.display_name, [:admin, post.user] %></td>
       <td><%= post.tag_list %></td>
       <td><%= (post.published_at.blank? ? post.updated_at : post.published_at).strftime("%B %d, %Y at %I:%M%p") %></td>
       <td class="actions">
-        <% hook :admin_pages_index_row_actions, locals do %>
+        <%= hook :admin_pages_index_row_actions, locals do %>
           <%= link_to_edit post %>
           &nbsp;
           <%= link_to_delete post %>
@@ -53,14 +53,14 @@
 
 <%= will_paginate(:previous_label => "&#171; #{t('previous')}", :next_label => "#{t('next')} &#187;") %>
 
-<% content_for :sidebar do %>
+<%= content_for :sidebar do %>
 
-  <% form_for @search do |f| %>
+  <%= form_for @search do |f| %>
     <div class="box">
       <h3><%= t(:search) %></h3>
 
       <%- locals = {:f => f} -%>
-      <% hook :admin_posts_index_search, locals do %>
+      <%= hook :admin_posts_index_search, locals do %>
         <p>
           <label><%= t("cms.title") %></label><br />
           <%= f.text_field :title_contains, :size => 15 %>
@@ -80,7 +80,7 @@
 
         <p>
           <label><%= t("cms.author") %></label><br />
-          <%= f.select :user_id_equals, User.all.collect {|r| [ r.display_name, r.id]} %></p>
+          <%= collection_select( :user, :user_id, User.roles_name_equals("admin"), :id, :display_name) %></p>
         </p>
         <p>
           <%= f.check_box :is_active, {:style => "vertical-align:middle;"}, "1", ""  %>
@@ -90,7 +90,7 @@
         </p>
       <% end %>
 
-      <% hook :admin_posts_index_search_buttons, locals do %>
+      <%= hook :admin_posts_index_search_buttons, locals do %>
         <p class="form-buttons">
           <%= button t("search") %>
         </p>

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

@@ -1,11 +1,11 @@
-<%= render :partial => 'sub_menu' %>
+<%= render "shared/error_messages", :target => @post %>
 
-<%= error_messages_for :post %>
+<%= render :partial => 'sub_menu' %>
 
-<% form_for(:post,  :url => collection_url, :html => { :multipart => true }) do |f| %>
+<%= form_for(:post,  :url => collection_url, :html => { :multipart => true }) do |f| %>
 <fieldset>
 
-  <% f.field_container :title do %>
+  <%= f.field_container :title do %>
     <%= f.label :title, t("cms.title") %> <span class="required">*</span><br />
     <%= f.text_field :title, :class => 'fullwidth title'  %>
     <%= f.error_message_on :title %>
@@ -14,7 +14,7 @@
   <div class="yui-gb">
     <div class="yui-u first">
       
-      <% f.field_container :body_raw do %>
+      <%= f.field_container :body_raw do %>
         <%= f.label :body_raw, t("cms.body")%> <span class="required">*</span><br />
         <%= f.text_area :body_raw, {:cols => 120, :rows => 4, :class => 'fullwidth'} %>
         <%= f.error_message_on :body_raw %>
@@ -29,7 +29,7 @@
         <%= f.collection_select :user_id, User.all, :id, :display_name, {:include_blank => false} %>
       </p>
       
-      <% f.field_container :permalink do %>
+      <%= f.field_container :permalink do %>
         <%= f.label :permalink, t("cms.permalink") %><br />
         <%= f.text_field :permalink, :class => 'fullwidth title'  %>
         <%= f.error_message_on :permalink %>

data/app/views/pages/show.html.erb

@@ -1,5 +1,5 @@
-<h2><%=@page.title%></h2>
+<h2><%= @page.title %></h2>
 
 <div class="content">
-  <%= @page.body %>
+  <%= raw @page.body %>
 </div>

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

@@ -5,9 +5,9 @@
 		<div class="post-meta">
 		  <% unless post.user.display_name.blank? %>By <%= post.user.display_name %> <% end %> - <%= link_to "comments", post_path(post, :anchor => "disqus_thread") %>
 		</div>
-		<div class="post-content"><%= post.body %></div>
-		<div class="post-meta"><% unless post.tags.empty? %><%= t("cms.tags") %>: <%= linked_tag_list(post.tags) %><% end %></div>
+		<div class="post-content"><%= raw post.body %></div>
+		<div class="post-meta"><% unless post.tags.empty? %><%= t("cms.tags") %>: <%= raw linked_tag_list(post.tags) %><% end %></div>
 	</div>
 
 
-<%= disqus_comment_counts %>
+<%= raw disqus_comment_counts %>

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

@@ -1,4 +1,4 @@
-<% content_for :head do %>
+<%= content_for :head do %>
   <link rel="alternate" type="application/rss+xml" title="<%= t("posts") %> RSS" href="<%= posts_url(:format => 'rss') %>" />
 <% end %>   
    

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

@@ -5,6 +5,6 @@
 
 <% if @post.commentable == 1 %>
 <div id="comments">
-  <%= disqus_thread %>
+  <%= raw disqus_thread %>
 </div>
 <% end %>

data/app/views/shared/_cms_content_for.html.erb

@@ -1,7 +1,7 @@
-<% content_for :head do %>
-  <%= stylesheet_tags 'compiled/cms' %>
+<%= content_for :head do %>
+  <%= stylesheet_tags 'sass/cms' %>
 <% end %>
 
-<% content_for :sidebar do %>
+<%= content_for :sidebar do %>
   <%= render :partial => 'shared/recent_articles'%>
 <% end %>

data/app/views/shared/_recent_articles.html.erb

@@ -3,5 +3,5 @@
 <% post_link_list().each do |link| -%>
   <li><%= link_to link.name, link.url %></li>
 <% end -%>
-<li><%- link_to posts_path(:format => 'rss') do -%><%= image_tag('icons/feed.gif', :alt => "#{t("posts")} RSS", :size => '16x16') %> RSS Feed <%- end -%></li>
+<li><%= link_to posts_path(:format => 'rss') do -%><%= image_tag('icons/feed.gif', :alt => "#{t("posts")} RSS", :size => '16x16') %> RSS Feed <%- end -%></li>
 </ul>

data/config/locales/en.yml

@@ -4,6 +4,7 @@ en:
     posts: Posts
     page: Page
     pages: Pages
+    recent_posts: Recent Posts
     cms:
       date: Date
       published_date_range: Published Date Range
@@ -26,6 +27,10 @@ en:
       author: Author
       publish_post: Publish Post
       comment_status: Comment Status
+      status: Status
+      metadata: Metadata
+      meta_keywords: Meta Keywords
+      meta_description: Meta Description
       tags: Tags
       tags_hint: Enter tags separated by a comma
       settings: Blog Settings

data/config/routes.rb

@@ -0,0 +1,10 @@
+Rails.application.routes.draw do
+  resources :posts
+  match "#{Spree::Config[:cms_permalink]}/tags/:tag_name" => "posts#tags", :as => "tag_posts"
+  resources :pages
+  namespace :admin do
+    resource :cms_settings
+    resources :posts
+    resources :pages
+  end
+end

data/lib/generators/spree_cms/install/install_generator.rb

@@ -17,22 +17,26 @@ module SpreeCms
         directory "public", "public"
       end
       
+      def copy_config_files
+        copy_file "config/disqus_config.yml", "config/disqus_config.yml"
+      end
+      
       def generate_migrations
-        migration_template "db/migrate/create_pages.rb", "db/migrate/create_pages.rb"
-        migration_template "db/migrate/create_posts.rb", "db/migrate/create_posts.rb"
-        migration_template "db/migrate/add_display_name_to_user.rb", "db/migrate/add_display_name_to_user.rb"
-        migration_template "db/migrate/is_taggable_migration.rb", "db/migrate/is_taggable_migration.rb"
+        migration_template "db/migrate/create_pages.rb", "db/migrate/create_pages.rb" rescue true
+        migration_template "db/migrate/create_posts.rb", "db/migrate/create_posts.rb" rescue true
+        migration_template "db/migrate/add_display_name_to_user.rb", "db/migrate/add_display_name_to_user.rb" rescue true
+        migration_template "db/migrate/is_taggable_migration.rb", "db/migrate/is_taggable_migration.rb" rescue true
       end
       
       def generate_routes
-        route('resources :posts')
-        route('match "'+Spree::Config[:cms_permalink]+'/tags/:tag_name" => "posts#tags", :as => "tag_posts"')
-        route('resources :pages')
-        route('namespace :admin do
-          resource :cms_settings
-          resources :posts
-          resources :pagess
-        end')
+        # route('resources :posts')
+        #         route('match "'+Spree::Config[:cms_permalink]+'/tags/:tag_name" => "posts#tags", :as => "tag_posts"')
+        #         route('resources :pages')
+        #         route('namespace :admin do
+        #           resource :cms_settings
+        #           resources :posts
+        #           resources :pagess
+        #         end')
       end
       
     end

data/lib/generators/spree_cms/install/templates/config/disqus_config.yml

@@ -0,0 +1,18 @@
+development:
+  account: ""
+  api_key: ""
+  developer: ""
+
+test:
+  domain: test.host
+
+staging:
+  account: ""
+  api_key: ""
+  developer: ""
+
+production:
+  account: ""
+  api_key: ""
+  developer: ""
+

data/lib/generators/spree_cms/install/templates/public/stylesheets/sass/cms.css

@@ -0,0 +1,53 @@
+.posts .post {
+  border-bottom: solid 1px #cccccc; }
+
+.post {
+  padding-bottom: 10px;
+  margin-bottom: 20px;
+  font-size: 14px; }
+  .post .post-content p {
+    padding: 0 0 0.5em 0;
+    margin: 0.5em 0 0; }
+  .post h2.post-title {
+    margin: 0;
+    line-height: 1em;
+    text-transform: none; }
+    .post h2.post-title padding {
+      bottom: 10px; }
+    .post h2.post-title a,
+    .post h2.post-title a:visited {
+      color: #333333;
+      text-decoration: none;
+      font-weight: normal; }
+    .post h2.post-title a:hover {
+      color: #333333;
+      text-decoration: underline; }
+  .post .post-date {
+    margin: 0 0 0.5em 0;
+    font-size: 11px;
+    padding: 0;
+    color: #a5a5a5; }
+    .post .post-date a {
+      text-decoration: none; }
+
+.post .post-meta {
+  margin: 3px 0 1.5em 0;
+  font-size: 12px; }
+  .post .post-meta a {
+    color: #999999;
+    font-weight: normal; }
+
+#comments {
+  border-top: solid 5px #999999;
+  padding-top: 10px; }
+
+.comment {
+  padding-top: 5px;
+  margin-bottom: 20px;
+  border-top: solid 1px #cccccc; }
+  .comment p {
+    padding: 5px 0; }
+  .comment .meta span {
+    padding-left: 5px;
+    font-size: 11px;
+    color: #999999; }

data/lib/spree_cms.rb

@@ -1,21 +1,33 @@
 require 'spree_core'
+require 'disqus'
+require 'rails'
 require 'spree_cms_hooks'
+require 'is_taggable'
+require 'RedCloth'
 
 module SpreeCms
   class Engine < Rails::Engine
-
     config.autoload_paths += %W(#{config.root}/lib)
     
     initializer "cms" do
       require 'extensions/string'
     end
     
+    initializer 'load_disqus_config' do
+      if File.exists?("#{Rails.root}/config/disqus_config.yml")
+        raw_config = File.read("#{Rails.root}/config/disqus_config.yml")
+        DISQUS_CONFIG = YAML.load(raw_config)[Rails.env].symbolize_keys
+      else
+        DISQUS_CONFIG = {}
+      end
+    end
+    
 	  def self.activate
 	    
-	    Disqus::defaults[:account] = "my_disqus_account_name"
+	    ::Disqus::defaults[:account] = DISQUS_CONFIG[:account]
       # Optional, only if you're using the API
-      Disqus::defaults[:api_key] = "my_disqus_api_key"    
-      Disqus::defaults[:developer] = (RAILS.env != "production")
+      ::Disqus::defaults[:api_key] = DISQUS_CONFIG[:api_key]
+      ::Disqus::defaults[:developer] = DISQUS_CONFIG[:developer]
       
 	    Spree::BaseController.class_eval do
         helper CmsHelper      
@@ -51,12 +63,15 @@ module SpreeCms
         preference :cms_page_status_default, :integer, :default => 0
         preference :cms_page_comment_default, :integer, :default => 0
         preference :cms_rss_description, :string, :default => 'description about your main post rss.'
+        preference :cms_disqus_account
+        preference :cms_disqus_api_key
+        preference :cms_disqus_developer
       end  
 
       User.class_eval do
-          has_many :posts
+        has_many :posts
 
-          attr_accessible :display_name        
+        attr_accessible :display_name
       end
 
 	  end

data/lib/spree_cms/version.rb

@@ -1,3 +1,3 @@
 module SpreeCms
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: spree_cms
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors: 
 - Gunner Technology, Cody Swann
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 0
         version: 0.1.0
   type: :runtime
   version_requirements: *id001
@@ -40,10 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 4
-        - 2
-        - 7
         version: 4.2.7
   type: :runtime
   version_requirements: *id002
@@ -55,10 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 4
         version: 1.0.4
   type: :runtime
   version_requirements: *id003
@@ -105,18 +89,22 @@ files:
 - app/views/shared/_recent_articles.html.erb
 - app/views/shared/_store_menu.html.erb
 - config/locales/en.yml
+- config/routes.rb
 - lib/extensions/string.rb
 - lib/generators/spree_cms/USAGE
 - lib/generators/spree_cms/install/install_generator.rb
+- lib/generators/spree_cms/install/templates/config/disqus_config.yml
 - lib/generators/spree_cms/install/templates/db/migrate/add_display_name_to_user.rb
 - lib/generators/spree_cms/install/templates/db/migrate/create_pages.rb
 - lib/generators/spree_cms/install/templates/db/migrate/create_posts.rb
 - lib/generators/spree_cms/install/templates/db/migrate/is_taggable_migration.rb
 - lib/generators/spree_cms/install/templates/public/images/icons/feed.gif
+- lib/generators/spree_cms/install/templates/public/stylesheets/sass/cms.css
 - lib/generators/spree_cms/install/templates/public/stylesheets/sass/cms.sass
 - lib/spree_cms.rb
 - lib/spree_cms/version.rb
 - lib/spree_cms_hooks.rb
+- pkg/spree_cms-0.0.3.gem
 - spree_cms.gemspec
 has_rdoc: true
 homepage: ""
@@ -132,21 +120,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: spree_cms
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Adds a simple CMS to your Spree Store with Disqus commenting