community_engine 2.3.2 → 3.0.0

data/app/views/events/_event.html.haml

@@ -1,32 +1,34 @@
-%h3
+%h2
   = event.name
-  = "(#{event.metro_area.to_s})" unless event.metro_area.blank?
+  = !event.metro_area.nil? ? " (#{event.metro_area.to_s})" : ''
+
 - if (logged_in? && (event.user.eql?(current_user) || admin?))
-  .event-edit-link
-    = link_to :edit.l, edit_event_path(event)
-    |
-    = link_to :clone.l, clone_event_path(event)
-    |
-    = link_to :destroy.l, event_path(event), :confirm => :are_you_sure.l, :method => :delete
-%p
-  %b= :when.l+":"
-  =h event.time_and_date
+  %p
+    = link_to :show.l, event_path(event), :class => 'btn btn-default'
+    = link_to :clone.l, clone_event_path(event), :class => 'btn btn-success'
+    = link_to :edit.l, edit_event_path(event), :class => 'btn btn-warning'
+    = link_to :delete.l, event_path(event), data: { confirm: :are_you_sure.l }, :method => :delete, :class => 'btn btn-danger'
+
+%dl.dl-horizontal
+  %dt=:when.l
+  %dd=event.time_and_date
   - unless event.location.blank?
-    %br
-    %b= :where.l+":"
-    =h event.location
-    = link_to :map_it.l, "http://www.google.com/maps?q=#{URI::encode(event.location)}", :title=>:map_it.l, :target=>'_blank'
+    %dt= :where.l+":"
+    %dd
+      = event.location
+      = link_to :map_it.l, "http://www.google.com/maps?q=#{URI::encode(event.location)}", :title=>:map_it.l, :target=>'_blank'
   - if event.allow_rsvp?
-    %br
-    %b=:rsvps.l+':'
+    %dt=:rsvps.l
     - attending = event.attendees_count == 1 ? :is_attending_this_event.l : :are_attending_this_event.l
-    = pluralize(event.attendees_count, 'person') + ' ' + attending
-    - if event.end_time > Time.now
-      - if rsvp = event.rsvped?(current_user)
-        = link_to :retract_rsvp.l, [event, rsvp], :confirm => :are_you_sure.l, :method=>:delete
-        = link_to :update_rsvp.l, edit_event_rsvp_url(event, rsvp)
-      - else
-        = link_to :rsvp.l, new_event_rsvp_url(event)
+    %dd
+      = pluralize(event.attendees_count, 'person') + ' ' + attending
+      .btn-group
+        - if event.end_time > Time.now
+          - if rsvp = event.rsvped?(current_user)
+            = link_to :retract_rsvp.l, [event, rsvp], data: { confirm: :are_you_sure.l }, :method=>:delete, :class => 'btn btn-primary btn-xs'
+            = link_to :update_rsvp.l, edit_event_rsvp_url(event, rsvp), :class => 'btn btn-primary btn-xs'
+          - else
+            = link_to :rsvp.l, new_event_rsvp_url(event), :class => 'btn btn-primary btn-xs'
 - if show_details_link
   %p= link_to :event_details.l, event_url(event)
 

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

@@ -0,0 +1,18 @@
+= bootstrap_form_for(@event, :layout => :horizontal) do |f|
+  = f.text_field :name
+
+  = f.text_area :description, :rows => 10, :class => "rich_text_editor"
+
+  = f.datetime_select :start_time
+  = f.datetime_select :end_time
+
+  = f.form_group :rsvp, :help => :when_checked_users_will_be_able_to_rsvp_for_this_event.l do
+    = f.check_box :allow_rsvp
+
+  = f.text_field :location
+
+  = f.form_group :location_group, :label => {:text => :metro_area.l} do
+    = render :partial => 'shared/location_chooser', :locals => {:selected_country => @country_id, :selected_state => @state_id, :selected_metro_area => @metro_area_id, :states => @states, :metro_areas => @metro_areas}
+
+  = f.form_group :submit_group do
+    = f.primary :save.l

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

@@ -0,0 +1,6 @@
+- if params[:controller] == 'events'
+  - css_class = 'active'
+- else
+  - css_class = 'inactive'
+
+%li{:class => css_class}= link_to :events.l, events_path

data/app/views/events/_subscribe.html.haml

