community_engine 2.3.2 → 3.0.0

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

@@ -1,9 +1,6 @@
--box do
-  %h3= :new_forum.l
-  = form_for :forum, :url => forums_path, :html => {:class => "MainForm"} do |f|
-    = render :partial => "form", :object => f
-    %p
-      = submit_tag :create.l
-      = :or.l
-      = link_to(:cancel.l, forums_path)
+-@page_title = :new_forum.l
 
+%p
+  = link_to :back.l, forums_path, :class => 'btn btn-default'
+
+= render :partial => "form"

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

@@ -2,84 +2,77 @@
 - @section = 'forums'
 - @page_title = @forum.name
 
--box :class => "alt first_alt" do 
-  = link_to :forums.l, forum_home_path
-  %span.arrow
-    →
-  = h @forum.name   
+-if admin?
+  %p
+    = link_to :back.l, forums_path, :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'
 
--box do 
-  %p.subtitle
-    = feed_icon_tag @forum.name, forum_sb_posts_path(@forum, :format => :rss)
-    = pluralize @forum.topics_count, :topic.l 
-    , 
-    = pluralize @forum.sb_posts_count, :post.l
+- unless @forum.description.blank?
+  =@forum.description_html.html_safe
+%p
+  %a{:href => forum_sb_posts_path(@forum, :format => :rss)}
+    =fa_icon "rss"
+  = pluralize @forum.topics_count, :topic.l
+  ,
+  = pluralize @forum.sb_posts_count, :post.l
 
-  - unless @forum.description.blank?
-    =raw @forum.description_html
-  
-  - if @forum.moderators.any?
-    = "#{:moderators.l}:"
-    %ul.flat
-      - @forum.moderators.each do |user|
-        %li= link_to user.display_name, user_path(user)
-    
-  %br.clear
 
-  - if @topics.total_count > 1
-    - if logged_in?
-      %h6.all.right= link_to :post_a_new_topic.l, new_forum_topic_path(@forum)
-  
-    .pagination= paginating_links @topics
+- if @forum.moderators.any?
+  %h2= :moderators.l
+  %ul.list-unstyled
+    - @forum.moderators.each do |user|
+      %li= link_to user.display_name, user_path(user)
 
-  - unless @topics.empty?
-    %table.wide.topics{:border=>"0", :cellspacing=>"0", :cellpadding=>"0"}
+- unless @topics.empty?
+  %table.table.table-bordered.table-striped
+    %tr
+      %th
+      %th= :topics.l
+      %th= :posts.l
+      %th= :view_count.l
+      %th= :last_post.l
+
+    - for topic in @topics
       %tr
-        %th.la{:colspan=>"2"}= :topics.l
-        %th{:width=>"1%"}= :posts.l
-        %th{:width=>"1%"}= :view_count.l 
-        %th.la= :last_post.l
-        
-      - for topic in @topics
-        %tr
-          %td.c1{:style=>"padding:5px; width:16px;"}
-            - icon, color, post = icon_and_color_and_post_for topic
+        %td
+          - icon, color, post = icon_and_color_and_post_for topic
 
-            - if recent_topic_activity(topic)
-              = image_tag "clearbits/#{icon}.gif", :class => "icon green", :title => :recent_activity.l+" #{post}", :plugin => "community_engine"
-            - else
-              = image_tag "clearbits/#{icon}.gif", :class => "icon grey #{color}", :title => :no_recent_activity.l+" #{post}", :plugin => "community_engine"
-          %td.c2
-            = :sticky.l+": <strong>".html_safe if topic.sticky?
+          - if recent_topic_activity(topic)
+            %span.badge.badge-warning
+              =fa_icon "fire inverse"
+        %td
+          -if topic.sticky?
+            =:sticky.l
+            %strong
+              = link_to h(topic.title), forum_topic_path(@forum, topic), :class => "entry-title", :rel => "bookmark"
+          -else
             = link_to h(topic.title), forum_topic_path(@forum, topic), :class => "entry-title", :rel => "bookmark"
