community_engine 2.3.2 → 3.0.0

data/app/views/user_notifier/follow_up_comment_notice.text.erb

@@ -12,4 +12,4 @@ The <%= configatron.community_name %> team
 If you don't want to receive e-mails like this one from <%= configatron.community_name %>, you can change 
 your e-mail preferences here:
 
-<%= home_url %>/<%= @user.friendly_id %>/edit_account
+<%= edit_account_from_email_url %>

data/app/views/user_notifier/message_notification.text.erb

@@ -11,4 +11,4 @@ The <%= configatron.community_name %> team
 
 Forgot your <%= configatron.community_name %> password? Visit this URL to reset it:
 
-<%= configatron.app_host %>/forgot_password
+<%= forgot_password_url %>

data/app/views/user_notifier/new_forum_post_notice.text.erb

@@ -11,4 +11,4 @@ The <%= configatron.community_name %> team
 If you don't want to receive e-mails like this one from <%= configatron.community_name %>, you can change 
 your e-mail preferences here:
 
-<%= home_url %>/<%= @user.friendly_id %>/edit_account
+<%= edit_account_from_email_url %>

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

@@ -1,40 +1,37 @@
-.yui-b
-  -box do 
-    %h3=:dashboard.l
-    .yui-g
-      .yui-u.first
-        = image_tag 'icons/accept.png', :plugin => 'community_engine'
-        =:view.l
-        %ul
-          %li=link_to :my_profile.l, user_path(@user)  
-          %li=link_to :my_blog.l, user_posts_path(@user)
-          %li=link_to :photo_manager.l, user_photo_manager_index_path(@user)
-          %li=link_to :my_clippings.l, user_clippings_path(@user)
-          %li=link_to :my_friends.l, accepted_user_friendships_path(@user)
-          %li=link_to :inbox.l, user_messages_path(@user)
-      .yui-u
-        = image_tag 'icons/wrench.png', :plugin => 'community_engine'
-        =:manage.l
-        %ul
-          %li=link_to :my_profile.l, edit_user_path(@user)
-          %li=link_to :my_account.l, edit_account_user_path(@user)
-          %li=link_to :my_blog_posts.l, manage_user_posts_path(@user)
-          -if current_user.admin?
-            %li=link_to :admin_dashboard.l, admin_dashboard_path
-  -box :class => "alt" do 
-    %h3=:stats.l
-    %ul
-      - if @user.last_login_at
-        %li=:you_last_logged_in_on.l+" #{I18n.l(@user.last_login_at, :format => :published_date)}"
-      %li=:member_since.l+" #{I18n.l(@user.created_at, :format => :published_date)}"
-      -unless @user.posts.empty?
-        %li=:you_have_written_blog_posts.l(:count => @user.posts.count)
-      -unless @user.photos.empty?
-        %li=:you_have_uploaded_photos.l(:count => @user.photos.count)
-      -unless @user.clippings.empty?
-        %li=:you_have_added_clippings.l(:count => @user.clippings.count)
-      -unless @user.comments.empty?
-        %li=:you_have_left_comments.l(:count => @user.posts.count)
-      -unless @user.accepted_friendships.empty?
-        %li=:you_have_friends.l(:count => @user.accepted_friendships.count)
+
+-widget do
+  %h3=:dashboard.l
+  %ul.list-unstyled
+    %p
+      =fa_icon "check", :text => :view.l
+    %li=link_to :my_profile.l, user_path(@user)
+    %li=link_to :my_blog.l, user_posts_path(@user)
+    %li=link_to :photo_manager.l, user_photo_manager_index_path(@user)
+    %li=link_to :my_clippings.l, user_clippings_path(@user)
+    %li=link_to :my_friends.l, accepted_user_friendships_path(@user)
+    %li=link_to :inbox.l, user_messages_path(@user)
+    %p
+      =fa_icon "wrench", :text => :manage.l
+    %li=link_to :my_profile.l, edit_user_path(@user)
+    %li=link_to :my_account.l, edit_account_user_path(@user)
+    %li=link_to :my_blog_posts.l, manage_user_posts_path(@user)
+    -if current_user.admin?
+      %li=link_to :admin_dashboard.l, admin_dashboard_path
+-widget do
+  %h4
+    .small=:stats.l
+  %ul.list-unstyled
+    - if @user.last_login_at
+      %li=:you_last_logged_in_on.l+" #{I18n.l(@user.last_login_at, :format => :published_date)}"
+    %li=:member_since.l+" #{I18n.l(@user.created_at, :format => :published_date)}"
+    -unless @user.posts.empty?
+      %li=:you_have_written_blog_posts.l(:count => @user.posts.count)
+    -unless @user.photos.empty?
+      %li=:you_have_uploaded_photos.l(:count => @user.photos.count)
+    -unless @user.clippings.empty?
+      %li=:you_have_added_clippings.l(:count => @user.clippings.count)
+    -unless @user.comments.empty?
+      %li=:you_have_left_comments.l(:count => @user.posts.count)
+    -unless @user.accepted_friendships.empty?
+      %li=:you_have_friends.l(:count => @user.accepted_friendships.count)
 

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