@@ -1,4 +1,4 @@
--box :class => "alt" do
+-widget do
   %h3= :subscribe_to.l + ' ' + :events.l
   %p= :subscribe_events_instructions.l
   .icon_row

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

@@ -1,34 +1,9 @@
+-@page_title = :edit_event.l
 
--box do
-  %h3= :edit_event.l
-  = error_messages_for :event
-  = form_for(:event, :url => event_path(@event), :html => {:method => :put, :class => "MainForm"} ) do |f|
-    %label= :name.l
-    = f.text_field :name
-    
-    %label= :description.l
-    = f.text_area :description, :size => "69x10", :class => "rich_text_editor"
-    
-    %label= :start_time.l
-    = f.datetime_select :start_time
-    
-    %label= :end_time.l
-    = f.datetime_select :end_time
+%p
+  = link_to :back.l, events_path, :class => 'btn btn-default'
+  = link_to :show.l, event_path(@event), :class => 'btn btn-primary'
+  = link_to :clone.l, clone_event_path(@event), :class => 'btn btn-success'
+  = link_to :delete.l, event_path(@event), data: { confirm: :are_you_sure.l }, :method => :delete, :class => 'btn btn-danger'
 
-    %label
-      = f.check_box :allow_rsvp
-      =:allow_rsvp.l
-      %br
-      %em
-        =:when_checked_users_will_be_able_to_rsvp_for_this_event.l
-    
-    %label= :location.l
-    = f.text_field :location
-
-    %h3= :metro_area.l
-    = render :partial => 'shared/location_chooser', :locals => {:selected_country => @country_id, :selected_state => @state_id, :selected_metro_area => @metro_area_id, :states => @states, :metro_areas => @metro_areas}
-
-    %p
-      = submit_tag :save.l
-
-  = link_to :back.l, :back
+=render 'form'

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

@@ -1,22 +1,14 @@
 - @section = 'events'
+- @page_title = :events.l
+= :find_out_where_to_be_and_when_to_be_there.l
 
-.yui-b
-  - if @is_admin_user
-    -box :class => "alt first_alt" do 
-      = link_to_unless_current :past_events.l, past_events_path
-      = link_to_unless_current :upcoming_events.l, events_path
-      %br
-      = link_to :administer_events.l, admin_events_path
-  -box do 
-    %h3= :events.l
-    = :find_out_where_to_be_and_when_to_be_there.l
-  =render :partial=>'subscribe'
-#yui-main
-  .yui-b
-    -box do 
-    
-      .pagination=paginating_links @events if @events.total_count > 1      
+- if @is_admin_user
+  -widget do
+    %ul.list-unstyled
+      %li= link_to_unless_current :past_events.l, past_events_path
+      %li= link_to_unless_current :upcoming_events.l, events_path
+      %li= link_to :administer_events.l, admin_events_path
+=render :partial=>'subscribe'
 
-      = render :partial=>'event', :collection=>@events, :locals=>{:show_details_link=>true}
-
-      .pagination=paginating_links @events if @events.total_count > 1      
+= render :partial=>'event', :collection=>@events, :locals=>{:show_details_link=>true}
+=paginate @events , :theme => 'bootstrap'    

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

@@ -1,32 +1,3 @@
+-@page_title = :new_event.l
 
--box do
-  %h3= :new_event.l
-  = error_messages_for :event
-  = form_for(:event, :url => events_path, :html => {:class => "MainForm"} ) do |f|
-    %label= :name.l
-    = f.text_field :name
-    
-    %label= :description.l
-    = f.text_area :description, :size => "69x10", :class => "rich_text_editor"
-    
-    %label= :start_time.l
-    = f.datetime_select :start_time
-    %label= :end_time.l
-    = f.datetime_select :end_time
-
-    %label
-      = f.check_box :allow_rsvp
-      =:allow_rsvp.l
-      %br
-      %em
-        =:when_checked_users_will_be_able_to_rsvp_for_this_event.l
-    
-    %label= :location.l
-    = f.text_field :location
-
-    %h3= :metro_area.l   
-    = render :partial => 'shared/location_chooser', :locals => {:selected_country => @country_id, :selected_state => @state_id, :selected_metro_area => @metro_area_id, :states => @states, :metro_areas => @metro_areas}
-    %p
-      = submit_tag :create.l
-
-  = link_to :back.l, :back
+=render 'form'

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

@@ -1,29 +1,59 @@
 - @section = 'events'
