community_engine 2.3.2 → 3.0.0

data/app/views/clippings/show.html.haml

@@ -1,56 +1,51 @@
 -@section = 'my_clippings'
 - @meta = { :description => "#{@clipping.description}.",:keywords => "#{@clipping.tags.join(', ') if @clipping.tags}"}
 
-.yui-b
-  =render :partial => 'posts/author_profile', :locals => {:user => @user}
-
-  - if @previous || @next
-    -box :class => "alt" do 
-      = link_to "<img src='#{@previous.image_uri(:thumb)}' /><br />&laquo; #{:previous.l} ".html_safe, user_clipping_path(@user, @previous), :class => 'left' if @previous
-      = link_to "<img src='#{@next.image_uri(:thumb)}' /><br />#{:next.l} &raquo;".html_safe, user_clipping_path(@user, @next), :class => 'right' if @next
-
-  - if @related.any?
-    -box :class => "alt" do 
-      %h3=:related_clippings_all_members.l
-      .centered
-        - @related.each do |clipping|
-          = link_to image_tag(clipping.image_uri(:thumb), :class => "related_clipping polaroid", :alt => clipping.description), user_clipping_url(clipping.user, clipping)
-
-#yui-main
-  .yui-b
-    -box :class => "hfeed" do 
-      %h3= link_to :user_clippings.l(:user =>@user.login), user_clippings_path(@user)
-      .hentry.main
-        - if @is_current_user
-          = link_to :delete.l, user_clipping_path(@user, @clipping), :confirm => :are_you_sure.l, :method => :delete
-          |
-          = link_to :edit.l, edit_user_clipping_path(@user, @clipping)
-
-        %p.centered
-          %a{"href"=>"#{h @clipping.url }"}
-            %img{:src=>"#{h @clipping.image_uri(:large)}", :class=>"clipping", :alt=> "#{h @clipping.description}"}
-
-        %p
-          =:from.l
-          %a{"href"=>"#{h @clipping.url }", "title"=>"#{h @clipping.description }"}
-            = h truncate(@clipping.url, :length => 95)
-
-        %p
-          =:description.l
-          \:
-          =h @clipping.description
-
-        %p
-          =:tags.l
-          \:
-        %ul.tags
-          - @clipping.tags.each do |t|
-            %li=link_to( t.name, tag_url(t), :rel => 'tag')
-
-    -box :class => 'hfeed comments', :id => 'comments' do
-      %h3=:clipping_comments.l
-      %h2=:add_your_comment.l
-      = render :partial => 'comments/comment_form', :locals => {:commentable => @clipping}
-      %a#newest_comment
-      = render :partial => 'comments/comment', :collection => @clipping.comments
-      %span#more_comments_links= more_comments_links(@clipping)
+=render :partial => 'posts/author_profile', :locals => {:user => @user}
+
+- if @previous || @next
+  -widget do
+    .clearfix
+      = link_to "<img src='#{@previous.image_uri(:thumb)}' /><br />&laquo; #{:previous.l} ".html_safe, user_clipping_path(@user, @previous), :class => 'pull-left' if @previous
+      = link_to "<img src='#{@next.image_uri(:thumb)}' /><br />#{:next.l} &raquo;".html_safe, user_clipping_path(@user, @next), :class => 'pull-right' if @next
+
+- if @related.any?
+  -widget do
+    %h3=:related_clippings_all_members.l
+    - @related.each do |clipping|
+      = link_to image_tag(clipping.image_uri(:thumb), :class => "related_clipping polaroid", :alt => clipping.description), user_clipping_url(clipping.user, clipping)
+
+%p
+  - if @is_current_user
+    = link_to :back.l, user_clippings_path(@user), :class => 'btn btn-default'
+    = link_to :edit.l, edit_user_clipping_path(@user, @clipping), :class => 'btn btn-warning'
+    = link_to :delete.l, user_clipping_path(@user, @clipping), data: { confirm: :are_you_sure.l }, :method => :delete, :class => 'btn btn-danger'
+
+= link_to image_tag(@clipping.image_uri(:large), :alt=> @clipping.description, :class => 'thumbnail'), @clipping.url
+
+%dl.dl-horizontal
+  -unless @clipping.url.blank?
+    %dt=:from.l
+    %dd
+      %a{"href"=>"#{h @clipping.url }", "title"=>"#{h @clipping.description }"}
+        = h truncate(@clipping.url, :length => 95)
+
+  -unless @clipping.description.blank?
+    %dt=:description.l
+    %dd=h @clipping.description
+
+  -if @clipping.tags.any?
+    %dt=:tags.l
+    %dd
+      %ul.list-unstyled
+        - @clipping.tags.each do |t|
+          %li
+            %a.label.label-info{:href => tag_url(t), :rel => 'tag'}
+              =fa_icon "tag inverse", :text => t.name
+
+%h2=:clipping_comments.l
+%h3=:add_your_comment.l
+= render :partial => 'comments/comment_form', :locals => {:commentable => @clipping}
+%a#newest_comment
+= render :partial => 'comments/comment', :collection => @clipping.comments
+%span#more_comments_links= more_comments_links(@clipping)