-            = "</strong>".html_safe if topic.sticky?
-            - if topic.paged? 
-              %small= link_to :last.l, forum_topic_path(:forum_id => @forum, :id => topic, :page => topic.last_page)
-          %td.ca.inv.stat= topic.sb_posts_count
-          %td.ca.inv.stat= number_with_delimiter(topic.views)
-          %td.lp
-            %abbr.updated{:title=>"#{topic.replied_at.xmlschema}"}= time_ago_in_words(topic.replied_at)
-            %span.author
-              %strong.fn
-                =:by.l :login => topic.replied_by_user.display_name
-            %span= link_to :view.l, forum_topic_path(:forum_id => @forum, :id => topic, :page => topic.last_page, :anchor => "posts-#{topic.last_post_id}")
-  
-  - if @topics.total_count > 1
-    = paginate @topics
+          - if topic.paged?
+            %small= link_to :last.l, forum_topic_path(:forum_id => @forum, :id => topic, :page => topic.last_page)
+        %td= topic.sb_posts_count
+        %td= number_with_delimiter(topic.views)
+        %td
+          %abbr{:title=>"#{topic.replied_at.xmlschema}"}= time_ago_in_words(topic.replied_at)
+          %strong
+            =:by.l :login => topic.replied_by_user.display_name
+          %span= link_to :view.l, forum_topic_path(:forum_id => @forum, :id => topic, :page => topic.last_page, :anchor => "posts-#{topic.last_post_id}")
+
+= paginate @topics, :theme => 'bootstrap'
 
-  - if logged_in?
-    %h6.all.right= link_to :post_a_new_topic.l, new_forum_topic_path(@forum)
-  - else
-    %h6.all.right= link_to :log_in_to_create_a_new_topic.l, new_forum_topic_path(@forum)
+- if logged_in?
+  = link_to fa_icon('plus', :text => :post_a_new_topic.l.downcase.capitalize), new_forum_topic_path(@forum)
+- else
+  = link_to fa_icon('plus', :text => :log_in_to_create_a_new_topic.l.downcase.capitalize), new_forum_topic_path(@forum)
 
-  - if @topics.size < 10
-    - @related = Post.limit(10).tagged_with(@forum.tag_list, :any => true)
-    - unless @related.empty?
-      %table.wide.topics{:border=>"0", :cellspacing=>"0", :cellpadding=>"0"}
-        %tr
-          %th.la{:colspan=>"2"}= :this_forum_is_still_getting_started.l
-          %th{:width=>"1%"}= :comments.l
-          %th{:width=>"1%"}= :view_count.l
-          %th.la= :author.l
-          -@related.each do |post|
-            = render :partial => 'sb_posts/dummy_forum_post', :locals => {:post => post}
+- if @topics.size < 10
+  - @related = Post.limit(10).tagged_with(@forum.tag_list, :any => true)
+  - unless @related.empty?
+    %table.wide.topics{:border=>"0", :cellspacing=>"0", :cellpadding=>"0"}
+      %tr
+        %th.la{:colspan=>"2"}= :this_forum_is_still_getting_started.l
+        %th{:width=>"1%"}= :comments.l
+        %th{:width=>"1%"}= :view_count.l
+        %th.la= :author.l
+        -@related.each do |post|
+          = render :partial => 'sb_posts/dummy_forum_post', :locals => {:post => post}

data/app/views/friendships/_friendship.html.haml

@@ -1,16 +1,14 @@
-- user = friendship.friend
-
-.yui-gf.row
-  .yui-u.first.centered= image_tag( user.avatar_photo_url(:thumb), :class => "polaroid" )
-  .yui-g
-    .yui-u.first
-      %h2= link_to user.login, user_path(user)
-      - if user.metro_area      
-        = "#{:from.l} #{user.location}"
-        %br 
-      %p= friendship.friendship_status.name.l
-      %p
-        =:requested.l
-        = time_ago_in_words friendship.created_at
-
-    .yui-u= friendship_control_links(friendship) if @is_current_user
+%li.col-sm-3
+  - user = friendship.friend
+  
+  = image_tag( user.avatar_photo_url(:medium))
+   
+  %h3= link_to user.login, user_path(user)
+  - if user.metro_area      
+    %p= "#{:from.l} #{user.location}"
+  %p= friendship.friendship_status.name.l
+  %p
+    =:requested.l
+    = time_ago_in_words friendship.created_at
+  
+  = friendship_control_links(friendship) if @is_current_user

data/app/views/friendships/accepted.html.haml

@@ -1,13 +1,9 @@
-.yui-b= render :partial => 'users/profile_user_info_sidebar'
+-@page_title = :accepted_friendships.l(:count => @friend_count)
+= render :partial => 'users/profile_user_info_sidebar'
 
-#yui-main
-  .yui-b
-    -box :id => "friends" do
-      %h3
-        =:accepted_friendships.l(:count => @friend_count)
-        = link_to "(#{@pending_friendships_count} "+:pending.l+")", pending_user_friendships_path(@user) if  (@pending_friendships_count > 0)
-      .pagination=paginating_links @friendships if @friendships.total_count > 1
-      
-      .clear
-      .user_list= render :partial => "friendships/friendship", :collection => @friendships
+-box :id => "friends" do
+  = link_to "(#{@pending_friendships_count} "+:pending.l+")", pending_user_friendships_path(@user) if  (@pending_friendships_count > 0)
+  %ul.list-unstyled.thumbnails
+    = render :partial => "friendships/friendship", :collection => @friendships
+  = paginate @friendships, :theme => 'bootstrap'
 

