community_engine 2.3.2 → 3.0.0

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

@@ -1,76 +1,58 @@
-= form_for @user, :html => {:class => 'MainForm', :multipart =>true} do |f|
-  -box :class => "alt first_alt" do 
-    %h3=:you_are_editing_your_profile.l
-    = link_to "» ".html_safe + :edit_your_account_settings_instead.l, edit_account_user_path(@user)
-  
-  = error_messages_for :user
+-widget do
+  %p=:you_are_editing_your_profile.l
+  %p= link_to :edit_your_account_settings_instead.l, edit_account_user_path(@user)
 
-  %p= submit_tag :save_changes.l  
-  .yui-b
-    -box :id => "profile_details" do
-      %h3=:profile_photo.l
-      = @user.vendor ? "<div class='right_corner'><div class='community_pro'></div></div>" : ''
-      = image_tag( @user.avatar_photo_url(:medium), :class => "polaroid" )
-      = f.fields_for :avatar, @avatar do |avatar_form|
-        %label=:choose_a_photo_for_your_profile.l
-        = avatar_form.file_field :photo, :size => '15'
-      
-      %h3= :location.l
-      = render :partial => 'shared/location_chooser', :locals => {:selected_country => @user.country_id, :selected_state => @user.state_id, :selected_metro_area => @user.metro_area_id, :states => @states, :metro_areas => @metro_areas}
+-widget do
+  %h4
+    .small=:tips.l
+  = render :partial => 'shared/bio_help'
+  =:feel_free_to_embed_images_or_videos.l
 
-      %label
-        =:zippostal_code.l
-      = text_field :user, :zip, :style=>"width:90px"
+= bootstrap_form_for @user, :layout => :horizontal, :html => {:multipart =>true} do |f|
 
-      %h3=:birthday_gender.l
-      %fieldset
-        %legend
-          =:gender.l
-        %label
-          = radio_button :user, :gender, User::MALE
-          =:male.l
-        %label
-          = radio_button :user, :gender, User::FEMALE
-          =:female.l
+  %h2=:profile_photo.l
+  = @user.vendor ? "<div class='right_corner'><div class='community_pro'></div></div>" : ''
+  = image_tag( @user.avatar_photo_url(:medium), :class => "thumbnail" )
+  = f.fields_for :avatar, @avatar do |avatar_form|
+    %label=:choose_a_photo_for_your_profile.l
+    = avatar_form.file_field :photo, :size => '15'
 
-      %label
-        =:birthday.l
-        \:
-      = date_select :user, :birthday, {:start_year => 1926, :end_year => Time.now.year - 1}
-      
-  #yui-main
-    .yui-b
-      -box do 
-        %h3=:about_me.l
-        = text_area :user, :description, :class => "rich_text_editor", :style => "width:100%"
-        
-      -box :class => "alt" do 
-        =:tips.l
-        = render :partial => 'shared/bio_help'
-        =:feel_free_to_embed_images_or_videos.l
-      
-      -box do 
-        %h3= :tags.l
-        #user_tags
-          = text_field_tag 'tag_list', @user.tag_list.join.to_s, {:autocomplete => "off"}
-          #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 => [','] }
-          
-          %label
-            %em
-              =:you_could_tag_yourself.l
-              - if @user.vendor?
-                =:custom_friendly_local.l
-              - else
-                = configatron.meta_keywords.split(",")[0..3].join(", ")
-              %br
-              =:tags_are_comma_separated_keywords_that_describe_you.l
-              %br
-              =:you_can_browse_all_content_and_users_on.l
-              = configatron.community_name
-              =:by_looking_at_the.l
-              = link_to :tags_page.l, tags_path
+  %h2= :location.l
+  = f.form_group :location, label: { :text => :location.l } do
+    = render :partial => 'shared/location_chooser', :locals => {:selected_country => @user.country_id, :selected_state => @user.state_id, :selected_metro_area => @user.metro_area_id, :states => @states, :metro_areas => @metro_areas}
 
