community_engine 2.3.2 → 3.0.0

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

@@ -1,67 +1,12 @@
-.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}
-    
-#yui-main
-  .yui-b
-    -box do 
-      %h3
-        =@post.category ? (:new_post_for_category.l :category => @post.category.name) : :new_post.l
+-@page_title = @post.category ? (:new_post_for_category.l :category => @post.category.name) : :new_post.l
 
-      = error_messages_for :post
-      = form_for(:post, :url => user_posts_path, :html => {:class => "MainForm", :id => 'post_form'}) do |f|			
-        - unless @post.category || @categories.blank?        
-          %label
-            =:category.l
-          %select{:id=>"post_category_id", :name=>"post[category_id]"}
-            -for category in @categories
-              %option{:value=>"#{category.id}"}= h(category.name)
-        -else
-          = f.hidden_field :category_id
+-widget :id => 'category_tips' do
+  -if @post.category
+    = render :partial => "categories/tips", :locals => {:category => @post.category}
+  - else 
+    = render :partial => "categories/tips", :locals => {:category => nil}
 
-        %label
-          =:title.l
-          %em="(#{:required.l})"
-        = f.text_field :title
+%p
+  =link_to :back.l, manage_user_posts_path(@user), :class => 'btn btn-default'
 
-        %label
-          =:body_text.l
-          %em="(#{:required.l})"
-        = f.text_area :raw_post, :style => "width:95%;", :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, {:autocomplete => "off", :size => 35}
-        .auto_complete#tag_list_auto_complete
-        
-        -content_for :end_javascript do        
-          = auto_complete_field 'tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
-        
-        %label
-          %a{:href=> "#", :onclick => "$('poll-ui').toggle(); return false;"}
-            = image_tag 'icons/poll.png'
-            = :add_a_poll.l
-          %em=:optional.l
-        #poll-ui{:style => 'display:none'}=render :partial => 'polls/new'
-
-        %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 :save.l
-        %p
-          =:or.l 
-          = link_to :cancel_and_go_back_to_my_posts.l, user_posts_path(@user)
-
-  -content_for :end_javascript do
-    = observe_field  "post_category_id", {:url => {:controller => 'categories', :action => 'show_tips'}, :with => "id", :update => "category_tips", :complete => visual_effect(:highlight, "category_tips", :duration => 0.5)}
+=render 'form'

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

@@ -1,35 +1,30 @@
 - @meta = { :description => :popular_posts_on.l+" #{configatron.community_name}",:keywords => "#{configatron.meta_keywords}", :robots => configatron.robots_meta_list_content}
 - @section = 'popular'
+- @page_title = :what_is_popular.l
 
-.yui-b
-  -box do 
-    - if logged_in?
-      %h3.signup= :get_popular.l
-      %ul.list.checks
-        %li=link_to :write_a_blog_post.l, new_user_post_path({:user_id => current_user})
-    - else
-      %h3.signup= :want_to_be_popular.l 
-      %ul.list.checks
-        %li
-          %a{:href=>signup_url, :title=>:sign_up_for_a_.l+" #{configatron.community_name} "+:account.l}=:sign_up_for_an_account.l
-          %br
-            %small
-              =:have_an_account.l
-              %a{:href=>login_url, :title=>:log_in_to_your.l+" #{configatron.community_name} "+:account.l}
-                »
-                =:log_in.l
+-widget do
+  - if logged_in?
+    %h4
+      .small= :get_popular.l
+    =link_to :write_a_blog_post.l, new_user_post_path({:user_id => current_user})
+  - else
+    %h4
+      .small= :want_to_be_popular.l
+    %a{:href=>signup_url, :title=>:sign_up_for_a_.l+" #{configatron.community_name} "+:account.l, :class => "list-group-item"}=:sign_up_for_an_account.l
+    %br
+      %small
+        =:have_an_account.l
+        %a{:href=>login_url, :title=>:log_in_to_your.l+" #{configatron.community_name} "+:account.l}
+          »
+          =:log_in.l
 
