community_engine 2.3.2 → 3.0.0

data/app/views/polls/_edit.html.haml

@@ -1,15 +1,11 @@
-%label{:for => 'poll_question'} 
-  =:question.l
-  %br
+.form-group
+  %label.control-label{:for => 'poll_question'}
+    =:question.l
   =text_field_tag 'poll[question]', poll.question, :class => 'text'
 
-%br
-%label
-  =:choices.l
+.form-group
+  %label.control-label
+    =:choices.l
   %ol#options
     -poll.choices.each do |choice|
       %li= text_field_tag "choices[]", choice.description, :class => 'text'
-  
-%br
-%br
-%hr

data/app/views/polls/_excerpt.html.haml

@@ -1,4 +1,3 @@
-.poll_excerpt
-  = image_tag 'icons/poll.png', :plugin => 'community_engine'
-  = poll.question
-  = link_to :vote_now.l, new_vote_path(:post_id => poll.post.id), {:title => 'Log in to vote', :class => 'vote'}
+= fa_icon "signal"
+= poll.question
+= link_to :vote_now.l, new_vote_path(:post_id => poll.post.id), {:title => 'Log in to vote', :class => 'vote'}, :class => 'btn btn-xs btn-primary'

data/app/views/polls/_new.html.haml

@@ -1,10 +1,11 @@
-%label{:for => 'poll_question'} 
-  =:question.l
-=text_field_tag 'poll[question]', nil, :class => 'text'
+.form-group
+  %label.control-label{:for => 'poll_question'}
+    =:question.l
+  =text_field_tag 'poll[question]', nil, :class => 'text'
+.form-group
+  %label.control-label
+    =:choices.l
+    %ul.list#options
+      -3.times do
+        %li= text_field_tag 'choices[]', nil, :class => 'text'
 
-%label
-  =:choices.l
-%ul.list#options
-  -3.times do
-    %li= text_field_tag 'choices[]', nil, :class => 'text'
-        

data/app/views/polls/_poll_ui.html.haml

@@ -1,37 +1,33 @@
-.clear
-.poll{:id => "poll_ui_#{poll.id}"}
-  - has_voted = logged_in? && poll.voted?(current_user)
+- has_voted = logged_in? && poll.voted?(current_user)
 
-  %table.poll
-    %thead
-      %tr
-        %th{:colspan => 2}
-          .right
-            =:total_votes.l
-            = poll.votes.size
-          = poll.question
-    -poll.choices.each do |choice|
+.clearfix
+  %h2
+    = poll.question
+    %small
+      =:total_votes.l
+      %span.badge.badge-info
+        = poll.votes.size
+        
+  %table.table.poll
+    -poll.choices.each do |choice|     
       %tr
+        
         -if @is_current_user || has_voted
-          %td.bars
-            .bar-container
-              .bar{:style => "width:#{choice.votes_percentage}%"}
-                ="#{choice.votes_percentage}%"
-        %td
-          - if logged_in? && !has_voted
-            = link_to_remote :vote.l, { :url => votes_path(:choice_id => choice), :method => :post, :loading => "$$('table.poll').invoke('addClassName', 'loading')"}, {:title => :vote.l, :class => 'vote'} 
-          - elsif !logged_in?
-            = link_to :vote.l, new_vote_path(:post_id => poll.post.id), {:title => :log_in_to_vote.l, :class => 'vote'}
-          = choice.description
-    -if !has_voted
-      %tr
-        %td{:colspan => 2}
-          %small.quiet= :you_must_vote_to_see_the_results.l
-    -elsif logged_in?
-      %tr
-        %td{:colspan => 2}
-          %small.quiet= :you_have_already_voted.l
-      
-
-.clear
-%br
+          %td
+            .progress
+              .progress-bar.progress-bar-success{:style => "width:#{choice.votes_percentage}%"}
+                =choice.votes_percentage
+                \%
+        -else
+          %td
+            - if logged_in? && !has_voted
+              = link_to :vote.l, votes_path(:choice_id => choice), :method => :post, :class => 'act-via-ajax'
+            - elsif !logged_in?
+              = link_to :vote.l, new_vote_path(:post_id => poll.post.id), {:title => :log_in_to_vote.l, :class => 'vote'}
+        %td= choice.description
+  -if !has_voted
+    %p
+      = :you_must_vote_to_see_the_results.l
+  -elsif logged_in?
+    %p
+      = :you_have_already_voted.l