data/app/views/clippings/site_index.html.haml

@@ -1,34 +1,21 @@
 -@section = 'clippings'
-
-#yui-main
-  .yui-b    
-    -box do 
-      %h3
-        = params[:recent] ? :recent.l : :popular.l
-        Clippings
-
-      .clippings_grid
-
-        - @clippings.to_a.in_groups_of(2) do |group|
-          .row  
-            - group.compact.each do |clipping|
-              =render :partial => 'clippings/clipping', :locals => {:clipping => clipping}
-            .clear
-      
-      -if @clippings.total_count > 1      
-        .pagination=paginating_links @clippings
-      .clear
-      %br
+   
+-box do 
+  %h3
+    = params[:recent] ? :recent.l : :popular.l
+    Clippings
+  %ul.list-unstyled.thumbnails
+    - @clippings.each do |clipping|
+      %li.col-sm-3=render :partial => 'clippings/clipping', :locals => {:clipping => clipping}
+  -if @clippings.total_count > 1
+    =paginate @clippings, :theme => 'bootstrap'
           
-.yui-b  
-  -box do 
-    %h3  
-    
-    =:clippings_let_you_to_save_cool_images_from_around_the_web.l
-    -if logged_in?
-      =link_to :go_to_your_clippings_page_to_get_started.l, user_clippings_path(current_user)
-    -else
-      =:to_get_started_with_clippings_first.l+" " 
-      =link_to :create_an_account.l, signup_path
-  -box :class => "alt" do 
-    =link_to "#{:view.l} #{params[:recent] ? :popular.l : :recent.l} #{:clippings.l}", site_clippings_path(:recent => params[:recent] ? nil : 'true')
+-widget do 
+  =:clippings_let_you_to_save_cool_images_from_around_the_web.l
+  -if logged_in?
+    =link_to :go_to_your_clippings_page_to_get_started.l, user_clippings_path(current_user)
+  -else
+    =:to_get_started_with_clippings_first.l+" " 
+    =link_to :create_an_account.l, signup_path
+-widget do 
+  =link_to "#{:view.l} #{params[:recent] ? :popular.l : :recent.l} #{:clippings.l}", site_clippings_path(:recent => params[:recent] ? nil : 'true')

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