data/app/views/friendships/create.js.haml

@@ -0,0 +1 @@
+$('.addfriend_#{@friendship.friend_id}').html('#{@text}')

data/app/views/friendships/denied.html.haml

@@ -1,8 +1,4 @@
-.yui-b= render :partial => 'users/profile_user_info_sidebar'
-
-#yui-main
-  .yui-b
-    -box :id => "friends" do
-      %h3
-        =:denied_friendships.l
-      .user_list= render :partial => "friendships/friendship", :collection => @friendships
+-@page_title = :denied_friendships.l
+= render :partial => 'users/profile_user_info_sidebar'
+%ul.list-unstyled.thumbnails
+  = render :partial => "friendships/friendship", :collection => @friendships

data/app/views/friendships/pending.html.haml

@@ -1,7 +1,5 @@
-.yui-b= render :partial => 'users/profile_user_info_sidebar'
+= render :partial => 'users/profile_user_info_sidebar'
+-@page_title= :pending_friendships.l
 
-#yui-main
-  .yui-b
-    -box :id => "friends" do
-      %h3= :pending_friendships.l
-      .user_list= render :partial => "friendships/friendship", :collection => @friendships
+%ul.list-unstyled.thumbnails
+  = render :partial => "friendships/friendship", :collection => @friendships

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

@@ -1,12 +1,11 @@
--box do
-  %h3=:friendship_request_detail.l
-  - if @friendship.initiator? && @friendship.pending?
-    =:waiting_for.l 
-    = @friendship.friend.login
-    =:to_accept.l
-  - elsif @friendship.pending?
-    =:this_friendship_is_pending.l 
-    = link_to :click_to_accept_it.l, accept_user_friendship_path(@user, @friendship), :method => :put
+-@page_title = :friendship_request_detail.l
 
-  %br
-  = link_to :back.l, accepted_user_friendships_path(@user)
+- if @friendship.initiator? && @friendship.pending?
+  =:waiting_for.l 
+  = @friendship.friend.login
+  =:to_accept.l
+- elsif @friendship.pending?
+  =:this_friendship_is_pending.l 
+  = link_to :click_to_accept_it.l, accept_user_friendship_path(@user, @friendship), :method => :put
+
+= link_to :back.l, accepted_user_friendships_path(@user)

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

@@ -0,0 +1,6 @@
+= bootstrap_form_for(@homepage_feature, :html => {:multipart => true}, :layout => :horizontal) do |f|
+  = f.text_field :url
+  = f.text_field :title
+  = f.text_area :description, :rows => 10, :class => "rich_text_editor"
+  = f.file_field :image, :required => true
+  = f.primary :save.l

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

@@ -1,31 +1,6 @@
-.col_full
-  - rounded do
-    %h1
-      = :editing_homepage_feature.l
-    = error_messages_for :homepage_feature
-    = form_for(:homepage_feature, :url => homepage_feature_path(@homepage_feature), :html => { :multipart => true, :method => :put }) do |f|
-      %p
-        %b
-          URL
-        %br
-        = f.text_field :url
-      %p
-        %b
-          = :title.l
-        %br
-        = f.text_field :title
-      %p
-        %b
-          = :description.l
-        %br
-        = f.text_area :description, :size => "69x10", :class => "rich_text_editor"
-      %p
-        %b
-          = :filename.l
-        %br
-        = f.file_field :image
-      %p
-        = submit_tag :update.l
-        or
-        = link_to :cancel_and_go_back_to_all_features.l, homepage_features_path
+%p
+  = link_to :back.l, homepage_features_path, :class => 'btn btn-default'
+  = link_to :show.l, homepage_feature_path(@homepage_feature), :class => 'btn btn-primary'
+  = link_to :delete.l, homepage_feature_path(@homepage_feature), data: { confirm: :are_you_sure.l }, :method => :delete, :class => 'btn btn-danger'
 
+= render 'form'

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

@@ -1,30 +1,24 @@
-.yui-b
-  = render :partial => 'shared/admin_nav'
-  
-#yui-main
-  .yui-b
-    -box do 
-      %h3= :homepage_features.l
-      = link_to :new_homepage_feature.l, new_homepage_feature_path 
+-@page_title = :homepage_features.l
+= render :partial => 'shared/admin_nav'
 