data/app/views/posts/_author_profile.html.haml

@@ -1,21 +1,22 @@
--box :class => 'alt first_alt' do
-  %h3=:author.l
-  %dl.vcard
-    %dt.photo
-      = link_to tag(:img, :src => user.avatar_photo_url(:thumb), "height"=>"50", "alt"=>"#{user.login}", "width"=>"50" ), user_path(user), :title => "#{user.login}'s"+ :profile.l
-    %dd.fn
+-widget do
+  %h4
+    .small=:author.l
+  %ul.list-unstyled
+    %li
+      = link_to tag(:img, :src => user.avatar_photo_url(:medium), "alt"=>"#{user.login}", :class => "img-responsive"), user_path(user), :title => "#{user.login}'s"+ :profile.l
+    %li
       = link_to user.login, user_path(user), :class => 'url'
       -if user.featured_writer?      
         %small=:featured_writer.l
-    %dd
+    %li
     - if user.description
       = truncate_words( user.description, 12, '...')
-    %dd.member
+    %li
       =:member_since.l+" #{I18n.l(user.created_at, :format => :short_published_date)}"
-    %dd.post
+    %li
       - if user.posts.count == 1
         = link_to :singular_posts.l(:count => user.posts.count), user_posts_path(user)
       - else
         = link_to :plural_posts.l(:count => user.posts.count), user_posts_path(user)
-    %dd.rss
-      =link_to :rss_feed.l, user_posts_path(user, :format => :rss)
+    %li
+      =link_to fa_icon('rss', :text => :rss_feed.l), user_posts_path(user, :format => :rss)

data/app/views/posts/_favorited_post.html.haml

@@ -1,10 +1,8 @@
-.posts
-  .post{:id => "post_#{post.id}"}
-    = link_to image_tag( (post.image_for_excerpt), {:style=>"width:200px"} ), user_post_path(post.user, post)
-    %p
-      %strong= link_to post.title, user_post_path(post.user, post)
-      %br
-      %small.quiet= link_to :by.l(:login => post.user.login), user_path(post.user)
-      %br
-      = truncate_words(post.post, 7, '...' )
-      = link_to( '<small>&raquo;'+:more.l+'</small>', user_post_path(post.user, post))
+%h3
+  = link_to post.title, user_post_path(post.user, post)
+  %small= link_to :by.l(:login => post.user.login), user_path(post.user)
+
+= link_to image_tag(post.image_for_excerpt), user_post_path(post.user, post)
+%p
+  = truncate_words(post.post, 7, '...' )
+  = link_to :more.l, user_post_path(post.user, post))

data/app/views/posts/_form.html.haml

