radiant-comments-extension 1.0.0 → 1.0.1

data/.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
-.svn
-*.gem
+.sass-cache
+*.gem
+Gemfile.lock

data/app/views/admin/comments/_comment.html.haml

@@ -1,26 +1,12 @@
-%tr{:id => dom_id(comment), :class => "comment comment-#{comment.ap_status}"}
-  %td.content{:title => comment.content.size >= 70 ? t('click_to_toggle') : "" }
-    %blockquote.short= escape_once(truncate(comment.content, :length => 70))
-    - if comment.content.size >= 70
-      %blockquote.expanded{:style => "display:none"}
-        = escape_once(comment.content)
-  %td.date-column
-    = comment.created_at.strftime("%b %e, %Y at %I:%M%p")
-  %td.author-column
-    = escape_once(comment.author)
-    - unless comment.author_email.blank?
-      = mail_to(comment.author_email, image_tag("admin/email.png"))
-    - unless comment.author_url.blank?
-      = link_to(image_tag("admin/link.png"), comment.author_url)
+%tr.comment_row
+  %td.name= link_to escape_once(truncate(comment.content, :length => 70)), edit_admin_comment_path(comment)
   - unless @page
-    %td.page-column
-      = link_to truncate(comment.page.title, :length => 40), comment.page.url, :class => 'view-page'
-      = link_to image_tag("admin/page_white_edit.png"), edit_admin_page_path(comment.page), :title => t('edit_page')
-  %td.controls-column
+    %td.page= truncate comment.page.title, :length => 40
+  %td.date= comment.created_at.strftime("%D")
+  %td.author= mail_to comment.author_email, escape_once(comment.author)
+  %td.actions
     - if comment.approved?
-      = link_to(image_tag('admin/error.png'), unapprove_admin_comment_path(comment), :method => :put, :title => t('unapprove_comment'))
+      = link_to image("error") + " " + "Unapprove", unapprove_admin_comment_path(comment), :method => :put, :class => :action
     - else
-      = link_to(image_tag('admin/accept.png'), approve_admin_comment_path(comment), :title => t('approve_comment'), :method => :put)
-    
-    = link_to image_tag("admin/delete.png"), admin_comment_path(comment), :method => :delete, :confirm => t('are_you_sure_you_want_to_delete_this_comment'), :title => t('delete_comment')
-    = link_to image_tag("admin/comment_edit.png"), edit_admin_comment_path(comment), :title => t('edit_comment')
+      = link_to image("accept") + " " + "Approve", approve_admin_comment_path(comment), :method => :put, :class => "action approve"
+    = link_to image('minus') + ' ' + t('remove'), admin_comment_path(comment), :method => :delete, :confirm => t('are_you_sure_you_want_to_delete_this_comment'), :class => :action

data/app/views/admin/comments/_form.html.haml

@@ -3,35 +3,56 @@
     = f.hidden_field :spam_answer, :value => "hemidemisemiquaver"
     = f.hidden_field :valid_spam_answer, :value => Digest::MD5.hexdigest("hemidemisemiquaver")
 
-#comment_form_container.form-area
-  .set
-    %p.title
-      = f.label :author, t('author')
-      = f.text_field :author
-    %p
-      = f.label :author_url, t('url')
-      = f.text_field :author_url
-    %p
-      = f.label :author_email, t('email')
-      = f.text_field :author_email
-  %p
-    %label{:for => "comment_content"}= t('comment')
-    %br/
-    = f.text_area :content, :rows => 10, :cols => 72, :class => "textarea"
-  %p
-    %label{:for => "comment_filter_id"}= t('filter')
-    = f.select :filter_id, [['<none>', '']] + TextFilter.descendants.map { |s| s.filter_name }.sort
-  %p
-    Referred by:
-    = f.object.referrer
-  %p
-    Browser:
-    = f.object.user_agent
-  %p
-    Author's IP Address:
-    = f.object.author_ip
+%p.title
+  = f.label :author, t('author')
+  = f.text_field :author, :class => :textbox
 