-      %table{:width=>"100%"}
-        %tr
-          %th= :date_title.l
-          %th= :title.l
-          %th= :description.l
-          %th= :image.l
-          %th= :actions.l
+%table.table.table-bordered.table-striped
+  %tr
+    %th= :date_title.l
+    %th= :title.l
+    %th= :description.l
+    %th= :image.l
+    %th= :actions.l
 
-        - for homepage_feature in @homepage_features
-          %tr
-            %td=h I18n.l(homepage_feature.created_at, :format => :short_published_date)
-            %td
-              %a{:href=>"#{h homepage_feature.url}"}=h homepage_feature.title
-            %td=h truncate(homepage_feature.description, :length => 250)
-            %td= image_tag homepage_feature.image.url(:thumb)
-            %td
-              = link_to :show.l, homepage_feature_path(homepage_feature)
-              %br
-              = link_to :edit.l, edit_homepage_feature_path(homepage_feature)
-              %br
-              = link_to :destroy.l, homepage_feature_path(homepage_feature), :confirm => :are_you_sure.l, :method => :delete
+  - for homepage_feature in @homepage_features
+    %tr
+      %td=h I18n.l(homepage_feature.created_at, :format => :short_published_date)
+      %td
+        %a{:href=>"#{h homepage_feature.url}"}=h homepage_feature.title
+      %td=h truncate(homepage_feature.description, :length => 250).html_safe
+      %td= image_tag homepage_feature.image.url(:thumb)
+      %td
+        = link_to :show.l, homepage_feature_path(homepage_feature), :class => 'btn btn-default'
+        = link_to :edit.l, edit_homepage_feature_path(homepage_feature), :class => 'btn btn-warning'
+        = link_to :delete.l, homepage_feature_path(homepage_feature), data: { confirm: :are_you_sure.l }, :method => :delete, :class => 'btn btn-danger'
+
+= link_to :new_homepage_feature.l, new_homepage_feature_path, :class => 'btn btn-success'

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

@@ -1,30 +1,2 @@
-.col_full
-  - rounded do
-    %h1
-      = :new_homepage_feature.l
-    = error_messages_for :homepage_feature
-    = form_for(:homepage_feature, :url => homepage_features_path, :html => {:multipart =>true} ) do |f|
-      %p
-        %b
-          Url
-        %br
-        = f.text_field :url
-      %p
-        %b
-          = :title.l
-        %br
-        = f.text_field :title
-      %p
-        %b
-          = :description.l
-        %br
-        = f.text_area :description, :size => "69x10", :class => "rich_text_editor"
-      %p
-        %b
-          = :filename.l
-        %br
-        = f.file_field :image
-      %p
-        = submit_tag :create.l
-        = :or.l
-        = link_to :cancel.l, homepage_features_path
+-@page_title = :new_homepage_feature.l
+= render 'form'

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

@@ -1,29 +1,27 @@
--box do
-  = link_to :edit.l, edit_homepage_feature_path(@homepage_feature)
-  |
-  = link_to :back.l, homepage_features_path
-  %p
-    %b
-      Url:
-    = h @homepage_feature.url
-  %p
-    %b
-      = :title.l
-    = h @homepage_feature.title
-  %p
-    %b
-      = :description.l
-    = @homepage_feature.description
-  %p
-    %b
-      = :created_at.l
-    = h @homepage_feature.created_at
-  %p
-    %b
-      = :updated_at.l
-    = h @homepage_feature.updated_at
-  %p
-    = image_tag @homepage_feature.image.url(:large)
-  = link_to :edit.l, edit_homepage_feature_path(@homepage_feature)
-  |
-  = link_to :back.l, homepage_features_path
+-@page_title = @homepage_feature.title
+
+%p
+  = link_to :back.l, homepage_features_path, :class => 'btn btn-default'
+  = link_to :edit.l, edit_homepage_feature_path(@homepage_feature), :class => 'btn btn-warning'
+  = link_to :delete.l, homepage_feature_path(@homepage_feature), data: { confirm: :are_you_sure.l }, :method => :delete, :class => 'btn btn-danger'
+
+%dl.dl-horizontal.clearfix
+  -unless @homepage_feature.url.blank?
+    %dt= :url.l
+    %dd= h @homepage_feature.url
+
+  -unless @homepage_feature.title.blank?
+    %dt= :title.l
+    %dd= h @homepage_feature.title
+
+  -unless @homepage_feature.description.blank?
+    %dt= :description.l
+    %dd= @homepage_feature.description.html_safe
+
+  %dt= :created_at.l
+  %dd= h @homepage_feature.created_at
+
+  %dt= :updated_at.l
+  %dd= h @homepage_feature.updated_at
+
+= image_tag @homepage_feature.image.url(:large), :class => 'thumbnail'