-
-.yui-b
-  -box :class => "alt first_alt" do 
+- @page_title = @event.name
+-widget do
+  %ul.list-unstyled
     - if @is_admin_user
-      = link_to :administer_events.l, admin_events_path
-    = link_to :see_all_events.l, events_path
-  =render :partial=>'subscribe'
-#yui-main
-  .yui-b
-    -box :class=>'entry-content event-content' do 
-      = render :partial=>'event', :locals=>{:event=>@event, :show_details_link=>false}
-      = @event.description.html_safe unless @event.description.blank?
-      - unless @event.attendees.blank?
-        %p
-          %b=:attendees.l+':'
-          - @event.attendees.each do |user|
+      %li
+        = link_to :administer_events.l, admin_events_path
+    %li
+      = link_to fa_icon('plus-circle', :text => :see_all_events.l), events_path
+=render :partial=>'subscribe'
+
+- if (logged_in? && (@event.user.eql?(current_user) || admin?))
+  %p
+    = link_to :back.l, events_path, :class => 'btn btn-default'
+    = link_to :clone.l, clone_event_path(@event), :class => 'btn btn-success'
+    = link_to :edit.l, edit_event_path(@event), :class => 'btn btn-warning'
+    = link_to :delete.l, event_path(@event), data: { confirm: :are_you_sure.l }, :method => :delete, :class => 'btn btn-danger'
+
+
+%dl.dl-horizontal
+  %dt=:when.l
+  %dd=@event.time_and_date
+  - unless @event.location.blank?
+    %dt= :where.l+":"
+    %dd
+      = @event.location
+      = link_to :map_it.l, "http://www.google.com/maps?q=#{URI::encode(@event.location)}", :title=>:map_it.l, :target=>'_blank'
+  - if @event.allow_rsvp?
+    %dt=:rsvps.l
+    - attending = @event.attendees_count == 1 ? :is_attending_this_event.l : :are_attending_this_event.l
+    %dd
+      = pluralize(@event.attendees_count, 'person') + ' ' + attending
+      .btn-group
+        - if @event.end_time > Time.now
+          - if rsvp = @event.rsvped?(current_user)
+            = link_to :retract_rsvp.l, [@event, rsvp], data: { confirm: :are_you_sure.l }, :method=>:delete, :class => 'btn btn-primary btn-xs'
+            = link_to :update_rsvp.l, edit_event_rsvp_url(@event, rsvp), :class => 'btn btn-primary btn-xs'
+          - else
+            = link_to :rsvp.l, new_event_rsvp_url(@event), :class => 'btn btn-primary btn-xs'
+
+= @event.description.html_safe unless @event.description.blank?
+- unless @event.attendees.blank?
+  %dl.dl-horizontal
+    %dt=:attendees.l
+    %dd
+      %ul
+        - @event.attendees.each do |user|
+          %li
             = link_to h(user.display_name), user_path(user)
             - if (count = @event.attendees_for_user(user)) > 1
-              = "(+#{count-1})"
-    -box :class => 'hfeed comments', :id => 'comments' do      
-      %h3= :event_comments.l 
-      %h2= :add_your_comment.l
-      = render :partial => 'comments/comment_form', :locals => {:commentable => @event}
-      %a#newest_comment
-      = render :partial => 'comments/comment', :collection => @comments
-      %span#more_comments_links= more_comments_links(@event)
-    / ends box
+              %span.badge.badge-info= "+#{count-1}"
+
 
+%h2= :event_comments.l
+%h3= :add_your_comment.l
+= render :partial => 'comments/comment_form', :locals => {:commentable => @event}
+%a#newest_comment
+= render :partial => 'comments/comment', :collection => @comments
+%span#more_comments_links= more_comments_links(@event)

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

@@ -0,0 +1,10 @@
+<% if @favorite.new_record? %>
+  <%= @favorite.errors.full_messages.join(', ').html_safe %>
+<% else %>
+  <% case @favorite.favoritable.class.to_s.tableize %>
+    <% when 'clippings' %>
+      <%= render :partial => 'clippings/favorite', :locals => {:clipping => @favorite.favoritable} %>
+    <% when 'posts' %>
+      <%= render :partial => 'posts/meta', :locals => {:post => @favorite.favoritable} %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,6 @@
+<% case @favorite.favoritable.class.to_s.tableize %>
+  <% when 'clippings' %>
+      <%= render :partial => 'clippings/favorite', :locals => {:clipping => @favorite.favoritable} %>
+  <% when 'posts' %>
+      <%= render :partial => 'posts/meta', :locals => {:post => @favorite.favoritable} %>
+<% end %>

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