@@ -1,45 +1,45 @@
--if comment.pending?
-  %em This comment is awaiting approval
-
--if comment.user
-  .hentry{:id => "comment_#{comment.id}"}
-    .vcard.author
-      %h5= link_to image_tag(comment.user.avatar_photo_url(:thumb), :height => '50', :width => '50', :alt => "#{comment.user.login}"), user_path(comment.user), :rel => 'bookmark', :class => 'photo', :title => :users_profile.l(:user => comment.user.login)
-      %ul
-        %li.fn
-          = link_to comment.user.login, user_path(comment.user), :class => 'url'
-        %li.update
-          %a{"href"=> commentable_url(comment), "rel"=>"bookmark"}
-            %abbr.published{"title"=>"#{comment.created_at}"}
+%div{:id => "comment-#{comment.id}"}
+  -if comment.pending?
+    %em This comment is awaiting approval
+  -if comment.user
+    .clearfix
+      .col-sm-2.pull-right
+        .list-group
+          = link_to image_tag(comment.user.avatar_photo_url(:medium), :alt => comment.user.login, :class => "img-responsive"), user_path(comment.user), :rel => 'bookmark', :class => 'photo', :title => :users_profile.l(:user => comment.user.login), :class => 'list-group-item'
+          %a{:href => user_path(comment.user), :class => "list-group-item"}
+            =fa_icon "hand-o-right fw", :text => comment.user.login
+          %a{:href => commentable_url(comment), :rel => "bookmark", :class => "list-group-item"}
+            =fa_icon "calendar"
+            %abbr.published{:title => "#{comment.created_at}"}
               = I18n.l(comment.created_at, :format => :short_literal_date)
-        -if ( comment.can_be_deleted_by(current_user) )
-          %li.delete=link_to_remote(:delete.l, {:url => commentable_comment_path(comment.commentable_type, comment.commentable_id, comment), :method => :delete, 500 => 'alert(\'Sorry, there was a server error\'); return false',  :success => visual_effect(:fade, "comment_#{comment.id}"), :confirm => :are_you_sure_you_want_to_permanently_delete_this_comment.l} )
-        -if logged_in? && (current_user.admin? || current_user.moderator?)
-          %li.edit=link_to_remote :edit.l, :url => edit_commentable_comment_path(comment.commentable_type, comment.commentable_id, comment), :method => :get
-    .entry-content= comment.comment.html_safe
+          -if logged_in? && (current_user.admin? || current_user.moderator?)
+            =link_to fa_icon("pencil-square-o fw", :text => :edit.l), edit_commentable_comment_path(comment.commentable_type, comment.commentable_id, comment), :class => 'edit-via-ajax list-group-item'
+          -if ( comment.can_be_deleted_by(current_user) )
+            .delete
+              =link_to fa_icon("trash-o fw", :text => :delete.l), commentable_comment_path(comment.commentable_type, comment.commentable_id, comment), :method => :delete, 'data-confirm' => :are_you_sure_you_want_to_permanently_delete_this_comment.l, :remote => true, :class => "list-group-item"
 
--else
-  .hentry{:id => "comment_#{comment.id}"}
-    .vcard.author
-      %h5
-        %a{:href => '#', :rel => 'bookmark', :class => 'photo', :onclick => 'return false;'}
-          = image_tag(configatron.photo.missing_thumb, :height => '50', :width => '50')
-      %ul
-        %li.fn
-          =link_to_unless(comment.author_url.blank?, h(comment.username), h(comment.author_url)){ h(comment.username) }
-        %li.update
-          %a{"href"=> commentable_url(comment), "rel"=>"bookmark"}
-            %abbr.published{"title"=>"#{comment.created_at}"}
-              = I18n.l(comment.created_at, :format => :short_literal_date)
-        -if ( comment.can_be_deleted_by(current_user) )
-          %li.delete=link_to_remote(:delete.l, {:url => commentable_comment_path(comment.commentable_type, comment.commentable_id, comment), :method => :delete, 500 => 'alert(\'Sorry, there was a server error\'); return false',  :success => visual_effect(:fade, "comment_#{comment.id}"), :confirm => :are_you_sure_you_want_to_permanently_delete_this_comment.l} )
-        -if logged_in? && (current_user.admin? || current_user.moderator?)
-          %li.edit=link_to_remote :edit.l, :url => edit_commentable_comment_path(comment.commentable_type, comment.commentable_id, comment), :method => :get
+      = comment.comment.html_safe
 