@@ -0,0 +1,40 @@
+-if @post.new_record?
+  -object = @post
+  -url = user_posts_path(@user)
+  -content_for :end_javascript do
+    :javascript
+      $(document).on('change', "#post_category_id", function(e){
+        $.post("#{categories_show_tips_path}?id="+$(this).val(), function(response) {
+          $("#category_tips").html(response);
+          $("#category_tips").effect('highlight', 500);
+        });
+      });
+-else
+  -object = [@user, @post]
+  -url = user_post_path(@user, @post)
+  -content_for :end_javascript do
+    :javascript
+      $(document).on('change', "#post_category_id", function(e){
+        $.get("#{category_tips_update_user_post_path(@user, @post)}?post_category_id="+$(this).val(), function(response) {
+          $("#category_tips").html(response);
+          $("#category_tips").effect('highlight', 500);
+        });
+      });
+
+= bootstrap_form_for(object, :url => url, :layout => :horizontal) do |f|
+  = f.text_field :title, :class => 'col-sm-6'
+  = f.collection_select(:category_id, Category.all, :id, :name, {}, {})
+  = f.text_area :raw_post, :rows => 15, :class => "rich_text_editor", :required => false
+  = f.text_field :tag_list, :autocomplete => "off", :label => :tags.l, :help => :optional_keywords_describing_this_post_separated_by_commas.l
+
+  -content_for :end_javascript do
+    = tag_auto_complete_field 'post_tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
+
+  = f.select :published_as, [[:published.l, 'live'], [:draft.l, 'draft']], :label => :save_post_as.l
+
+  = f.form_group :comments_group do
+    = f.check_box :send_comment_notifications
+
+  = f.form_group :submit_group do
+    = f.primary :save.l
+

data/app/views/posts/_menu_item.html.haml

@@ -0,0 +1,6 @@
+- if current_page?(popular_path)
+  - css_class = 'active'
+- else
+  - css_class = 'inactive'
+  
+%li{:class => css_class}= link_to :popular.l, popular_path

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

@@ -1,29 +1,32 @@
-.hentry
-  %h4.entry-title{:id=>"post_#{ post.id}"}
+.clearfix
+  %h3
     = link_to post.title, user_post_path(post.user, post), :rel => 'bookmark'
 
-  .vcard.author
-    %h5
-      %a{:href=>"#{user_post_path(post.user, post)}", :class=>"photo", :rel=>"bookmark"}
-        =image_tag((post.first_image_in_body || post.user.avatar_photo_url(:thumb)), :alt=>"", :width=>"50", :height=>"50")
-
-    %ul
-      %li.fn=link_to post.user.login, user_path(post.user)
-      %li.update
-        %a{:href=>"#{user_post_path(post.user, post)}", :rel=>"bookmark"}
-          %abbr.published{:title=>"#{post.published_at}"}= post.published_at_display(:short_literal_date)
-      %li.view
+  .col-sm-3.pull-right.col-sm-offset-9
+    .list-group
+      %a{:href => "#{user_post_path(post.user, post)}", :class => "photo list-group-item", :rel => "bookmark"}
+        =image_tag (post.first_image_in_body || post.user.avatar_photo_url(:medium)), :class => 'img-responsive'
+      %a{:href => "#{user_path(post.user)}", :class => "list-group-item"}
+        =fa_icon "hand-o-right"
+        =post.user.login
+      %a{:href=>"#{user_post_path(post.user, post)}", :rel=>"bookmark", :class => "list-group-item"}
+        =fa_icon "calendar"
+        %abbr.published{:title=>"#{post.published_at}"}= post.published_at_display(:short_literal_date)
+      %li.list-group-item
+        =fa_icon "eye"
         = :view_count.l
-        = "(#{post.view_count})"
-      %li.comments
-        = link_to :comments.l+" (#{post.comments.count})", user_post_path(post.user, post)+'#comments'      
+        %span.badge=post.view_count
+      %a{:href => user_post_path(post.user, post)+'#comments', :class => "list-group-item"}
+        =fa_icon "comment"
+        =:comments.l
+        %span.badge.badge-info=post.comments.count
       - if current_user and current_user.can_request_friendship_with(post.user)
-        %li.addfriend= add_friend_link(post.user)
+        .list-group-item
+          = add_friend_link(post.user)
+
+  = truncate_words(post.post, 75, '...' ).html_safe
+%p
+  = render :partial => 'polls/excerpt', :locals => {:poll => post.poll} if post.poll
+%p
+  = link_to :read_more.l, user_post_path(post.user, post), :rel=> 'bookmark'
 
-  .entry-content
-    = truncate_words(post.post, 75, '...' ).html_safe
-    
-    = render :partial => 'polls/excerpt', :locals => {:poll => post.poll} if post.poll
-    
-    %h6=link_to :read_more.l, user_post_path(post.user, post), :rel=> 'bookmark'
-  