-      %p
-        = submit_tag :save_changes.l
+  %label= :zippostal_code.l
+  = f.text_field :zip, :hide_label => true
+
+  %h2=:birthday_gender.l
+  = f.form_group :birthday_gender, label: { :text => :gender.l } do
+    = f.radio_button :gender, User::MALE, :label => :male.l, :inline => true
+    = f.radio_button :gender, User::FEMALE, :label => :female.l, :inline => true
+
+  = f.date_select :birthday, {:start_year => 1926, :end_year => Time.now.year - 1}
+
+  %h2=:about_me.l
+  = f.text_area :description, :class => "rich_text_editor"
+
+  %h2= :tags.l
+  #user_tags
+    = f.text_field :tag_list, {:autocomplete => "off"}
+    = f.form_group :tag_list_group do
+      .help-block
+        =:you_could_tag_yourself.l
+        - if @user.vendor?
+          =:custom_friendly_local.l
+        - else
+          = configatron.meta_keywords.split(",")[0..3].join(", ")
+        %br
+        =:tags_are_comma_separated_keywords_that_describe_you.l
+        %br
+        =:you_can_browse_all_content_and_users_on.l
+        = configatron.community_name
+        =:by_looking_at_the.l
+        = link_to :tags_page.l, tags_path
+    -content_for :end_javascript do
+      = tag_auto_complete_field 'user_tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
+
+  = f.form_group :save_group do
+    = f.primary :save_changes.l

data/app/views/users/edit_account.html.haml

@@ -1,64 +1,44 @@
-= form_tag update_account_user_url(@user), :method => 'put', :class => "MainForm", :multipart => true do
-  -box :class => "alt first_alt" do 
-    %h3=:you_are_editing_your_account.l
-    = link_to :edit_your_user_profile.l, edit_user_path(@user)
-
-  = error_messages_for :user
-
-  -box :class => "yui-b" do
-
-    %h3=:username.l
-    = text_field :user, :login, :size => "28"
-
-    %h3=:e_mail_address.l
-    = text_field :user, :email, :size => "28"
-
-    %h3=:password.l
-    = password_field :user, :password, :size => "28"
-
-    %label=:confirm_password.l
-    = password_field :user, :password_confirmation, :size => "28"
-
-  #yui-main
-    .yui-b
-    
-      -box :class => 'alt first_alt' do
-        = render :partial => "omniauth_connect"
-    
-      -box do
-        %h3=:e_mail_notification.l
-
-        %fieldset
-          %label 
-            = check_box :user, :notify_friend_requests        
-            =:notify_of_friend_requests.l :site => configatron.community_name
-          
-          %label
-            = check_box :user, :notify_comments         
-            = :notify_of_comments.l :site => configatron.community_name
-          
-          %label
-            = check_box :user, :notify_community_news
-            =:notify_email_updates.l :site => configatron.community_name
-          
-
-        %h3=:profile_privacy.l
-
-        %fieldset
-          %label
-            = check_box :user, :profile_public
-            =:make_my_profile_public.l
-            %br
-            %em
-              =:when_checked_your_profile_will_be_visible_to_anyone.l
-            %br
-            %em
-              =:when_unchecked_your_profile_will_only_be_visible_to_people_who_are_logged_in_to.l
-              = "#{configatron.community_name}."
-        %p= submit_tag :save_changes.l  
-
-        %p
-          =link_to :deactivate_link.l, deactivate_user_path(@user), :method => :put, :confirm => :deactivate_confirmation.l
-          %br
-          %label
-            %em= :deactivate_tip.l            
+-widget do
+  %p=:you_are_editing_your_account.l
+  %p= link_to :edit_your_user_profile.l, edit_user_path(@user)
+
+-widget do
+  = render :partial => "omniauth_connect"
+
+
+= bootstrap_form_for @user, :method => 'put', :layout => :horizontal, :label_col => "col-sm-2", :control_col => "col-sm-4", :html => {:multipart => true} do |f|
+
+  = f.text_field :login, :label => :username.l
+
+  = f.text_field :email, :label => :e_mail_address.l
+
+  = f.password_field :password
+
+  = f.password_field :password_confirmation, :label => :confirm_password.l
+
+  %h2=:e_mail_notification.l
+
+  = f.form_group :notifications_group do
+    =f.check_box :notify_friend_requests, :label => :notify_of_friend_requests.l(:site => configatron.community_name)
+
+    =f.check_box :notify_comments, :label => :notify_of_comments.l(:site => configatron.community_name)
+
+    =f.check_box :notify_community_news, :label => :notify_email_updates.l(:site => configatron.community_name)
+
+  %h2=:profile_privacy.l
+
+  = f.form_group :location do
+    =f.check_box :profile_public, :label => :make_my_profile_public.l
+    .help-block
+      %p=:when_checked_your_profile_will_be_visible_to_anyone.l
+      %p=:when_unchecked_your_profile_will_only_be_visible_to_people_who_are_logged_in_to.l(configatron.community_name)
+
+
+  .well
+    =f.primary :save_changes.l
+
+  .well
+    =link_to :deactivate_link.l, deactivate_user_path(@user), :method => :patch, data: { confirm: :deactivate_confirmation.l }, :class => 'btn btn-danger'
+    %br
+    %label
+      %em= :deactivate_tip.l