-    .entry-content= comment.comment.html_safe
+  -else
+    .clearfix
+      .col-sm-3.pull-right
+        .list-group
+          %a{:href => '#', :rel => 'bookmark', :class => 'photo list-group-item', :onclick => 'return false;'}
+            = image_tag(configatron.photo.missing_thumb, :height => '50', :width => '50', :class => "img-responsive")
+          .list-group-item
+            -if comment.author_url.blank?
+              = h comment.username
+            -else
+              =link_to fa_icon('hand-o-right', :text => h(comment.username)), h(comment.author_url)
+          %a{:href=> commentable_url(comment), :rel => "bookmark", :class => "list-group-item"}
+            =fa_icon "calendar fw"
+            %abbr.published{:title => "#{comment.created_at}"}
+              = I18n.l(comment.created_at, :format => :short_literal_date)
+          -if logged_in? && (current_user.admin? || current_user.moderator?)
+            =link_to fa_icon("pencil-square-o fw", :text => :edit.l), edit_commentable_comment_path(comment.commentable_type, comment.commentable_id, comment), :class => 'edit-via-ajax list-group-item'
+          -if ( comment.can_be_deleted_by(current_user) )
+            =link_to fa_icon("trash-o fw", :text => :delete.l), commentable_comment_path(comment.commentable_type, comment.commentable_id, comment), :method => :delete, 'data-confirm' => :are_you_sure_you_want_to_permanently_delete_this_comment.l, :remote => true, :class => "list-group-item"
 
-- highlighted ||= nil
-- if highlighted
-  :javascript
-    =visual_effect :highlight, "comment_#{comment.id}", :duration => 1
+      = comment.comment.html_safe
 
+  %hr

data/app/views/comments/_comment_form.html.haml

@@ -1,50 +1,26 @@
 - if logged_in? || configatron.allow_anonymous_commenting
-  :javascript
-    function scrollToNewestComment(){
-      loc = document.location.toString();
-      if (loc.indexOf("#") != -1){
-        parts = loc.split('#')
-        loc = parts[0] + "#newest_comment"
-      } else {
-        loc = loc + "#newest_comment";
-      }
-      document.location.href = loc;
-    }
-      
-  .errors
-  = form_remote_for(:comment, @comment, :loading => "$$('div#comments div.errors')[0].innerHTML = ''; $('comment_spinner').show();", :before => "tinyMCE.activeEditor.save();", :url => commentable_comments_path(commentable.class.to_s.tableize, commentable), :html => {:id => 'new_comment_form', :class => "MainForm"}) do |f|
-    %label
-      %em=:comment_character_limit.l
-    
-    = f.text_area :comment, {:size => "86x5", :class => "rich_text_editor"}
-    
-    - if !logged_in? && configatron.recaptcha_pub_key && configatron.recaptcha_priv_key 
-      .right{:style => 'margin-top:2em;'}= recaptcha_tags :ajax => true
-      %label{"for"=>"comment[author_name"}
-        =:name.l
-        %em="(#{:optional.l})"
-      = f.text_field :author_name, :size => 35
-      %label{"for"=>"comment[author_email"}
-        ="#{:email.l}:"
-        %em="(#{:comment_author_email_required.l})"
-      = f.text_field :author_email, :size => 35        
-      %br
-      %label 
-        =f.check_box :notify_by_email, :style => 'width: 10px;'
-        =:notify_me_of_follow_ups_via_email.l
+
+  = bootstrap_form_for(:comment, :url => commentable_comments_path(commentable.class.to_s.tableize, commentable), :remote => true, :layout => :horizontal, :html => {:id => 'comment'}) do |f|
+    = f.text_area :comment, :rows => 5, :style => 'width: 99%', :class => "rich_text_editor", :help => :comment_character_limit.l
+
+    - if !logged_in? && configatron.recaptcha_pub_key && configatron.recaptcha_priv_key
+      = f.text_field :author_name
+      = f.text_field :author_email, :required => true
+
+      = f.form_group do
+        =f.check_box :notify_by_email, :label => :notify_me_of_follow_ups_via_email.l
         -if commentable.respond_to?(:send_comment_notifications?) && !commentable.send_comment_notifications?