-%p.buttons
+.drawer
+  #attributes.drawer_contents
+    %table.fieldset
+      %tr
+        %th.label
+          = f.label :author_url, t('url')
+        %td.field
+          = f.text_field :author_url, :class => :textbox
+      %tr
+        %th.label
+          = f.label :author_email, t('email')
+        %td.field
+          = f.text_field :author_email, :class => :textbox
+      %tr
+        %th.label
+          %label{ :for => :referrer }= t('referrer')
+        %td.field
+          %input.textbox{ :value => f.object.referrer }
+      %tr
+        %th.label
+          %label{ :for => :browser }= t('browser')
+        %td.field
+          %input.textbox{ :value => f.object.user_agent }
+      %tr
+        %th.label
+          %label{ :for => :ip }= t('ip')
+        %td.field
+          %input.textbox{ :value => f.object.author_ip }
+
+  .drawer_handle
+    %a.more.toggle{ :href => "#attributes", :rel => "toggle[attributes]" } More
+
+#tab_control
+  .tabs
+    %a.tab.here{ :href => "#" }
+      %span= t("comment")
+  .pages
+    .page
+      .part
+        %p
+          %label{ :for => "comment_filter_id" }= t("filter")
+          = f.select :filter_id, [["<none>", ""]] + TextFilter.descendants.map { |s| s.filter_name }.sort
+        %div
+          = f.text_area :content, :class => "textarea large", :style => "width:100%"
+
+.buttons
   = save_model_button(@comment)
   = t('or')
   = link_to t('cancel'), :back

data/app/views/admin/comments/index.html.haml

@@ -1,57 +1,28 @@
-- content_for :page_scripts do
-  :plain
-    document.observe('dom:loaded', function(){
-      Event.addBehavior({
-        'tr.comment td.content': function(event){
-          $(this).observe('click', function(event){
-            if($(this).down('blockquote.expanded')){
-              $(this).down('blockquote.expanded').toggle();
-              $(this).down('blockquote.short').toggle();
-            }
-            event.stop();
-          });
-        }
-      });
-    });
-  
 - include_stylesheet 'admin/comments'
 
 .outset
-  #filters
-    %ul.comment-nav
-      - if @page
-        %li        
-          = "#{@page.comments.count.to_s} #{t("comment_states.#{params[:status]}")} " if params[:status] 
-          = "#{pluralize(@page.comments.count, 'Comment')} on #{link_to @page.title, edit_admin_page_path(@page)}"
-      %li.all
-        = link_or_span_unless_current(t('comment_states.all'), :status => 'all', :page_id => params[:page_id])
-      %li.approved
-        = link_or_span_unless_current(t('comment_states.approved'), :status => "approved", :page_id => params[:page_id])
-      %li.unapproved
-        = link_or_span_unless_current(t('comment_states.unapproved'), :status => "unapproved", :page_id => params[:page_id])
-
-
-  #comments_table
-    %table#comments.index
-      %thead
-        %tr
-          %th= t('content')
-          %th= t('date_string')
-          %th= t('author')
-          - unless @page
-            %th= t('page')
-          %th= t('actions')
-      %tbody
-        = render(:partial => "comment", :collection => @comments) || %Q[<tr><td class="note" colspan="#{@page ? 4 : 5}">No comments</td></tr>]
-  %p
-  %small.notice
-    = Comment.spam_filter.message
-
+  %table#comments.index
+    %thead
+      %tr
+        %th= t('comment')
+        - unless @page
+          %th= t('page')
+        %th= t('date_string')
+        %th= t('author')
+        %th.actions= t('actions')
+    %tbody
+      = render(:partial => "comment", :collection => @comments) || %Q[<tr><td class="note" colspan="#{@page ? 4 : 5}">No comments</td></tr>]
 
 #actions
   = will_paginate @comments
   %ul
+    %li.all
+      = link_to "#{image('comments')} #{t('comment_states.all')}", "/admin/comments/all"
+    %li.approved
+      = link_to "#{image('accept')} #{t('comment_states.approved')}", "/admin/comments/approved"
+    %li.unapproved
+      = link_to "#{image('error')} #{t('comment_states.unapproved')}", "/admin/comments/unapproved"
     %li
-      = link_to "#{image('table_save')} #{t('download_csv')}", :format => :csv
+      = link_to "#{image('comments_delete')} #{t('delete_unapproved')}", destroy_unapproved_admin_comments_url, :class => 'delete-unapproved', :method => :delete, :confirm => 'Delete all unapproved comments?'
     %li
