From f6c482c06f48449e7dcff34455b5bbdfbd8f6c7b Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 24 Jan 2013 17:47:09 +0200
Subject: User can create group

---
 app/views/users/_profile.html.haml | 23 +++++++++++++++++++++++
 app/views/users/show.html.haml     | 28 ++++++----------------------
 2 files changed, 29 insertions(+), 22 deletions(-)
 create mode 100644 app/views/users/_profile.html.haml

(limited to 'app/views/users')

diff --git a/app/views/users/_profile.html.haml b/app/views/users/_profile.html.haml
new file mode 100644
index 00000000000..ab6538f083b
--- /dev/null
+++ b/app/views/users/_profile.html.haml
@@ -0,0 +1,23 @@
+.ui-box
+  %h5.title
+    Profile
+  %ul.well-list
+    %li
+      %strong Email
+      %span.right= mail_to @user.email
+    - unless @user.skype.blank?
+      %li
+        %strong Skype
+        %span.right= @user.skype
+    - unless @user.linkedin.blank?
+      %li
+        %strong LinkedIn
+        %span.right= @user.linkedin
+    - unless @user.twitter.blank?
+      %li
+        %strong Twitter
+        %span.right= @user.twitter
+    - unless @user.bio.blank?
+      %li
+        %strong Bio
+        %span.right= @user.bio
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 2a77c6bfa3d..644826282b8 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -3,6 +3,11 @@
     %h3.page_title
       = image_tag gravatar_icon(@user.email, 90), class: "avatar s90"
       = @user.name
+      - if @user == current_user
+        .right
+          = link_to profile_path, class: 'btn small' do
+            %i.icon-edit
+            Edit Profile
       %br
       %small @#{@user.username}
       %br
@@ -12,26 +17,5 @@
     %h5 Recent events
     = render @events
   .span4
-    .ui-box
-      %h5.title Profile
-      %ul.well-list
-        %li
-          %strong Email
-          %span.right= mail_to @user.email
-        - unless @user.skype.blank?
-          %li
-            %strong Skype
-            %span.right= @user.skype
-        - unless @user.linkedin.blank?
-          %li
-            %strong LinkedIn
-            %span.right= @user.linkedin
-        - unless @user.twitter.blank?
-          %li
-            %strong Twitter
-            %span.right= @user.twitter
-        - unless @user.bio.blank?
-          %li
-            %strong Bio
-            %span.right= @user.bio
+    = render 'profile'
     = render 'projects'
-- 
cgit v1.2.1