data/app/views/posts/_send_to_friend.html.haml

@@ -0,0 +1,26 @@
+.modal-dialog
+  .modal-content
+    = form_tag send_to_friend_user_post_path(:user_id => params[:user_id], :id => params[:id]), :class => 'form form-horizontal submit-via-ajax', :id => 'send_to_friend_form' do
+      .modal-header
+        %button.close{:type => 'button', 'data-dismiss' => 'modal'}
+          %span{'aria-hidden' => true}
+            ×
+          %span.sr-only
+            Close
+        %h3= :send_this_story_to_friends.l
+      .modal-body
+        .form-group
+          %label.col-sm-4.control-label= :enter_a_message.l
+          .col-sm-5
+            = text_area_tag :message, :this_story_is_awesome.l, :class => "form-control"
+        .form-group
+          %label.col-sm-4.control-label=:enter_e_mail_addresses_comma_sep.l
+          .col-sm-5
+            = text_area_tag :emails, '', :class => "form-control"
+          .col-sm-3
+            %a{:href => '#', :onclick => "showPlaxoABChooser('emails', '/base/plaxo'); return false;"}
+              = image_tag "http://www.plaxo.com/images/abc/buttons/add_button.gif", :alt => :add_from_my_address_book.l
+      .modal-footer
+        = ajax_spinner_for 'send_to_friend_form'
+        %button.btn.btn-default{"data-dismiss" => "modal", :type => "button"} Close
+        = submit_tag :send.l, :class => 'btn btn-primary'

data/app/views/posts/edit.html.haml

@@ -1,51 +1,14 @@
-.yui-b
-  -box :id => 'category_tips' do
-    - if @post.category
-      = render :partial => "categories/tips", :locals => {:category => @post.category}
-    - else
-      = render :partial => "categories/tips", :locals => {:category => nil}
+-@page_title = :editing_post.l
 
-#yui-main
-  .yui-b
-    -box do
-      %h3=:editing_post.l
+-widget :id => 'category_tips' do
+  - if @post.category
+    = render :partial => "categories/tips", :locals => {:category => @post.category}
+  - else
+    = render :partial => "categories/tips", :locals => {:category => nil}
 
-      = error_messages_for :post
-      = form_for(:post, :url => user_post_path(@user, @post), :html => { :method => :put, :class =>'MainForm' }) do |f|
-        %label
-          =:title.l
-          %em= '('+:required.l+')'
-        = f.text_field :title
-        %label
-          =:category.l
-          \:
-        = f.collection_select(:category_id, Category.find(:all), :id, :name, {}, {})
-        %label
-          =:body_text.l
-          %em= '('+:required.l+')'
-        = f.text_area :raw_post, :size => "86x15", :class => "rich_text_editor"
-        %label
-          =:tags.l
-          %em="(#{:optional_keywords_describing_this_post_separated_by_commas.l})"
-        = text_field_tag 'tag_list', @post.tag_list.to_s, {:autocomplete => "off", :size => 35}
-        #tag_list_auto_complete.auto_complete
-        -content_for :end_javascript do
-          = auto_complete_field 'tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
+%p
+  =link_to :back.l, manage_user_posts_path(@post.user), :class => 'btn btn-default'
+  =link_to :show.l, user_post_path(@post.user, @post), :class => 'btn btn-primary'
+  =link_to :delete.l, user_post_path(@post.user, @post), :method => 'delete', data: { confirm: :are_you_sure.l }, :class => 'btn btn-danger'
 