-      = link_to "#{image('comments_delete')} #{t('delete_unapproved')}", destroy_unapproved_admin_comments_url, :class => 'delete-unapproved', :method => :delete, :confirm => 'Is it OK to delete ALL Unapproved Comments?'
+      = link_to "#{image('table_save')} #{t('download_csv')}", :format => :csv

data/app/views/admin/pages/_edit_comments_enabled.html.haml

@@ -1,7 +1,14 @@
-%p{:style => "clear:left"}
-  %label{:for => "page_enable_comments"}
+- include_stylesheet 'admin/comments/page_field'
+
+%tr.comments
+  %th.label= t("comments")
+  %td
     = check_box "page", "enable_comments"
-    = t('allow_comments_on_page')
-  - unless @page.new_record? or @page.comments_count < 1
-    %small
-      = link_to t('currently_x_view_comments', :count => @page.comments_count), admin_page_comments_path(:page_id => @page.id)
+    %label{ :for => "page_enable_comments" }
+      = t("allow_comments_on_page")
+
+- if @page.comments_count > 0
+  %tr.comments
+    %th.label= t("moderate")
+    %td
+      = link_to t('moderate_comments'), admin_page_comments_path(:page_id => @page.id)

data/comments_extension.rb

@@ -17,9 +17,7 @@ class CommentsExtension < Radiant::Extension
     end
 
     if admin.respond_to? :page
-      admin.page.edit.add :parts_bottom, "edit_comments_enabled", :before => "edit_timestamp"
-      admin.page.index.add :sitemap_head, "index_head_view_comments"
-      admin.page.index.add :node, "index_view_comments"
+      admin.page.edit.add :extended_metadata, "edit_comments_enabled"
     end
 
     tab "Content" do

data/config/locales/en.yml

@@ -4,6 +4,7 @@ en:
   author: Author
   approve_comment: Approve comment
   are_you_sure_you_want_to_delete_this_comment: Are you sure you want to delete this comment?
+  browser: Browser
   click_to_toggle: Click to toggle complete text
   currently_x_view_comments: Currently {{count}} - show reactions
   comment: Comment
@@ -19,8 +20,12 @@ en:
   download_csv: Download CSV
   edit_comment: Edit comment
   edit_comment_on: Edit comment on
-  email: E-mail
+  email: Email
+  ip: Address
   message_unsure: Please type the letters that you see to prove that you are not a spambot
