From de48efcf2a6b5fb096fd209b1efea482f743c19c Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 22 Jan 2013 12:02:18 +0100
Subject: some basic webfinger routes, controller, presenters, views

---
 users/app/views/emails/_email.html.haml.orig | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 users/app/views/emails/_email.html.haml.orig

(limited to 'users/app/views/emails/_email.html.haml.orig')

diff --git a/users/app/views/emails/_email.html.haml.orig b/users/app/views/emails/_email.html.haml.orig
new file mode 100644
index 0000000..440870d
--- /dev/null
+++ b/users/app/views/emails/_email.html.haml.orig
@@ -0,0 +1,12 @@
+<<<<<<< HEAD
+%li.pull-right
+  %code= email
+  - if params[:action] == 'edit'
+=======
+= wrapped(email, local_assigns) do
+  = email
+  - if local_assigns[:with].try(:include?, :delete)
+>>>>>>> more flexible email partial
+    = link_to(user_email_alias_path(@user, email), :method => :delete) do
+      %i.icon-remove
+.clearfix
-- 
cgit v1.2.3