0
@@ -63,7 +63,7 @@ class UsersController < BaseController
0
 
0
     @recent_posts = @user.posts.find(:all, :limit => 2, :order => "created_at DESC")
0
     @clippings = @user.clippings.find(:all, :limit => 5)
0
-    @photos = @user.photos.find(:all, :limit => 4)
0
+    @photos = @user.photos.find(:all, :limit => 5)
0
     @comment = Comment.new(params[:comment])
0
     update_view_count(@user) unless current_user && current_user.eql?(@user)
0
   end

0
@@ -14,7 +14,7 @@
0
     = auto_discovery_link_tag(:rss, @rss_url, {:title => @rss_title})
0
     
0
   %body
0
-    #doc2.yui-t6
0
+    #doc2{:class => "yui-t#{@sidebar_left ? 3 : 6}"}
0
       = render :partial => "shared/header"
0
             
0
       #bd

0
@@ -25,6 +25,4 @@
0
     
0
     = render :partial => 'polls/excerpt', :locals => {:poll => post.poll} if post.poll
0
     
0
-
0
-    %h6 
0
-      =link_to 'read more', user_post_path(post.user, post), :rel=> 'bookmark'
0
\ No newline at end of file
0
+    %h6=link_to 'read more', user_post_path(post.user, post), :rel=> 'bookmark'
0
\ No newline at end of file

0
@@ -8,7 +8,7 @@
0
     %br/
0
     = link_to( "» Toggle #{AppConfig.featured_writer_label}", toggle_featured_user_path(@user), {:method => :put} )
0
 
0
-#profile_details.box
0
+#profile_details.box.hentry
0
   %h3
0
     = link_to @user.login, user_path(@user)
0
     = " <small>(#{AppConfig.featured_writer_label})</small>" if @user.featured_writer?
0
@@ -17,9 +17,9 @@
0
     - if @user.avatar
0
       = @user.vendor ? "<div class='right_corner'><div class='community_pro'></div></div>" : ''
0
       = @user.featured_writer ? "<div class='right_corner'><div class='featured_writer'></div></div>" : ''
0
-      = image_tag( @user.avatar_photo_url(:medium))
0
+      = image_tag( @user.avatar_photo_url(:medium), :class => 'polaroid')
0
     - elsif @is_current_user
0
-      = image_tag( @user.avatar_photo_url(:medium))
0
+      = image_tag( @user.avatar_photo_url(:medium), :class => "polaroid")
0
       %br
0
       No profile photo?
0
       = link_to "Click here to upload one!", edit_user_path(@user)
0
@@ -29,15 +29,19 @@
0
   - if current_user and current_user.can_request_friendship_with(@user)
0
     = add_friend_link(@user)
0
 
0
-  %br/
0
   %h3 My Details
0
-  %ul
0
-    %li
0
-      = @user.created_at.strftime("Member since: %m/%d/%y")
0
-    %li= "Profile views: #{@user.view_count}"
0
-    - if @user.offerings.any?
0
-      %li= "My skills: #{@user.offerings.collect{|o| link_to o.skill.name, skill_url(o.skill) }.join(', ')}"
0
-    - if @user.tags.any?
0
-      %li= "My tags: #{@user.tags.collect{|t| link_to t.name, tag_url(t.name) }.join(", ")}"
0
-    - if @user.metro_area
0
-      %li= link_to( @user.full_location, users_path(:metro_area_id => @user.metro_area_id, :state_id => @user.state_id, :country_id => @user.country_id ) ) 
0
+  .vcard.author
0
+    %ul
0
+      %li.update
0
+        %a{:href=>"#{user_path(@user)}", :rel=>"bookmark"}
0
+          %abbr.published{:title=>"#{@user.created_at}"}
0
+            = @user.created_at.strftime("Member since: %m/%d/%y")          
0
+      %li.view
0
+        profile views
0
+        = "(#{@user.view_count})"
0
+      - if @user.offerings.any?
0
+        %li.skills= "My skills: #{@user.offerings.collect{|o| link_to o.skill.name, skill_url(o.skill) }.join(', ')}"
0
+      - if @user.tags.any?
0
+        %li.tags= "My tags: #{@user.tags.collect{|t| link_to t.name, tag_url(t.name) }.join(", ")}"
0
+      - if @user.metro_area
0
+        %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 ) ) 

0
@@ -1,5 +1,7 @@
0
 - @meta = { :description => "#{@user.login}'s DIY projects, interior design ideas and favorites.", :keywords => "#{@user.login}, #{@user.tags.join(", ") unless @user.tags.nil?}, diy, design, interior-design" }
0
 - @section = @user.eql?(current_user) ? 'my_profile' : 'users'
0
+- @sidebar_left = true
0
+
0
 
0
 - if @is_current_user and @user.vendor? and (@user.offerings.empty? or @user.description.nil? )
0
   %p
0
@@ -15,11 +17,10 @@
0
     = render :partial => 'profile_user_info_sidebar', :locals => {:user => @user}
0
 
0
   - if @user.description
0
-    #about_me.box.alt
0
+    #about_me.box
0
       %h3
0
         About Me