data/app/views/users/forgot_username.html.haml

@@ -1,13 +1,7 @@
-.yui-b.sidebar
-  =render :partial => 'shared/login_sidebar'
+-@page_title=:forgot_your_username.l
+=render :partial => 'shared/login_sidebar'
 
-#yui-main
-  .yui-b.main_column
-    -box do
-      %h3=:forgot_your_username.l
-
-      = form_tag forgot_username_url, :class => 'MainForm' do
-        %label{"for"=>"email"}=:enter_your_email_address.l+":"
-        = text_field_tag 'email', nil, :size => 35
-        %p
-          = submit_tag :send_me_my_username.l
+= bootstrap_form_tag :url => forgot_username_path, :layout => :horizontal do |f|
+  = f.email_field :email, :label => :enter_your_email_address.l
+  = f.form_group :submit_group do
+    = f.primary :send_me_my_username.l

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

@@ -1,18 +1,8 @@
+-@page_title=:site_members.l :site => configatron.community_name
 - @section = (params[:metro_area_id] ? 'metro_area' : 'users')
 
-.yui-b
-  = render :partial => 'users/search_options'
+= render :partial => 'users/search_options'
 
-#yui-main
-  .yui-b
-    -box :class => "user_list" do
-      %h3=:site_members.l :site => configatron.community_name
+= render :partial => "users/user", :collection => @users
 
-      = paginate @users
-  
-      %br.clear
-  
-      = render :partial => "users/user", :collection => @users
-      
-      %br.clear
-      = paginate @users
+= paginate @users, :theme => 'bootstrap'

data/app/views/users/invite.html.haml

@@ -1,31 +1,20 @@
+-@page_title=:invite_your_friends_to_join.l
+
 %script{"type"=>"text/javascript", "src"=>"http://www.plaxo.com/css/m/js/util.js"}
 %script{"type"=>"text/javascript", "src"=>"http://www.plaxo.com/css/m/js/basic.js"}
 %script{"type"=>"text/javascript", "src"=>"http://www.plaxo.com/css/m/js/abc_launcher.js"}
 
-.yui-b
-  -box :class => "alt first_alt" do 
-    %h3=:spread_the_word.l
-    %p
-      =:invite_message.l(:site => configatron.community_name)
-    %p
-      =:people_who_sign_up_using_your_invitation_will_automatically_be_added_as_your_friends.l
+-widget do
+  %h4
+    .small=:spread_the_word.l
+  %p=:invite_message.l(:site => configatron.community_name)
+  %p=:people_who_sign_up_using_your_invitation_will_automatically_be_added_as_your_friends.l
 