@@ -0,0 +1,6 @@
+- if current_page?(users_path) || (params[:controller] == 'users' && !@user.nil? && @user != current_user)
+  - css_class = 'active'
+- else
+  - css_class = 'inactive'
+
+%li{:class => css_class}= link_to :people.l, users_path

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

@@ -1,4 +1,4 @@
--if !configatron.auth_providers.nil?
+-if configatron.has_key?(:auth_providers)
   -remaining_providers = configatron.auth_providers.to_hash.keys.map(&:to_s) - @authorizations.map(&:provider)
   #omniauth_connect
 
@@ -9,13 +9,13 @@
           %span.auth_providers_used
             = image_tag "auth/#{authorization.provider}_32.png"
             -if @authorizations.size > 1
-              = link_to image_tag("auth/remove.png"), authorization, :confirm => t('users.edit_account.omniauth.confirm_remove', :provider => authorization.provider.capitalize), :method => :delete, :class => "omniauth_remove", :title => t('users.edit_account.omniauth.title_remove', :provider => authorization.provider.capitalize)
+              = link_to image_tag("auth/remove.png"), authorization, :data => {:confirm => t('users.edit_account.omniauth.confirm_remove', :provider => authorization.provider.capitalize)}, :method => :delete, :class => "omniauth_remove", :title => t('users.edit_account.omniauth.title_remove', :provider => authorization.provider.capitalize)
         .clear
 
-    
+
     -if remaining_providers.any?
       %em Add another provider to sign in with:
-      %ul
+      %ul.list-unstyled
         -remaining_providers.each do |provider|
           -alt = t('sessions.new.omniauth.button_alt', :provider => provider.capitalize)
           %li= link_to(image_tag("auth/#{provider}_32.png", :alt => alt), "/auth/#{provider}", :title => alt)

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

@@ -1,11 +1,11 @@
 - completeness ||= profile_completeness(user)
 - percent = completeness[:score]
 
-%table.poll{:width => '100%', :style => "margin-bottom: 0"}
+%table{:width => '100%', :style => "margin-bottom: 0"}
   %tr
     %td.bars
-      .bar-container{:style => 'width:50%'}
-        .bar{:style => "width:#{percent}%"}
+      .progress{:style => 'width:50%'}
+        .progress-bar.progress-bar-success{:style => "width:#{percent}%"}
       %small
         = number_to_percentage(percent, :precision => 0)
         profile completeness

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

@@ -1,50 +1,47 @@
-- if current_user && current_user.admin?
-  -box :class => "first_alt alt" do 
-    %h3
-      =:admin_controls.l
-    = link_to(:assume_user_id.l, assume_user_path(@user), {:method => :post} )
-    %br/      
-    = link_to(:delete_this_user.l, user_path(@user), {:method => :delete, :confirm => :are_you_sure_you_want_to_permanently_delete_this_user.l} )
-    %br/      
-    = link_to("#{:toggle.l} #{:featured_writer.l}".html_safe, toggle_featured_user_path(@user), {:method => :put} )
-    %br/      
-    = link_to("#{:assign_role.l}: #{@user.moderator? ? :member.l : :moderator.l}".html_safe, toggle_moderator_user_path(@user), {:method => :put} )
 
--box :class => 'hentry', :id => 'profile_details' do
+-widget :class => 'hentry', :id => 'profile_details' do
   %h3
     = link_to @user.login, user_path(@user)
-    -if @user.featured_writer?    
-      %small=:featured_writer.l 
+    -if @user.featured_writer?
+      %small=:featured_writer.l
+
 