-          %em="(#{:comment_notifications_off.l})"
-      
-      %label{"for"=>"comment[author_url"}
-        =:comment_web_site_label.l
-        %em="(#{:optional.l})"
-      = f.text_field :author_url, :size => 35
+          %p.help-block= :comment_notifications_off.l
+
+      = f.text_field :author_url, :label => :comment_web_site_label.l
+
+      = f.form_group do
+        = recaptcha_tags :ajax => true
+
+    = f.form_group :submit_group do
+      = f.primary :add_comment.l, data: { disable_with: "Please wait..." }
 
-    
-    %p
-      = submit_tag :add_comment.l
-      = image_tag 'spinner.gif', :plugin => "community_engine", :style => 'display:none;', :id => 'comment_spinner'
 - else
-  = link_to :log_in_to_leave_a_comment.l, new_commentable_comment_path(commentable.class, commentable.id)
-  = :or.l
-  = link_to :create_an_account.l, signup_path
+  .btn-group
+    = link_to :log_in_to_leave_a_comment.l, new_commentable_comment_path(commentable.class, commentable.id), :class => 'btn btn-primary'
+    = link_to :create_an_account.l, signup_path, :class => 'btn btn-primary'

data/app/views/comments/_edit_form.html.haml

@@ -1,29 +1,14 @@
-= form_remote_for(:comment, @comment, :loading => "$$('#comment_#{comment.id} .errors')[0].innerHTML = '';", :before => "tinyMCE.activeEditor.save();", :url => {:controller => 'comments', :action => 'update', :id => comment.id}, :method => :put, :html => {:id => "edit_comment_#{comment.id}_form", :class => "MainForm"}) do |f|
-  .errors
-  %label
-    %em=:comment_character_limit.l
-  = f.text_area :comment, {:size => "86x5", :class => "rich_text_editor"}  
-  
-  %label{"for"=>"comment[author_name"}
-    =:name.l
-    %em="(#{:optional.l})"
-  = f.text_field :author_name, :size => 35
-  %label{"for"=>"comment[author_email"}
-    ="#{:email.l}:"
-    %em="(#{:comment_author_email_required.l})"
-  = f.text_field :author_email, :size => 35        
-  %br
-  %label 
-    =f.check_box :notify_by_email, :style => 'width: 10px;'
-    =:notify_me_of_follow_ups_via_email.l
+= bootstrap_form_for @comment, :url => {:controller => 'comments', :action => 'update', :id => comment.id}, :html => {:id => "edit_comment_#{comment.id}_form", :layout => :horizontal, :class => "submit-via-ajax"} do |f|
+  = f.text_area :comment, :rows => 5, :style => 'width: 99%;', :class => "rich_text_editor", :id => "comment_#{comment.id}_comment", :required => false
+  %p.help-block= :comment_character_limit.l
+  -if !logged_in? && configatron.allow_anonymous_commenting
+    = f.text_field :author_name
+    = f.text_field :author_email
     -if comment.commentable.respond_to?(:send_comment_notifications?) && !comment.commentable.send_comment_notifications?
-      %em="(#{:comment_notifications_off.l})"
-  
-  %label{"for"=>"comment[author_url"}
-    =:comment_web_site_label.l
-    %em="(#{:optional.l})"
-  = f.text_field :author_url, :size => 35
-  
-  %p
-    = submit_tag :add_comment.l
-    = link_to_remote :cancel.l, :url => {:controller => 'comments', :action => 'edit', :id => comment.id, :cancel => true}, :method => :get    
+      =f.check_box :notify_by_email, :label => :notify_me_of_follow_ups_via_email.l
+      %p.help-block=:comment_notifications_off.l
+    -else
+      =f.check_box :notify_by_email, :label => :notify_me_of_follow_ups_via_email.l
+    = f.text_field :author_url
+  = f.primary :save.l
+  = link_to :cancel.l, {:controller => 'comments', :action => 'edit', :id => comment.id, :cancel => true}, :class => 'btn btn-default edit-via-ajax'

data/app/views/comments/create.js.erb