-  -box :class => "alt" do 
-    %h3= :this_month_best.l 
-    %ul.list.page    
-      - @monthly_popular_posts.each do |post|
-        =render :partial => 'posts/sidebar_post', :locals => {:post => post}
+-widget do
+  %h4
+    .small=:this_month_best.l
+  %ul.list-unstyled
+    - @monthly_popular_posts.each do |post|
+      =render :partial => 'posts/sidebar_post', :locals => {:post => post}
 
-#yui-main
-  .yui-b
-    -box :class => "hfeed" do 
-      %h3 
-        =:what_is_popular.l
-        %ul.subnav
-          %li= :looking_for_most_x.l :link => link_to("#{:most_recent.l}?", recent_path)
-      = render :partial => 'posts/post', :collection => @posts
+%ul
+  %li= :looking_for_most_x.l :link => link_to("#{:most_recent.l}?", recent_path)
+= render :partial => 'posts/post', :collection => @posts

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

@@ -1,27 +1,28 @@
-#yui-main
-  .yui-b
-    -box :class => 'hfeed' do  
-      %h3=:users_blog.l :user=>  @user.login
-      .hentry.main
-        %h4.entry-title= link_to @post.title, user_post_path(@user, @post), :rel => 'bookmark'
-        .vcard.author
-          %ul
-            %li.update
-              %a{"href"=>"#{user_post_path(@user, @post)}", "rel"=>"bookmark"}
-                %abbr.published{"title"=>"#{@post.published_at}"}= @post.published_at_display(:literal_date)
-            -if @is_current_user || admin? || moderator?
-              %li.edit= link_to :edit.l, edit_user_post_path(@post.user, @post)
-              %li.delete= link_to :delete.l, user_post_path(@post.user, @post), {:method => :delete, :confirm => :permanently_delete_this_post.l}
-              
-        / vcard
-        .entry-content
-          = @post.post
-          = render :partial => 'polls/poll_ui', :locals => {:poll => @post.polls.first} unless @post.polls.empty?
-          - unless @post.tags.empty?
-            %ul.tags
-              - @post.tags.each do |t|
-                %li=link_to( t.name, tag_url(t), :rel => 'tag')
-        / entry-content
+- @page_title = @post.title
+
+=render :partial => 'author_profile', :locals => {:user => @user}
+
+
+%h2= :users_blog.l :user=>  @user.login
+.clearfix
+  .col-sm-3.pull-right
+    .list-group
+      %a{:href => "#{user_post_path(@user, @post)}", :rel => "bookmark", :class => "list-group-item"}
+        =fa_icon "calendar fw"
+        %abbr.published{:title => "#{@post.published_at}"}= @post.published_at_display(:literal_date)
+      -if @is_current_user || admin? || moderator?
+        %a{:href => "#{edit_user_post_path(@post.user, @post)}", :class => "list-group-item"}
+          =fa_icon "pencil-square-o fw", :text => :edit.l
+        = link_to fa_icon("trash-o fw", :text => :delete.l), user_post_path(@post.user, @post), {:method => :delete, data: { confirm: :permanently_delete_this_post.l }, :class => "list-group-item"}
+
+  = @post.post
+= render :partial => 'polls/poll_ui', :locals => {:poll => @post.polls.first} unless @post.polls.empty?
+- unless @post.tags.empty?
+  .clearfix
+    %ul.list-unstyled
+      - @post.tags.each do |t|
+        %li
+          %a.label.label-info{:href => tag_url(t), :rel => 'tag'}
+            =fa_icon "tag inverse", :text => t.name
+
 
-.yui-b
-  =render :partial => 'author_profile', :locals => {:user => @user}

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

@@ -1,29 +1,22 @@
 - @section = 'posts'