-  .centered
-    - if @is_current_user
-      - if @user.avatar
-        = @user.vendor ? "<div class='right_corner'><div class='community_pro'></div></div>".html_safe : ''
-        = @user.featured_writer ? "<div class='right_corner'><div class='featured_writer'></div></div>".html_safe : ''
-        = link_to :profile_photo_crop.l, crop_profile_photo_user_path(@user)
-      - else 
-        =:no_profile_photo.l
-        = link_to :click_here_to_upload_one.l, edit_user_path(@user)
-      %br        
-    = image_tag( @user.avatar_photo_url(:medium), :class => "polaroid")    
+  - if @is_current_user
+    - if @user.avatar
+      = @user.vendor ? "<div class='right_corner'><div class='community_pro'></div></div>".html_safe : ''
+      = @user.featured_writer ? "<div class='right_corner'><div class='featured_writer'></div></div>".html_safe : ''
+      = link_to :profile_photo_crop.l, crop_profile_photo_user_path(@user)
+    - else
+      =:no_profile_photo.l
+      = link_to :click_here_to_upload_one.l, edit_user_path(@user)
+    %br
+  = image_tag( @user.avatar_photo_url(:medium), :class => "img-responsive")
 
   - if current_user and current_user.can_request_friendship_with(@user)
-    = add_friend_link(@user)
+    %p= add_friend_link(@user)
+
+  %ul
+    %li.update
+      %a{:href=>"#{user_path(@user)}", :rel=>"bookmark"}
+        %abbr.published{:title=>"#{@user.created_at}"}
+          =:member_since.l+" #{I18n.l(@user.created_at, :format => :short_published_date)}"
+    %li.view
+      =:view_count.l
+      = "(#{@user.view_count})"
+    - if @user.tags.any?
+      %li.tags= "#{:my_tags.l}: #{@user.tags.collect{|t| link_to t.name, tag_url(t) }.join(", ")}".html_safe
+    - if @user.metro_area
+      %li.geo= link_to( @user.full_location, users_path(:metro_area_id => @user.metro_area_id, :state_id => @user.state_id, :country_id => @user.country_id ) )
+    - if current_user && @user != current_user
+      %li.compose= link_to(:send_me_a_message.l, new_user_message_path(current_user, :to=>@user))
+
+- if current_user && current_user.admin?
+  -widget do
+    %h4
+      .small=:admin_controls.l
+    %ul.list-unstyled
+      %li= link_to(:assume_user_id.l, assume_user_path(@user), {:method => :post} )
+      %li= link_to(:delete_this_user.l, user_path(@user), {:method => :delete, data: { confirm: :are_you_sure_you_want_to_permanently_delete_this_user.l }} )
+      %li= link_to("#{:toggle.l} #{:featured_writer.l}".html_safe, toggle_featured_user_path(@user), {:method => :put} )
+      %li= link_to("#{:assign_role.l}: #{@user.moderator? ? :member.l : :moderator.l}".html_safe, toggle_moderator_user_path(@user), {:method => :put} )
 
-  %h3=:my_details.l
-  .vcard.author
-    %ul
-      %li.update
-        %a{:href=>"#{user_path(@user)}", :rel=>"bookmark"}
-          %abbr.published{:title=>"#{@user.created_at}"}
-            =:member_since.l+" #{I18n.l(@user.created_at, :format => :short_published_date)}"
-      %li.view
-        =:view_count.l
-        = "(#{@user.view_count})"
-      - if @user.tags.any?
-        %li.tags= "#{:my_tags.l}: #{@user.tags.collect{|t| link_to t.name, tag_url(t) }.join(", ")}".html_safe
-      - if @user.metro_area
-        %li.geo= link_to( @user.full_location, users_path(:metro_area_id => @user.metro_area_id, :state_id => @user.state_id, :country_id => @user.country_id ) ) 
-      - if current_user && @user != current_user
-        %li.compose= link_to(:send_me_a_message.l, new_user_message_path(current_user, :to=>@user))
-  .clear

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

@@ -1,10 +1,12 @@
-
--box :class => 'alt first_alt' do
+  
+-widget do
   %h3= :metro_areas.l
-  - city_cloud @metro_areas_for_cloud, %w(nube1 nube2 nube3 nube4 nube5) do |city, css_class|
-    = link_to city.name, users_path(:metro_area_id => city.id), :class => css_class
+  %p
+    - city_cloud @metro_areas_for_cloud, %w(css1 css2 css3 css4 css5) do |city, css_class|
+      = link_to city.name, users_path(:metro_area_id => city.id), :class => css_class
 
 - if current_user
-  -box :class => "alt" do 
-    %h3= :share_the_love.l
-    = link_to :invite_your_friends_to_join.l, invite_user_path(current_user)
+  -widget do
+    %h4
+      .small= :share_the_love.l
+    %p= link_to :invite_your_friends_to_join.l, invite_user_path(current_user)

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

@@ -1,6 +1,6 @@
 %dl.vcard.clear
   %dt.photo