-#yui-main
-  .yui-b
-    -box do 
-      %h3=:invite_your_friends_to_join.l
-      = form_for(:invitation, :url => user_invitations_path(:user_id => @user.id ), :html => {:class => "MainForm"} ) do |f|
-        .right
-          %a{"href"=>"#", "onclick"=>"showPlaxoABChooser('invitation_email_addresses', '/base/plaxo'); return false;"}
-            %img{"src"=>"http://www.plaxo.com/images/abc/buttons/add_button.gif", "alt"=>:add_from_my_address_book.l}/
-        %label{"for"=>"email_addresses"} 
-          =:enter_e_mail_addresses.l 
-          %em= :comma_separated.l
-        = f.text_area :email_addresses , :rows => "5"
-        %label{"for"=>"message"}= :write_a_message.l
-        = f.text_area :message, :rows => "5"
+= bootstrap_form_for :invitation, :url => user_invitations_path(:user_id => @user.id ), :layout => :horizontal do |f|
+  .pull-right
+    %a{"href"=>"#", "onclick"=>"showPlaxoABChooser('invitation_email_addresses', '/base/plaxo'); return false;"}
+      %img{"src"=>"http://www.plaxo.com/images/abc/buttons/add_button.gif", "alt"=>:add_from_my_address_book.l}
+  = f.text_area :email_addresses , :rows => "5", :label => :enter_e_mail_addresses.l 
+  = f.text_area :message, :rows => "5", :label => :write_a_message.l
 
-        %p
-          = submit_tag :send_invitations.l
-          =:or.l
-          = link_to :cancel.l, user_path(@user)
+  = f.primary :send_invitations.l

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

@@ -1,54 +1,33 @@
-.yui-b
-  -box do
-    %h3
-      =:why_sign_up.l
-    %ul.list.checks
-      %li
-        = :sign_up_reason_1.l
-      %li
-        = :sign_up_reason_2.l
+-@page_title=:sign_up.l
 
-  -box :class => 'alt' do
-    %h3=:tips.l
-    %p
-      =:after_signing_up_youll_receive_an_e_mail_confirmation_message.l
-    %p
-      =:click_the_activation_link_in_the_e_mail_to_log_in.l
-    %p= link_to :already_have_an_account.l, "/login"
+-widget do
+  %h4
+    .small=:why_sign_up.l
+  %p= :sign_up_reason_1.l
+  %p= :sign_up_reason_2.l
 
-#yui-main
-  .yui-b
-    -box do
-      %h3=:sign_up.l
-      = error_messages_for :user
-      = form_for :user, :url => users_path, :html => {:class => 'MainForm'} do |f|
-        %label{"for"=>"user_login"}
-          =:username.l
-          \:
-          %em=:required_your_username_must_not_contain_numerals_spaces_or_special_characters.l
-        = f.text_field :login
+-widget do
+  %h3=:tips.l
+  %p
+    =:after_signing_up_youll_receive_an_e_mail_confirmation_message.l
+  %p
+    =:click_the_activation_link_in_the_e_mail_to_log_in.l
+  %p= link_to :already_have_an_account.l, "/login"
 
-        %label{"for"=>"user_email"}
-          =:e_mail_address.l
-          \:
-          %em=:required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter.l
-        = f.text_field :email
 