+  moderate: Moderate
+  moderate_comments: View comments for this page
+  referrer: Referrer
   unapprove_comment: Unapprove comment
   url: URL
   your_name: Your Name (as you'd like it to appear on this comment)

data/config/locales/nl.yml

@@ -1,4 +1,4 @@
-nl: 
+nl:
   actions: Acties
   allow_comments_on_page: Reacties toelaten?
   author: Auteur
@@ -21,6 +21,9 @@ nl:
   edit_comment_on: Wijzig reactie op
   email: E-mail
   message_unsure: Vul onderstaande CAPTCHA in om te bewijzen dat je geen spam-bot bent
+  moderate: Moderate
+  moderate_comments: View comments for this page
+  referrer: Referrer
   unapprove_comment: Reactie terug naar Te modereren
   url: URL
   your_name: Naam (die je bij deze reactie wilt tonen)

data/lib/radiant-comments-extension/version.rb

@@ -1,3 +1,3 @@
 module RadiantCommentsExtension
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/public/stylesheets/admin/comments.css

@@ -1,33 +1,8 @@
-.comment-nav {
-  background: #ccc;
-  border-top: 1px solid #ccc;
-  border-bottom: 1px solid #ccc;
-  list-style: none;
-  margin: 0;
-  padding: 10px; }
-  .comment-nav li {
-    display: inline;
-    margin: 0 5px 0 0; }
-  .comment-nav a, .comment-nav span {
-    padding: 5px 5px 5px 25px;
-    background-position: 5px center;
-    background-repeat: no-repeat; }
-  .comment-nav a, .comment-nav a:visited {
-    color: black; }
-  .comment-nav span {
-    border: 1px solid #e8e8e8;
-    background-color: #eee; }
-  .all span, .all a {
-    background-image: url(/images/admin/comments.png); }
-  .approved span, .approved a {
-    background-image: url(/images/admin/accept.png); }
-  .unapproved span, .unapproved a {
-    background-image: url(/images/admin/error.png); }
-
-#content .outset {
-  margin-bottom: 40px;
-}
-
-.controls-column, .date-column, .author-column { white-space: nowrap }
-.comment-unapproved { background-color: #ffe; }
-.comment a, .comment a:visited { color: black; }
+.comment_row td {
+  height: 31px; }
+  .comment_row td.page, .comment_row td.date {
+    font-size: 10px; }
+.comment_row .actions .approve {
+  margin-right: 38px; }
+  .comment_row .actions .approve:hover, .comment_row .actions .approve:focus {
+    margin-right: 37px; }

data/public/stylesheets/admin/comments/page_field.css

@@ -0,0 +1 @@
+tr.comments a{color:white}

data/public/stylesheets/sass/admin/comments.scss

@@ -0,0 +1,14 @@
+.comment_row {
+  td {
+    height: 31px;
+    &.page, &.date {
+      font-size: 10px;
+    }
+  }
+  .actions .approve {
+    margin-right: 38px;
+    &:hover, &:focus {
+      margin-right: 37px;
+    }
+  }
+}

data/public/stylesheets/sass/admin/comments/page_field.scss

@@ -0,0 +1,5 @@
+tr.comments {
+  a {
+    color: white;
+  }
+}

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: radiant-comments-extension
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Jim Gay
 - Ryan Heneise
 - Sean Cribbs
@@ -28,68 +23,49 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-11 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2010-10-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fastercsv
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: &6968 !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 5
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.5.4
+    none: false
+  requirement: *6968
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: mollom
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: &7028 !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 2
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.2.3
+    none: false
+  requirement: *7028
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: sanitize
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: &7072 !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 0
-        - 3
+      - !ruby/object:Gem::Version
         version: 2.0.3
+    none: false
+  requirement: *7072
   type: :runtime
-  version_requirements: *id003
 description: Adds blog-like comment functionality to Radiant.
 email: jim@saturnflyer.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - TODO
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - Gemfile
@@ -114,8 +90,6 @@ files:
 - app/views/admin/comments/index.html.haml
 - app/views/admin/pages/_comments.html.haml
 - app/views/admin/pages/_edit_comments_enabled.html.haml
-- app/views/admin/pages/_index_head_view_comments.html.haml
-- app/views/admin/pages/_index_view_comments.html.haml
 - app/views/comment_mailer/comment_notification.rhtml
 - autotest/discover.rb
 - comments_extension.rb
@@ -150,6 +124,9 @@ files:
 - public/images/admin/table_save.png
 - public/images/admin/tick.png
 - public/stylesheets/admin/comments.css
+- public/stylesheets/admin/comments/page_field.css
+- public/stylesheets/sass/admin/comments.scss
+- public/stylesheets/sass/admin/comments/page_field.scss
 - radiant-comments-extension.gemspec
 - spec/controllers/admin/comments_controller_spec.rb
 - spec/controllers/admin/comments_routing_spec.rb
@@ -167,43 +144,32 @@ files:
 - test/integration/comment_enabling_test.rb
 - test/test_helper.rb
 - test/unit/comment_test.rb
-has_rdoc: true
 homepage: http://github.com/saturnflyer/radiant-comments-extension
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
+  none: false
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.9.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Comments Extension for Radiant CMS
-test_files: 
+test_files:
 - spec/controllers/admin/comments_controller_spec.rb
 - spec/controllers/admin/comments_routing_spec.rb
 - spec/controllers/page_postback_spec.rb

data/app/views/admin/pages/_index_head_view_comments.html.haml

@@ -1 +0,0 @@
-%th.comments= t('comments')

data/app/views/admin/pages/_index_view_comments.html.haml

@@ -1,7 +0,0 @@
-%td.comment_link
-  - if page.respond_to?('enable_comments')
-    %small
-      - if page.enable_comments
-        = link_to "#{page.comments_count} comments", admin_page_comments_path(:page_id => page.id)
-      - else
-        = link_to "Enable", admin_page_enable_comments_path(:page_id => page.id), :method => :put