From 8141876126aa25d713cf4b2c76c3ecff837c4ba7 Mon Sep 17 00:00:00 2001
From: jessib <jessib@leap.se>
Date: Mon, 14 Jan 2013 12:39:59 -0800
Subject: Use partials for displaying details shown when viewing a user. Some
 of these partials have specific CSS for another use, so we will likely want
 to tweak this.

---
 users/app/views/emails/_email.html.haml |  5 +++--
 users/app/views/users/show.html.haml    | 21 ++++++++-------------
 2 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'users/app/views')

diff --git a/users/app/views/emails/_email.html.haml b/users/app/views/emails/_email.html.haml
index 3feb6f0..948d847 100644
--- a/users/app/views/emails/_email.html.haml
+++ b/users/app/views/emails/_email.html.haml
@@ -1,6 +1,7 @@
 - if email.valid?
   %li.pull-right
     %code= email
-    = link_to(user_email_alias_path(@user, email), :method => :delete) do
-      %i.icon-remove
+    - if params[:action] == 'edit'
+      = link_to(user_email_alias_path(@user, email), :method => :delete) do
+        %i.icon-remove
   .clearfix
diff --git a/users/app/views/users/show.html.haml b/users/app/views/users/show.html.haml
index 9df029e..2b59c66 100644
--- a/users/app/views/users/show.html.haml
+++ b/users/app/views/users/show.html.haml
@@ -1,5 +1,7 @@
 .span8.offset1
   %h2= @user.login
+  .small
+    = link_to 'edit', edit_user_path(@user)
   %dl.offset1
     - fields = ['login', 'email', 'created_at', 'updated_at', 'email_forward']
     - fields.each do |field|
@@ -14,19 +16,12 @@
       - if aliases.empty?
         none set
       - else
-        %ul.unstyled
-          - aliases.each do |al|
-            %li
-              = al.email
+        .pull-left
+          = render aliases
+    .clearfix
     %dt
       =t :most_recently_updated_tickets
     %dd
-      %ul
-        - @user.most_recent_tickets.each do |ticket|
-          %li
-            = link_to ticket.title, ticket
-            %small
-              updated:
-              = ticket.updated_at.to_s(:long)
-
-
+      %table
+        %tbody
+          = render @user.most_recent_tickets
\ No newline at end of file
-- 
cgit v1.2.3