-        %label{"for"=>"user_birthdate"}
-          =:birthday.l
-          \:
-          %em=:required_you_must_be_at_least_years_old_to_sign_up.l_with_args(:min_age => configatron.min_age)
-        = date_select :user, :birthday, {:start_year => (Time.now.year - configatron.max_age), :end_year => (Time.now.year - configatron.min_age)}
+= bootstrap_form_for @user, :layout => :horizontal do |f|
+  = f.text_field :login, :label => :username.l, :help => :required_your_username_must_not_contain_numerals_spaces_or_special_characters.l
+  = f.text_field :email, :label => :e_mail_address.l, :help => :required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter.l
+  = f.date_select :birthday, {:start_year => (Time.now.year - configatron.max_age), :end_year => (Time.now.year - configatron.min_age)}, :help => :required_you_must_be_at_least_years_old_to_sign_up.l_with_args(:min_age => configatron.min_age)
 
-        -if configatron.require_captcha_on_signup
-          .right{:style => 'margin-top:2em;'}= recaptcha_tags
+  = f.password_field :password
+  = f.password_field :password_confirmation, :help => :re_type_your_password_to_confirm.l
+  = hidden_field_tag :inviter_id, params[:inviter_id]
+  = hidden_field_tag :inviter_code, params[:inviter_code]
 
-        %label{"for"=>"user_password"}
-          =:type_your_password.l
-        = f.password_field :password
-        %label{"for"=>"user_password_confirmation"}
-          =:re_type_your_password_to_confirm.l
-        = f.password_field :password_confirmation
-        = hidden_field_tag :inviter_id, params[:inviter_id]
-        = hidden_field_tag :inviter_code, params[:inviter_code]
-        %p= submit_tag :sign_up.l
+  -if configatron.require_captcha_on_signup
+    = f.form_group do
+      = recaptcha_tags
+
+  = f.form_group :submit_group do
+    = f.primary :sign_up.l

data/app/views/users/resend_activation.html.haml

@@ -1,13 +1,8 @@
-.yui-b.sidebar
-  =render :partial => 'shared/login_sidebar'
+-@page_title=:resend_your_activation_e_mail.l
+=render :partial => 'shared/login_sidebar'
 
-#yui-main
-  .yui-b.main_column
-    -box do 
-      %h3=:resend_your_activation_e_mail.l
-
-      = form_tag resend_activation_url, :class => 'MainForm' do
-        %label{"for"=>"email"}=:enter_your_email_address.l
-        = text_field_tag 'email', nil, :size => 35
-        %p
-          = submit_tag :resend_my_activation_e_mail.l
+= bootstrap_form_tag :url => resend_activation_url, :layout => :horizontal do
+  .form-group
+    %label.control-label{"for"=>"email"}=:enter_your_email_address.l
+    = text_field_tag 'email', nil
+  = submit_tag :resend_my_activation_e_mail.l, :class => 'btn btn-primary'

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

@@ -2,102 +2,100 @@
 - @section = @user.eql?(current_user) ? 'my_profile' : 'users'
 - @sidebar_left = true
 
+-widget :id => 'friends' do
+  %h4
+    .small=:my_friends.l
+  %ul.list-unstyled
+    %li= link_to "(#{@friend_count})", accepted_user_friendships_path(@user) if @friend_count > 5
+    %li= link_to "#{:invite_a_friend.l :site => configatron.community_name}", invite_user_path(@user) if @is_current_user
+    %li= link_to "#{:view_all_my_friend_requests.l} (#{@pending_friendships_count})", pending_user_friendships_path(@user) if @is_current_user
+    - @accepted_friendships.each do |user|
+      =render :partial => "users/sidebar_user", :locals => {:user => user}
+    -if @accepted_friendships.size > 4
+      %li
+        =link_to fa_icon('plus-circle', :text => :see_all.l), accepted_user_friendships_path(@user)
+
+- if @photos.empty? and @recent_posts.empty?
+  -widget do
+    %h4= :small_profile.l :user => @user.login
 
 - if @is_current_user and @user.vendor? and @user.description.nil?
-  %p
-    ? Hey, you're a
+  .alert.alert-info
+    Hey, you're a
     = configatron.community_name
     Pro! You should
     = link_to :update_your_profile.l, edit_user_path(@user)
     \! Add your contact info and Web site.
 
 