-.yui-b
-  -box do 
-    - if logged_in?
-      %h3= :get_popular.l
-      %ul.list.checks
-        %li=link_to :write_a_blog_post.l, new_user_post_path({:user_id => current_user})
-    - else
-      %h3= :want_to_be_popular.l
-      %ul.list.checks
-        %li
-          %a{:href=>signup_url, :title=>:sign_up_for_a_.l+" #{configatron.community_name} "+:account.l}=:sign_up_for_an_account.l
-          %br
-            %small
-              =:have_an_account.l
-              %a{:href=>login_url, :title=>:log_in_to_your.l+" #{configatron.community_name} "+:account.l}
-                »
-                =:log_in.l
-#yui-main
-  .yui-b
-    -box :class => "hfeed" do 
-      %h3
-        =:recent_posts.l
-        %ul.subnav
-          %li= :looking_for_most_x.l :link => link_to("#{:most_popular.l}?", popular_path)
+- @page_title = :recent_posts.l
+- if logged_in?
+  -widget do
+    %p= :get_popular.l
+    %p=link_to :write_a_blog_post.l, new_user_post_path({:user_id => current_user})
+- else
+  -widget do
+    %p= :want_to_be_popular.l
+    %p=link_to :sign_up_for_an_account.l, signup_url
+    %p=:have_an_account.l
+    %p
+      %a{:href=>login_url, :title=>:log_in_to_your.l+" #{configatron.community_name} "+:account.l}
+        »
+        =:log_in.l
 
-      = render :partial => 'posts/post', :collection => @posts      
-      
-      .pagination=paginating_links @posts
+%ul.subnav
+  %li= :looking_for_most_x.l :link => link_to("#{:most_popular.l}?", popular_path)
+
+= render :partial => 'posts/post', :collection => @posts      
+
+=paginate @posts, :theme => 'bootstrap'

data/app/views/posts/send_to_friend.js.erb

@@ -0,0 +1,3 @@
+$('#emails').val('');
+$('#send_to_friend .modal-body').prepend("<%= (render 'shared/messages').gsub('"', '\\"').gsub("\n", "").html_safe %>");
+$('#send_to_friend_form_spinner').addClass("hide");

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

@@ -5,87 +5,78 @@
 - @section = (@post.category && @post.category.name)
 - @meta = { :title => "#{@post.title}", :description => "#{truncate_words(@post.post, 75, '...' )}", :keywords => "#{@post.tags.join(", ") unless @post.tags.nil?}", :robots => configatron.robots_meta_show_content }
 
-#yui-main
-  .yui-b
-    -box :class => 'hfeed' do  
-      %h3=:users_blog.l :user=>  @user.login
-      .hentry.main
-        %h4.entry-title= link_to @post.title, user_post_path(@user, @post), :rel => 'bookmark'
-        .vcard.author
-          %ul
-            %li.update
-              %a{"href"=>"#{user_post_path(@user, @post)}", "rel"=>"bookmark"}
-                %abbr.published{"title"=>"#{@post.published_at}"}= @post.published_at_display(:literal_date)
-            %li.view= "#{:view_count.l} (#{@post.view_count})"
-            %li.comments= link_to "#{:comments.l} (#{@post.comments.count})", user_post_path(@user, @post), :anchor => 'comments'                  
-            - if current_user and current_user.can_request_friendship_with(@post.user)
-              %li.addfriend= add_friend_link(@post.user)
-            %li.print
-              %a{"href"=>"#", :onclick=>"window.print(); return false;", :title=>:print_this_story.l}= :print.l
-            %li.email
-              %a{:href=>"#", :title=>:email_this_story_to_friends.l}= :email_to_friends.l
-            %li.share
-              %script{:type=>"text/javascript", :src=>"http://w.sharethis.com/widget/?tabs=web&charset=utf-8&style=default&publisher=4488bdef-d776-4c80-93e1-ac1fb8359971&linkfg=%23131358&button=false"}
-              =sharethis_options(@post)
-            -if @is_current_user || admin? || moderator?
-              %li.edit= link_to :edit.l, edit_user_post_path(@post.user, @post)
-              %li.delete= link_to :delete.l, user_post_path(@post.user, @post), {:method => :delete, :confirm => :permanently_delete_this_post.l}
+#send_to_friend.modal.fade{:role => 'dialog', "aria-hidden" => "true", :"aria-labelledby" => "send_to_friend_label", :tabindex => "-1", :style => 'padding-top: 60px;'}
 