@@ -1,10 +1,8 @@
--box :class => 'favorites' do
-  %h3= link_to "#{@user.login}'s "+:favorites.l, user_favorites_path(@user)        
+-@page_title = "#{@user.login}'s "+:favorites.l
 
-  - @favorites.to_a.in_groups_of(2) do |group|
-    .row  
-      - group.compact.each do |f|
-        =render :partial => "favorite", :locals => {:favorite => f}
+%ul.list-unstyled.thumbnails
+  - @favorites.each do |f|
+    %li.col-sm-4
+      =render :partial => "favorite", :locals => {:favorite => f}
 
-        
-.pagination=paginating_links @favorites if @favorites.total_count > 1      
+=paginate @favorites, :theme => 'bootstrap'     

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

@@ -1,23 +1,13 @@
+= bootstrap_form_for @forum, :layout => :horizontal do |f|
+  = f.text_field :name
+  = f.number_field :position
 
-#forum_name
-  %table.noborder.nopad.wide{"cellspacing"=>"0","border"=>"0", "cellpadding"=>"0"}
-    %td
-      %label= :title.l
-      = form.text_field :name, :class => "primary"
+  = f.text_field :tag_list, :autocomplete => "off", :help => :optional_keywords_describing_this_forum_separated_by_commas.l
+  
+  -content_for :end_javascript do
+    = tag_auto_complete_field 'forum_tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
 
-    %td
-      %label= :position.l
-      = form.text_field :position, :size => 5
+  = f.text_area :description, :rows => 7, :class => "rich_text_editor"
 
-      %label
-        =:tags.l
-        %em="(#{:optional_keywords_describing_this_forum_separated_by_commas.l})"
-      = text_field_tag 'tag_list', @forum.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 => [','] }
-
-#forum_descripion
-  %label= :description.l
-  = form.text_area :description, :rows => 7, :class => "rich_text_editor"
+  = f.form_group :submit_group do
+    = f.primary :save.l

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

@@ -0,0 +1,6 @@
+- if params[:controller] == 'forums'
+  - css_class = 'active'
+- else
+  - css_class = 'inactive'
+  
+%li{:class => css_class}= link_to :forums.l, forums_path

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

@@ -1,11 +1,9 @@
--box do
-  %h3= :edit_forum.l
-  
-  %p= link_to :delete_this_forum.l, forum_path(@forum), :method => :delete, :class => "utility", :confirm => :are_you_sure.l
-  = form_for :forum, :url  => forum_path(@forum), :html => { :class => "MainForm", :method => :put } do |f|
-    = render :partial => "form", :object => f
-    %p
-      = submit_tag :save_forum.l
-      = :or.l
-      = link_to(:cancel.l, forums_path)
+-@page_title = :edit_forum.l
+
+%p
+  = link_to :back.l, forums_path, :class => 'btn btn-default'
+  = link_to :show.l, forum_path(@forum), :class => 'btn btn-primary'
+  = link_to :delete.l, forum_path(@forum), :method => 'delete', data: { confirm: :are_you_sure.l }, :class => 'btn btn-danger'
+
+= render :partial => "form"
 

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

@@ -1,70 +1,62 @@
 - @meta = { :description => "#{configatron.community_name} forums.",:keywords => "#{configatron.meta_keywords}", :robots => configatron.robots_meta_list_content}
 -@section = 'forums'
-
--if admin?
-  -box :class => "alt first_alt" do 
-    %h3= :admin.l
-    %p= link_to :create_new_forum.l, new_forum_path, :class => "utility"
-
--box do 
-
-  .right=link_to :recent_posts.l, recent_forum_posts_path
-  %h3= :forums.l
-  %p.subtitle
-    = feed_icon_tag :recent_posts.l, all_sb_posts_path(:format => 'rss')
-    = number_with_delimiter(Topic.count) 
-    = "#{:topics.l},"
-    = number_with_delimiter(SbPost.count)
-    = "#{:posts.l},"
-    = number_with_delimiter(User.count(:conditions => "sb_posts_count>0"))
-    = :voices.l
-
-  %table{:border=>"0", :cellspacing=>"0", :cellpadding=>"0", :class=>"wide forums"}
+-@page_title = :forums.l
+
+.pull-right=link_to :recent_posts.l, recent_forum_posts_path
+%p.subtitle
+  %a{:href => recent_forum_posts_path(:format => 'rss')}
+    =fa_icon "rss"
+  = number_with_delimiter(Topic.count)
+  = "#{:topics.l},"
+  = number_with_delimiter(SbPost.count)
+  = "#{:posts.l},"
+  = number_with_delimiter(User.where("sb_posts_count>0").count)
+  = :voices.l
+
+%table.table.table-bordered
+  %tr
+    %th= :forum.l
+    %th= :last_post.l
+    -if admin?
+      %th= :actions.l
+
+  -for forum in @forums do
     %tr