-    = link_to image_tag(user.avatar_photo_url(:thumb), :alt => "#{user.login}", :width => '50', :height => '50'), user_path(user)
+    = link_to image_tag(user.avatar_photo_url(:thumb), :alt => "#{user.login}"), user_path(user)
   %dd.fn
     =link_to user.login, user_path(user), :class => 'url'
   %dd

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

@@ -1,31 +1,30 @@
-.hentry.yui-gf.row{"class"=>"#{user.authorizations.map(&:provider).join(' ')} #{user.vendor ? 'community_pro' : ''} #{user.featured_writer ? 'featured_writer' : ''}"}
-  .vcard.author
-    .yui-u.first.centered
-      = link_to image_tag( user.avatar_photo_url(:thumb), :class => "polaroid" ), user_path(user)
-    .yui-g
-      .yui-u.first
-        %h2= link_to user.login, user_path(user)
-      
-        %ul
-          - if user.metro_area        
-            %li.geo
-              = :from2.l
-              =user.location
-          %li.update
-            %abbr.published{:title=>"#{user.created_at}"}
-              =:joined.l + " #{time_ago_in_words_or_date user.created_at}"
-          - if current_user and current_user.can_request_friendship_with(user)
-            %li.addfriend= add_friend_link(user)
+.row.well
+  .col-sm-4= link_to image_tag( user.avatar_photo_url(:medium), :class => "img-responsive" ), user_path(user)
 
-        -unless user.tags.empty?
-          %p=raw user.tags[0...6].compact.collect{|t| link_to( t.name, tag_url(t), :class => "tag") }.join(" ")
+  .col-sm-6
+    %h4= link_to user.login, user_path(user)
 
-      .yui-u{"style"=>"overflow:hidden"}
-        - if @search && @search['description']
-          = truncate_words_with_highlight user.description, @search['description']
-        - else
-          = truncate_words user.description, 18, '...'
+    %p
+      - if @search && @search['description']
+        = truncate_words_with_highlight user.description, @search['description']
+      - else
+        = truncate_words user.description, 18, '...'
 
-        - if current_user && current_user.admin?
-          %br
-          = link_to( :assume_id.l, assume_user_path(user), :method => :post )
+
+    %ul.list-unstyled
+      - if user.metro_area
+        %li.geo
+          = :from2.l
+          =user.location
+      %li.update
+        %abbr.published{:title=>"#{user.created_at}"}
+          =:joined.l + " #{time_ago_in_words_or_date user.created_at}"
+      - if current_user and current_user.can_request_friendship_with(user)
+        %li{:class=>"addfriend_#{user.id}"}= add_friend_link(user)
+
+    -unless user.tags.empty?
+      %p=raw user.tags[0...6].compact.collect{|t| link_to( t.name, tag_url(t), :class => "tag") }.join(" ")
+
+    - if current_user && current_user.admin?
+      %p= button_to :assume_id.l, assume_user_path(user), :class => 'btn'
+    

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

@@ -1,45 +1,38 @@
-
-
-    
-.yui-b
-
-  -box :class => "alt first_alt" do 
-    = link_to :profile_photo_change.l, upload_profile_photo_user_path(@user)
-    
-  -box do 
-    %h3=:profile_photo.l
-    #previewWrap
+-@page_title= :profile_photo_crop.l 
+  
+-widget do 
+  %h3=:preview.l
+  #preview 
+  
+-widget do 
+  = link_to :profile_photo_change.l, upload_profile_photo_user_path(@user)
     
+= image_tag @photo.photo.url(:original), :id => 'croppable'
 
-#yui-main
-  -box :class => "yui-b" do
-    %h3= :profile_photo_crop.l  
+= bootstrap_form_for :photo, :url => crop_profile_photo_user_path(@user), :method => :put, :layout => :horizontal do |f|
+  - [:crop_x, :crop_y, :crop_w, :crop_h].each do |attribute|
+    %input{ :type=>"hidden", :name=>attribute, :id=>attribute, :value => ''}
 
-    = image_tag( @photo.photo.url, :id => 'photo' )
-  
-    = error_messages_for :photo
-
-    = form_for(:photo, :url => crop_profile_photo_user_path(@user), :method => :put, :html => { :class => "MainForm" }) do |f|
-      - [:crop_x, :crop_y, :crop_w, :crop_h].each do |attribute|
-        %input{ :type=>"hidden", :name=>attribute, :id=>attribute, :size=>"4"}
-    
-      %p
-        = submit_tag :update.l
-        = :or.l
-        = link_to :cancel_and_go_back_to_my_photos.l, user_photos_path(@user)
+  %br
+  = f.primary :update.l
 
+-content_for :head_css do
+  = stylesheet_link_tag 'cropper'
 