-              
-          -content_for :end_javascript do
-            :javascript
-              Event.observe( window, 'load', function() { 
-                $$(".email").invoke('observe', 'click', showSendToFriend);
-              });      
+=render :partial => 'author_profile', :locals => {:user => @user}
 
-            
-              function showSendToFriend(){
-                if ($('send_to_friend')){
-                  new Lightbox.base('send_to_friend');				                
-                } else {
-                  #{remote_function(:url => { :action => "send_to_friend", :params => {:user_id => @user.id, :id => @post.id} }, :success => "new Insertion.Top($('bd'), request.responseText)", :complete => "new Lightbox.base('send_to_friend'); return false;Element.toggle('send_to_friend');", :method => 'post')}
-                }}
-              
-        / vcard
-        .entry-content
-          = @post.post.html_safe
-          = render :partial => 'polls/poll_ui', :locals => {:poll => @post.polls.first} unless @post.polls.empty?
-          - unless @post.tags.empty?
-            %ul.tags
-              - @post.tags.each do |t|
-                %li=link_to( t.name, tag_url(t), :rel => 'tag')
-        / entry-content
-      / ends hentry
-      
-    -box :class => 'hfeed comments', :id => 'comments' do      
-      %h3= :post_comments.l 
-      %h2= :add_your_comment.l
-      = render :partial => 'comments/comment_form', :locals => {:commentable => @post}
-      %a#newest_comment
-      = render :partial => 'comments/comment', :collection => @comments
-      %span#more_comments_links= more_comments_links(@post)
-    / ends box
-  / yui-b
-/ ends yui-main
+- unless @related.empty?
+  -widget do
+    %h4
+      .small=:related_posts.l
+    %ul.list-unstyled
+      - @related.each do |post|
+        %li=link_to truncate(post.title, :length => 75), user_post_path(post.user, post)
 
-.yui-b
-  =render :partial => 'author_profile', :locals => {:user => @user}
+- unless @popular_posts.empty?
+  -widget 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(post.user, post)
 
-  - unless @related.empty?
-    -box :class => 'alt' do
-      %h3=:related_posts.l
-      %ul.list.page
-        - @related.each do |post|
-          %li=link_to truncate(post.title, :length => 75), user_post_path(post.user, post)      
+%h2=:users_blog.l :user=>  @user.login
+.clearfix
+  .pull-right.col-sm-3
+    .list-group
+      %a.list-group-item{:href => "#{user_post_path(@user, @post)}", :rel => "bookmark"}
+        =fa_icon "calendar fw"
+        %abbr.published{:title => "#{@post.published_at}"}= @post.published_at_display(:literal_date)
+      %li.list-group-item
+        =fa_icon "eye fw", :text => :view_count.l
+        %span.badge= @post.view_count
+      %a.list-group-item{:href => "#{user_post_path(@user, @post)}", :name => 'comments'}
+        =fa_icon "comment fw", :text => :comments.l
+        %span.badge.badge-info=@post.comments.count
+      - if current_user and current_user.can_request_friendship_with(@post.user)
+        %li.list-group-item
+          = add_friend_link(@post.user)
+      %a.list-group-item{:href => "#", :onclick=>"window.print(); return false;", :title=>:print_this_story.l}
+        =fa_icon "print fw", :text => :print.l
+      %a.email.list-group-item{:href => "#", :title => :email_this_story_to_friends.l}
+        =fa_icon "envelope fw", :text => :email_to_friends.l
+      %li.list-group-item
+        %script{:type=>"text/javascript", :src=>"http://w.sharethis.com/widget/?tabs=web&charset=utf-8&style=default&publisher=4488bdef-d776-4c80-93e1-ac1fb8359971&linkfg=%23131358&button=false"}
+        =sharethis_options(@post)
+      -if @is_current_user || admin? || moderator?
+        %a.list-group-item{:href => "#{edit_user_post_path(@post.user, @post)}"}
+          =fa_icon "pencil-square-o fw", :text => :edit.l
+        = link_to fa_icon("trash-o fw", :text => :delete.l), user_post_path(@post.user, @post), {:method => :delete, data: { confirm: :permanently_delete_this_post.l }, :class => "list-group-item"}
+  = @post.post.html_safe
+/ clearfix
 