-.yui-b
-
-  = render :partial => 'profile_user_info_sidebar', :locals => {:user => @user}
-
-  - if @user.description
-    -box :id => "about_me" do
-      %h3
-        =:about_me.l
-      %p= @user.description.html_safe
-
-  -box :class => 'alt', :id => 'friends' do
-    %h3
-      =:my_friends.l
-      = link_to "(#{@friend_count})", accepted_user_friendships_path(@user) if @friend_count > 5
+= render :partial => 'profile_user_info_sidebar', :locals => {:user => @user}
+
+- unless @user.description.blank?
+  -box :id => "about_me" do
+    %h2
+      =:about_me.l
+    %p= @user.description.html_safe
+
+
+
+- unless @users_comments.empty?
+  .clearfix
+    %h2=:my_recent_comments.l
+    - @users_comments.each do |comment|
+      .clearfix
+        .pull-left
+          - if comment.recipient
+            = link_to image_tag(comment.recipient.avatar_photo_url(:thumb), :alt => "#{comment.recipient.login}"), commentable_url(comment), :class => 'thumbnail'
+        %h3
+          - if comment.commentable.eql?(comment.recipient)
+            = :to.l + ": #{link_to comment.recipient.login, commentable_url(comment)}".html_safe
+          - else
+            = :on_commentable.l + ": #{link_to comment.commentable_name, commentable_url(comment)} (#{comment.commentable_type.l})".html_safe
+        %p= truncate_words( comment.comment, 10, '...').html_safe
+
+
+- unless @photo_comments.empty?
+  .clearfix
+    %h2=:photo_comments.l
+    - @photo_comments.each do |comment|
+      %dl.vcard
+        %dt.photo
+          = link_to(image_tag((comment.user && comment.user.avatar_photo_url(:thumb) || configatron.photo.missing_thumb), :width => '50', :height => '50'), user_photo_path(@user, comment.commentable))            
+        %dd.fn= "#{comment.username}" + " " + :says.l + ":"
+        %dd
+          = truncate_words(comment.comment, 10).html_safe
+          %br
+          = link_to "» ".html_safe + :view_comment.l, user_photo_path(@user, comment.commentable) + "#comment_#{comment.id}"
+
+- unless @photos.empty?
+  .clearfix
+    %h2=:my_photos.l
+    %ul.list-unstyled.thumbnails
+      - @photos.each do |photo|
+        %li.col-lg-3
+          = link_to image_tag( photo.photo.url(:medium)), user_photo_path(@user, photo), :class => "thumbnail"
     %p