-        %label=:save_post_as.l
-        = f.select(:published_as, [[:published.l, 'live'], [:draft.l, 'draft']])
-
-        %label
-          = f.check_box :send_comment_notifications
-          =:send_comment_notifications.l
-
-
-        %p
-          = submit_tag :update.l
-          = :or.l
-          =link_to :cancel.l, user_post_path(current_user, @post)
-        %p
-          =link_to "#{image_tag 'icons/delete.png', :plugin => :community_engine} #{:delete_this_post.l}".html_safe, user_post_path(current_user, @post), :method => :delete, :confirm => :are_you_sure_you_want_to_delete_this_post.l
-
-  -content_for :end_javascript do
-    = observe_field  "post_category_id", {:url => {:action => 'category_tips_update'}, :method => :get, :with => "post_category_id", :update => "category_tips", :complete => visual_effect(:highlight, "category_tips", :duration => 0.5)}
+= render 'form'

data/app/views/posts/featured.html.haml

@@ -1,19 +1,14 @@
 -@section = 'posts'
+-@page_title = :featured_posts.l
 
-.yui-b
-
-  -box :class => "alt first_alt" do 
-    %h3= :featured_writers.l
+-widget do
+  %h4
+    .small= :featured_writers.l
+  %ul.list-unstyled
     - @featured_writers.each do |user|
       = render :partial => "users/sidebar_user", :locals => {:user => user}
 
-#yui-main
-  .yui-b
-    -box :class => "hfeed" do 
-      %h3=:featured_posts.l
+= render :partial => 'posts/post', :collection => @posts
+= paginate @posts, :theme => 'bootstrap'
 
-      .pagination=paginating_links @posts if @posts.total_count > 1
 
-      = render :partial => 'posts/post', :collection => @posts
-  
-  

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

@@ -1,23 +1,19 @@
-.yui-b
-  = render :partial => 'author_profile', :locals => {:user => @user}
+-@page_title = :users_blog.l(:user => @user.login)
+= render :partial => 'author_profile', :locals => {:user => @user}
 
-  - unless @popular_posts.empty?
-    -box :id => "posts", :class => 'alt' do
-      %h3=:popular_posts.l
-      %ul.list.page
-        - @popular_posts.each do |post|
-          %li= link_to truncate(post.title, :length => 75), user_post_path(@user, post)
+- unless @popular_posts.empty?
+  -widget :id => "posts" do
+    %h4
+      .small=:popular_posts.l
+    %ul.list-unstyled
+      - @popular_posts.each do |post|
+        %li= link_to truncate(post.title, :length => 75), user_post_path(@user, post)
 
-#yui-main
-  .yui-b
-    -box :class => "posts hfeed" do 
-      %h3
-        = link_to :users_blog.l(:user => @user.login), user_posts_path(@user)
-        = @category ? "» #{link_to(@category.name.upcase, users_posts_in_category_path(@user, @category.name))}".html_safe : ''
+%h2
+  = @category ? "» #{link_to(@category.name.upcase, users_posts_in_category_path(@user, @category.name))}".html_safe : ''
 
-      = link_to( :new_post.l, new_user_post_path(@user), {:class => "right"})  if @is_current_user
-      %br
+= link_to( :new_post.l, new_user_post_path(@user), {:class => "right"})  if @is_current_user
 
-      = render :partial => 'post', :collection => @posts
+= render :partial => 'post', :collection => @posts
 
-      .pagination=paginating_links @posts if @posts.total_count > 1
+= paginate @posts, :theme => 'bootstrap'

data/app/views/posts/manage.html.haml

@@ -1,66 +1,51 @@
-.yui-b.sidebar
-  -box do 
-    %h3=:links.l
-    %ul.checks
-      %li=link_to :view_my_blog.l, user_posts_path(current_user)
-      %li=link_to :new_post.l, new_user_post_path(current_user)    
-      
-  -box do
-    %h3=:search.l
-    = form_for @search, :url => manage_user_posts_path(current_user), :html => {:class => "MainForm"} do |f|
-    
-      %label= :title.l
-      = f.text_field :title_like
+-@page_title = :manage_posts.l
 
-      %p
-        %label= :category.l
-        = f.select :category_id_equals, Category.all.collect{|c| [c.name, c.id]}, :include_blank => true
+-widget do
+  %h3=:search.l
+  = bootstrap_form_for @search, :url => manage_user_posts_path(current_user), :html => {:class => "form"} do |f|
+    = f.text_field :title_cont, :label => :title.l
 