-      %th{:width=>"70%", :colspan=>"3"}= :forum.l
-      %th{:width=>"30%", :colspan=>"1"}= :last_post.l
-
-    -for forum in @forums do
-      %tr
-        %td.vat.c1  
-          - if recent_forum_activity(forum)
-            = image_tag "clearbits/comment.gif", :class => "icon green", :title => :recent_activity.l, :plugin => "community_engine"
-          - else
-            = image_tag "clearbits/comment.gif", :class => "icon grey", :title => :no_recent_activity.l, :plugin => "community_engine"
-        %td.c2.vat
-          = link_to h(forum.name), forum_path(forum), :class => "title"
-          .posts
-            - unless forum.topics_count.zero?
-              = number_with_delimiter(forum.topics_count)
-              = :topics.l
-              ,
-              = number_with_delimiter(forum.sb_posts_count)
-              = :posts.l
-
-          %p.desc=raw forum.description_html
-
-        %td.c3
-          = link_to :edit.l, edit_forum_path(forum), :class => "tiny", :rel => "directory", :style => "float:right" if admin?
-
-        %td.inv.lp
-          - if forum.sb_posts.last
-            = time_ago_in_words(forum.sb_posts.last.created_at)
-            %br
-            -if forum.sb_posts.last.user
-              %strong= :by.l :login => forum.sb_posts.last.user.display_name
-            %span
-              (
-              = link_to :view.l, forum_topic_path(:forum_id => forum, :id => forum.sb_posts.last.topic_id, :page => forum.sb_posts.last.topic.last_page, :anchor => forum.sb_posts.last.dom_id) 
-              )
+      %td
+        = link_to h(forum.name), forum_path(forum), :class => "title"
+        %p=raw forum.description_html
+        - unless forum.topics_count.zero?
+          = number_with_delimiter(forum.topics_count)
+          = :topics.l
+          ,
+          = number_with_delimiter(forum.sb_posts_count)
+          = :posts.l
+      %td
+        - if recent_forum_activity(forum)
+          %span.badge.badge-warning
+            =fa_icon "fire inverse"
+        - if forum.sb_posts.last
+          = time_ago_in_words(forum.sb_posts.last.created_at)
+          %br
+          -if forum.sb_posts.last.user
+            %strong= :by.l :login => forum.sb_posts.last.user.display_name
+          %span
+            (
+            = link_to :view.l, forum_topic_path(:forum_id => forum, :id => forum.sb_posts.last.topic_id, :page => forum.sb_posts.last.topic.last_page, :anchor => forum.sb_posts.last.dom_id)
+            )
+      -if admin?
+        %td
+          = link_to :show.l, forum_path(forum), :class => 'btn btn-default'
+          = link_to :edit.l, edit_forum_path(forum), :class => 'btn btn-warning'
+          = link_to :delete.l, forum_path(forum), :method => 'delete', data: { confirm: :are_you_sure.l }, :class => 'btn btn-danger'
 
-  %p= link_to :recent_posts.l, recent_forum_posts_path
+-if admin?
+  = link_to :new_forum.l, new_forum_path, :class => 'btn btn-success'
 
 
-  - online_users = User.currently_online 
-  - unless online_users.empty? 
-    .stats
-      .users
-        - unless online_users.empty? 
-          = :users_online.l + ':'
-          = online_users.map{ |u| link_to u.login, user_path(u) }.join(", ").html_safe
-          %br
+- online_users = User.currently_online
+- unless online_users.empty?
+  - unless online_users.empty?
+    %dl.dl-horizontal
+      %dt= :users_online.l
+      %dd= online_users.map{ |u| link_to u.login, user_path(u) }.join(", ").html_safe