0
-      %p
0
-        = @user.description
0
+      %p= @user.description
0
 
0
   #friends.box.alt
0
     %h3
0
@@ -70,33 +71,31 @@
0
 #yui-main
0
   .yui-b
0
     - if @photos.empty? and @recent_posts.empty?
0
-      %h1.gray= "#{@user.login} doesn't have much here yet. Stay tuned."
0
-      %br
0
+      .box.alt.first_alt
0
+        %h3= "#{@user.login} doesn't have much here yet. Stay tuned."
0
       
0
     - unless @photos.empty?
0
       #photos.box
0
         %h3 Photos
0
         - @photos.each do |photo|
0
           = link_to image_tag( photo.public_filename(:thumb), :class => "polaroid"), user_photo_path(@user, photo)
0
-        %br
0
-        = link_to "» View all my photos", user_photos_path(@user)
0
-        = " | #{link_to("Add a photo", new_user_photo_path(@user))}" if @is_current_user
0
+
0
+        %h6.all.right= link_to "View all my photos", user_photos_path(@user)
0
+        = "#{link_to("Add a photo", new_user_photo_path(@user))}" if @is_current_user
0
 
0
     - unless @recent_posts.empty?
0
       #posts.box
0
         %h3 Recent Blog Posts
0
-        = link_to "» View my blog", user_posts_path(@user)
0
-        %br
0
         = render :partial => 'posts/post', :collection => @recent_posts
0
+        %h6.right.all= link_to "View my blog", user_posts_path(@user)        
0
 
0
     - unless @clippings.empty?
0
       #clippings.box
0
         %h3 Clippings
0
         - @clippings.each do |clipping|
0
           %a{"href"=>"#{h user_clipping_url(@user, clipping)}"}
0
-            %img.clipping{"src"=>"#{h clipping.image_uri(:thumb)}", :width => '100', :height => '100'}
0
-        %br
0
-        = link_to "View all my clippings", user_clippings_path(@user)
0
+            %img.clipping.polaroid{"src"=>"#{h clipping.image_uri(:thumb)}", :width => '100', :height => '100'}
0
+        %h6.all.right= link_to "View all my clippings", user_clippings_path(@user)
0
 
0
     #comments.box.hfeed.comments
0
       %h3 Profile Comments

0
@@ -77,6 +77,10 @@ div.auto_complete {
0
   float:left;}
0
 .centered {
0
   text-align:center; }
0
+img.polaroid {
0
+	padding:5px;
0
+	border: 1px solid #A2A19B;
0
+	}
0
 
0
 
0
 /* =============================================== */
0
@@ -332,6 +336,9 @@ padding:0 0 3px 0;
0
 .hentry .vcard ul li.print{background-image: url(/plugin_assets/community_engine/images/icons/printer.png) }
0
 .hentry .vcard ul li.email{background-image: url(/plugin_assets/community_engine/images/icons/user_go.png) }
0
 .hentry .vcard ul li.share{background-image: url(/plugin_assets/community_engine/images/icons/group_go.png) }
0
+.hentry .vcard ul li.tags{background-image: url(/plugin_assets/community_engine/images/icons/tag_blue.png) }
0
+.hentry .vcard ul li.skills{background-image: url(/plugin_assets/community_engine/images/icons/wrench.png) }
0
+.hentry .vcard ul li.geo{background-image: url(/plugin_assets/community_engine/images/icons/world.png) }
0
 
0
 .entry-content h6{
0
 border-bottom: 1px dotted #a2a19b;
0
@@ -347,6 +354,7 @@ text-transform: uppercase;
0
 text-decoration: none;
0
 background: transparent url(/plugin_assets/community_engine/images/icons/add.png) no-repeat left center;
0
 padding-left: 20px;
0
+padding: 2px 2px 2px 20px;
0
 }
0
 
0
 .entry-content h6 a:hover{text-decoration: underline;}
0
@@ -584,13 +592,13 @@ padding: 3px 0;
0
 
0
 .fresh dt{
0
 float: left;
0
-width: 13.8461em; /* about 180px */
0
-*width:  13.5em; /* for IE */
0
+width: 10.8461em; /* about 180px - 3em */
0
+*width:  10.5em; /* for IE */
0
 }
0
 
0
 .fresh dd{
0
-margin-left:  15.3846em; /* about 200px */
0
-*margin-left:  15em; /* about 200px */
0
+margin-left:  12.3846em; /* about 200px - 3em*/
0
+*margin-left:  12em; /* about 200px */
0
 }
0
 
0
 .fresh dt {
0
@@ -774,4 +782,17 @@ div.user_list .row {
0
   padding:0.5em;
0
   }
0
   div.user_list .row h3 {
0
-		}
0
\ No newline at end of file
0
+		}
0
+		
0
+		
0
+/*PHOTOS & CLIPPINGS*/
0
+#photos img.polaroid, #clippings img.polaroid {
0
+	margin: 0 12px 15px 0;
0
+	}
0
+	
0
+/*USER PROFILE SIDEBAR*/
0
+#profile_details div.vcard{
0
+	width: 100%;}
0
+	#profile_details .vcard ul{
0
+		margin-left: 0px;}
0
+