-      %p
-        %label= :status.l
-        = f.select :published_as_equals, [['Published','live'], ['Draft','draft']], :include_blank => true
+    = f.select :category_id_eq, Category.all.collect{|c| [c.name, c.id]}, :include_blank => true, :label => :category.l
+    = f.select :published_as_eq, [['Published','live'], ['Draft','draft']], :include_blank => true, :label => :status.l
 
-      %p
-        %label= :show.l
-        = select_tag :size, options_for_select([['10',10], ['20',20], ['100',100]], params[:size].to_i )
+    .form-group
+      %label.control-label= :show.l
+      = select_tag :size, options_for_select([['10',10], ['20',20], ['100',100]], params[:size].to_i )
 
-      %p= f.submit :search.l
-  
+    = f.primary :search.l
 
-#yui-main
-  .yui-b
-    -box do 
-      %h3 
-        =:manage_posts.l
-      %p=:posts_saved_with_draft_status_wont_appear_in_your_blog_until_you_publish_them.l
-      
+%p=:posts_saved_with_draft_status_wont_appear_in_your_blog_until_you_publish_them.l
 
-      -if @posts.total_count > 1
-        = paginate @posts
+%table.table.table-bordered.table-striped
+  %tr
+    %th
+      =sort_link @search, :created_at, :date_created.l
+    %th
+      =sort_link @search, :published_at, :date_published.l
+    %th=:title.l
+    %th=:category.l
+    %th=:tags.l
+    %th=:comments.l
+    %th=:status.l
+    %th=:actions.l
+  - @posts.each do |post|
+    %tr
+      %td
+        %abbr{:title=>"#{post.created_at}"}= I18n.l(post.created_at, :format => :published_date)
+      %td
+        %abbr{:title=>"#{post.published_at}"}= post.published_at_display
+      %td
+        = link_to post.title, user_post_path(post.user, post)
+      %td= post.category ? post.category.name : :uncategorized.l
+      %td= post.tags.any? ? post.tag_list : :no_tags.l
+      %td= post.comments.count
+      %td= post.is_live? ? link_to(:published.l, user_post_path(post.user, post)) : :draft.l
+      %td
+        =link_to :show.l, user_post_path(post.user, post), :class => 'btn btn-default'
+        =link_to :edit.l, edit_user_post_path(post.user, post), :class => 'btn btn-warning'
+        =link_to :delete.l, user_post_path(post.user, post), :method => 'delete', data: { confirm: :are_you_sure.l }, :class => 'btn btn-danger'
+
+= paginate @posts, :theme => 'bootstrap'
+%p
+  =link_to :new_post.l, new_user_post_path(current_user), :class => 'btn btn-success'
 
-      %table{:border => 0, :width => '100%'}
-        %thead
-          %tr
-            %th
-              =sort_link @search, :created_at, :date_created.l
-            %th
-              =sort_link @search, :published_at, :date_published.l
-            %th=:title.l
-            %th=:category.l
-            %th=:tags.l
-            %th=:comments.l
-            %th=:status.l
-        %tbody
-          - @posts.each do |post|
-            %tr            
-              %td
-                %abbr{:title=>"#{post.created_at}"}= I18n.l(post.created_at, :format => :published_date)
-              %td
-                %abbr{:title=>"#{post.published_at}"}= post.published_at_display
-              %td
-                = link_to post.title, edit_user_post_path(post.user, post)
-                = link_to("(#{:preview.l})", user_post_path(post.user, post), :target => '_blank') unless post.is_live?
-              %td= post.category ? post.category.name : :uncategorized.l
-              %td= post.tags.any? ? post.tag_list : :no_tags.l
-              %td= post.comments.count
-              %td= post.is_live? ? link_to(:published.l, user_post_path(post.user, post)) : :draft.l