-      = link_to "» #{:invite_a_friend.l :site => configatron.community_name}".html_safe, invite_user_path(@user) if @is_current_user
-      %br= link_to "» #{:view_all_my_friend_requests.l} (#{@pending_friendships_count})".html_safe, pending_user_friendships_path(@user) if @is_current_user
-    - @accepted_friendships.each do |user|
-      =render :partial => "users/sidebar_user", :locals => {:user => user}
-    -if @accepted_friendships.size > 4
-      %h6.all
-        =link_to :see_all.l, accepted_user_friendships_path(@user)
-
-  - unless @users_comments.empty?
-    -box :class => 'yui-g alt', :id => 'photo_comments' do
-      %h3=:my_recent_comments.l
-      - @users_comments.each do |comment|
-        %dl.vcard
-          %dt.photo
-            - if comment.recipient
-              = link_to image_tag(comment.recipient.avatar_photo_url(:thumb), :alt => "#{comment.recipient.login}", :width => '50', :height => '50'), commentable_url(comment)
-          %dd.fn
-            - if comment.commentable.eql?(comment.recipient)
-              %strong= :to.l + ": #{link_to comment.recipient.login, commentable_url(comment)}".html_safe
-            - else
-              %strong= :on_commentable.l + ": #{link_to comment.commentable_name, commentable_url(comment)} (#{comment.commentable_type.l})".html_safe
-          %dd
-            %p= truncate_words( comment.comment, 10, '...').html_safe
-
-
-  - unless @photo_comments.empty?
-    -box :class => 'yui-g alt', :id => 'photo_comments' do
-      %h3=:photo_comments.l
-      - @photo_comments.each do |comment|
-        %dl.vcard
-          %dt.photo
-            = link_to(image_tag((comment.user && comment.user.avatar_photo_url(:thumb) || configatron.photo.missing_thumb), :width => '50', :height => '50'), user_photo_path(@user, comment.commentable))            
-          %dd.fn= "#{comment.username}" + " " + :says.l + ":"
-          %dd
-            = truncate_words(comment.comment, 10).html_safe
-            %br
-            = link_to "» ".html_safe + :view_comment.l, user_photo_path(@user, comment.commentable) + "#comment_#{comment.id}"
-
-#yui-main
-  .yui-b
-    - if @photos.empty? and @recent_posts.empty?
-      -box :class => "alt first_alt" do 
-        %h3= :small_profile.l :user => @user.login
-
-    - unless @photos.empty?
-      -box :id => "photos" do
-        %h3=:my_photos.l
-        - @photos.each do |photo|
-          = link_to image_tag( photo.photo.url(:thumb), :class => "polaroid"), user_photo_path(@user, photo)
-
-        %h6.all.right= link_to :view_all_my_photos.l, user_photos_path(@user)
-        =link_to(:add_a_photo.l, new_user_photo_path(@user)) if @is_current_user
-
-    - unless @recent_posts.empty?
-      -box :id => "posts" do
-        %h3=:recent_blog_posts.l
-        = render :partial => 'posts/post', :collection => @recent_posts
-        %h6.right.all= link_to :view_my_blog.l, user_posts_path(@user)
-
-    - unless @clippings.empty?
-      -box :id => "clippings" do
-        %h3=:my_clippings.l
-        - @clippings.each do |clipping|
-          %a{"href"=>"#{h user_clipping_url(@user, clipping)}"}
-            %img.clipping.polaroid{"src"=>"#{h clipping.image_uri(:thumb)}", :width => '100', :height => '100'}
-        %h6.all.right= link_to :view_all_my_clippings.l, user_clippings_path(@user)
-
-    -box :class => 'hfeed comments', :id => 'comments' do
-      %h3=:profile_comments.l
-      %h2=:add_your_comment.l
-      = render :partial => 'comments/comment_form', :locals => {:commentable => @user}
-      %a#newest_comment
-      = render :partial => 'comments/comment', :collection => @comments
-      %span#more_comments_links= more_comments_links(@user)
+      = link_to fa_icon('plus-circle', :text => :view_all_my_photos.l), user_photos_path(@user)
+    %p=link_to(:add_a_photo.l, new_user_photo_path(@user)) if @is_current_user
+
+- unless @recent_posts.empty?
+  .clearfix
+    %h2=:recent_blog_posts.l
+    = render :partial => 'posts/post', :collection => @recent_posts
+    %h6.right.all= link_to :view_my_blog.l, user_posts_path(@user)
+
+- unless @clippings.empty?
+  .clearfix
+    %h2=:my_clippings.l
+    %ul.list-unstyled.thumbnails
+      - @clippings.each do |clipping|
+        %li.col-sm-3=render :partial => 'clippings/clipping', :locals => {:clipping => clipping}
+    = link_to fa_icon('plus-circle', :text => :view_all_my_clippings.l), user_clippings_path(@user)
+
+.clearfix
+  %h2=:profile_comments.l
+  %h3=:add_your_comment.l
+  = render :partial => 'comments/comment_form', :locals => {:commentable => @user}
+  %a#newest_comment
+  = render :partial => 'comments/comment', :collection => @comments
+  %span#more_comments_links= more_comments_links(@user)