-  - unless @popular_posts.empty?
-    -box :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(post.user, post)      
-/ sidebar
+= render :partial => 'polls/poll_ui', :locals => {:poll => @post.polls.first} unless @post.polls.empty?
+- unless @post.tags.empty?
+  .clearfix
+    %ul.list-unstyled
+      - @post.tags.each do |t|
+        %li
+          %a.label.label-info{:href => tag_url(t), :rel => 'tag'}
+            =fa_icon "tag inverse", :text => t.name
+
+%h2= :post_comments.l
+%h3= :add_your_comment.l
+= render :partial => 'comments/comment_form', :locals => {:commentable => @post}
+%a#newest_comment
+= render :partial => 'comments/comment', :collection => @comments
+%span#more_comments_links= more_comments_links(@post)
 
 -content_for :end_javascript do
   :javascript
-    #{remote_function :url => update_views_user_post_path(@post.user, @post), :method => :put}
+    $('.email').on('click', function(e){
+      e.preventDefault();
+      $.post("#{send_to_friend_user_post_path(:user_id => @user.id, :id => @post.id)}", function(response){
+        $('#send_to_friend').html(response);
+      });
+      $('#send_to_friend').modal();
+    });

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

@@ -0,0 +1,3 @@
+= bootstrap_form_for([@event, @rsvp], :layout => :horizontal) do |f|
+  = f.text_field :attendees_count, :label => :number_of_attendees.l
+  = f.primary :update.l

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

@@ -1,9 +1,3 @@
--box do
-  %h3= :edit_rsvp_for.l + ' ' + @event.name
-  = error_messages_for :rsvp
-  = form_for(:rsvp, :url => [@event, @rsvp], :html => {:method => :put, :class => "MainForm"} ) do |f|
-    %label=:number_of_attendees.l
-    = f.text_field :attendees_count
-    %p
-      = submit_tag :update.l
-  = link_to :back.l, [@event]
+-@page_title= :edit_rsvp_for.l + ' ' + @event.name
+
+= render 'form'

data/app/views/rsvps/new.html.haml

@@ -1,9 +1,3 @@
--box do
-  %h3= :rsvp_for.l + ' ' + @event.name
-  = error_messages_for :rsvp
-  = form_for(:rsvp, :url => [@event, @rsvp], :html => {:class => "MainForm"} ) do |f|
-    %label=:number_of_attendees.l
-    = f.text_field :attendees_count
-    %p
-      = submit_tag :create.l
-  = link_to :back.l, [@event]
+-@page_title= :rsvp_for.l + ' ' + @event.name
+
+=render 'form'

data/app/views/sb_posts/_dummy_forum_post.html.haml

@@ -0,0 +1,13 @@
+%tr
+  %td
+    =fa_icon "comment"
+  %td
+    = link_to h(post.title), user_post_path(post.user, post), :class => "entry-title", :rel => "bookmark", :target => '_blank'
+  %td
+    = post.comments.count
+  %td
+    = number_with_delimiter(post.view_count)
+  %td
+    \by
+    %strong
+      = h(post.user.display_name)