--content_for :head_css
 -content_for :end_javascript do
   = javascript_include_tag "cropper"
   :javascript
-    function onEndCrop( coords, dimensions ) {
-      $( 'crop_x' ).value = coords.x1;
-      $( 'crop_y' ).value = coords.y1;
-      $( 'crop_w' ).value = dimensions.width;
-      $( 'crop_h' ).value = dimensions.height;
-    }
-    function loadCropper() {
-      new Cropper.ImgWithPreview( 'photo', { previewWrap: 'previewWrap', minWidth: 100, minHeight: 100, ratioDim: { x: 290, y: 290 }, onEndCrop: onEndCrop } );      
-    }
-    Event.observe( window, 'load', function() { loadCropper(); } );      
+    jQuery(function($) {
+      // Settings for the cropper
+      minWidth = 300; // min width of crop area, also the starting width
+      minHeight = 200; // min height of crop area, also the starting height
+      previewRatio = 1/4; // i.e. preview to croppable ratio
+      bgColor = 'black';
+      bgOpacity = .4;
+      croppable_id = 'croppable'
+      preview_id = 'preview'
+      
+      // Then initialize the cropper, telling it where to find the croppable image's id and
+      // the preview div's id.
+      cropInit();
+    });

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

@@ -1,44 +1,40 @@
+
+- @page_title= :greeting.l :name => @user.login
 - @section = 'my_profile'
 
 =render :partial => "users/dashboard_nav"
-    
-
-  
-#yui-main
-  .yui-b
-    -box do 
-      %h3= :greeting.l :name => @user.login
-    
-      -if @user.pending_friendships.any?
-        %p
-          =link_to "#{image_tag 'icons/user_add.png'} #{:you_have_pending_friendship_requests.l}".html_safe, pending_user_friendships_path(@user)
-    
-    
-      -if @network_activity.empty? && @recommended_posts.empty?
-        %p
-          =:this_is_your_dashboard.l
-        %p
-          =:dashboard_friends.l :site => configatron.community_name
-          %br
-          =:to_start_adding_friends.l
-          =link_to :browse_all_members.l, users_path
-          \.
-        %p
-          =link_to :update_profile_and_tag_yourself.l, edit_user_path(current_user)
-          =:to_get_recommended_content_on_your_dashboard.l
-
-    
-      -unless @network_activity.empty?
-        %h2=:activity_from_your_network.l
-        -box :class => "fresh" do 
-          =render :partial => "activities/activity", :collection => @network_activity
-          %h6.all= link_to :see_all_activity.l, network_user_activities_path(current_user)
-
-      -unless @recommended_posts.empty?
-        %h3=:recommended_posts.l
-        #posts
-          %ul
-            -@recommended_posts.each do |post|
-              %li
-                = link_to( "#{post.tag_for_first_image_in_body} #{truncate(post.display_title, :length => 75)} <span class='post_excerpt'>#{ truncate_words(post.post, 35, '...' )} (#{:by.l :login => post.user.login})</span>".html_safe, user_post_path(post.user, post), :title => :by.l(:login => post.user.login) )
-                
+
+
+-if @user.pending_friendships.any?
+  %p
+    =link_to fa_icon('user', :text => :you_have_pending_friendship_requests.l), pending_user_friendships_path(@user)
+
+
+-if @network_activity.empty? && @recommended_posts.empty?
+  %p
+    =:this_is_your_dashboard.l
+  %p
+    =:dashboard_friends.l :site => configatron.community_name
+    %br
+    =:to_start_adding_friends.l
+    =link_to :browse_all_members.l, users_path
+    \.
+  %p
+    =link_to :update_profile_and_tag_yourself.l, edit_user_path(current_user)
+    =:to_get_recommended_content_on_your_dashboard.l
+
+
+-unless @network_activity.empty?
+  %h2=:activity_from_your_network.l
+  -box :class => "fresh" do
+    =render :partial => "activities/activity", :collection => @network_activity
+    =link_to fa_icon('plus-circle', :text => :see_all_activity.l), network_user_activities_path(current_user)
+
+-unless @recommended_posts.empty?
+  %h2=:recommended_posts.l
+  #posts
+    %ul
+      -@recommended_posts.each do |post|
+        %li
+          = link_to( "#{post.tag_for_first_image_in_body} #{truncate(post.display_title, :length => 75)} <span class='post_excerpt'>#{ truncate_words(post.post, 35, '...' )} (#{:by.l :login => post.user.login})</span>".html_safe, user_post_path(post.user, post), :title => :by.l(:login => post.user.login) )
+