@@ -0,0 +1,25 @@
+<% if @comment.new_record? %>
+  comment = $('#comment');
+  comment.prepend("<%= escape_javascript(render 'shared/messages') %>");
+  comment.scrollTo();
+<% else %>
+  <% if @comment.user && @comment.user.facebook? %>
+    FB.ui(<%= raw FacebookPublisher.comment_created_hash(truncate_words(@comment.comment), commentable_url(@comment)) %>)
+  <% end %>
+
+  $('#newest_comment').after("<%= escape_javascript(render(:partial => 'comments/comment', :formats => [:html], :locals => {:comment => @comment})) %>");
+  tinyMCE.activeEditor.setContent('');
+  $('#comment-<%= @comment.id.to_s %>').scrollTo();
+<% end %>
+
+<% unless configatron.recaptcha_pub_key.blank? %>
+  $('#dynamic_recaptcha').each(function(){
+    Recaptcha.create('<%= configatron.recaptcha_pub_key %>', this )
+  });
+<% end %>
+
+if (typeof($.CE.commentCreatedCallback) != 'undefined'){
+  $.CE.commentCreatedCallback('<%= @comment.id %>')
+}
+
+

data/app/views/comments/destroy.js.erb

@@ -0,0 +1,3 @@
+$('#comment-<%= @comment.id.to_s %>').hide('slow', function () {
+  $(this).remove()
+});

data/app/views/comments/edit.js.erb

@@ -0,0 +1,11 @@
+<% if params[:cancel] %>
+  $('#comment-<%= @comment.id %>').replaceWith("<%= escape_javascript(render :partial => 'comments/comment', :formats => [:html], :locals => {:comment => @comment, :highlighted => true}) %>")
+<% else %>
+  $('#comment-<%= @comment.id %>').html("<%= escape_javascript(render :partial => 'comments/edit_form', :locals => {:comment => @comment}) %>");
+  $('#comment-<%= @comment.id %>').scrollTo();
+  <%= tiny_mce_js.html_safe %>
+<% end %>
+
+if (typeof($.CE.commentUpdatedCallback) != 'undefined'){
+  $.CE.commentUpdatedCallback('<%= @comment.id %>')
+}

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

@@ -1,23 +1,13 @@
-.yui-b
-  = render :partial => 'posts/author_profile', :locals => {:user => @user} if @user
-
-#yui-main
-  -box :class => 'yui-b hfeed comments', :id => 'comments' do
-  
-  
-    %h3
-      = :comments.l + " -"
-      = link_to @title, @back_url
-
-    - if @comments.empty?
-      #emptycomments= :no_comments_found.l_with_args(:type => @commentable.class.to_s.underscore)
-
-
-    %a#newest_comment
-      = render :partial => 'comments/comment', :collection => @comments
-
-    =paginate @comments
-
-    %h3=:add_your_comment.l
-    %p= render :partial => 'comments/comment_form', :locals => {:commentable => @commentable}  
+= render :partial => 'posts/author_profile', :locals => {:user => @user} if @user
+-@page_title = :comments.l + " on " + @title
+
+- if @comments.empty?
+  = :no_comments_found.l_with_args(:type => @commentable.class.to_s.underscore)
+-else 
+  %a
+    = render :partial => 'comments/comment', :collection => @comments
+  =paginate @comments, :theme => 'bootstrap'
+
+%h3=:add_your_comment.l
+%p= render :partial => 'comments/comment_form', :locals => {:commentable => @commentable}  
       

data/app/views/comments/update.js.erb

@@ -0,0 +1,14 @@
+<% if @comment.nil? %>
+  comment = $('#comment-<%= params[:id].to_s %>');
+  comment.prepend("<%= escape_javascript(render 'shared/messages') %>");
+  comment.scrollTo();
+<% elsif @comment.errors.any? %>
+  comment = $('#comment-<%= @comment.id.to_s %>');
+  comment.prepend("<%= escape_javascript(render 'shared/messages') %>");
+  comment.scrollTo();
+<% else %>
+  $('#comment-<%= @comment.id %>').replaceWith("<%= escape_javascript(render :partial => 'comments/comment', :formats => [:html], :locals => {:comment => @comment, :highlighted => true}) %>")
+  if (typeof($.CE.commentUpdatedCallback) != 'undefined'){
+    $.CE.commentUpdatedCallback('<%= @comment.id %>')
+  }
+<% end %>