diff options
Diffstat (limited to 'users/app/views')
| -rw-r--r-- | users/app/views/emails/_email.html.haml.orig | 12 | ||||
| -rw-r--r-- | users/app/views/webfinger/host_meta.erb | 11 | ||||
| -rw-r--r-- | users/app/views/webfinger/search.erb | 6 |
3 files changed, 29 insertions, 0 deletions
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 diff --git a/users/app/views/webfinger/host_meta.erb b/users/app/views/webfinger/host_meta.erb new file mode 100644 index 0000000..23b4039 --- /dev/null +++ b/users/app/views/webfinger/host_meta.erb @@ -0,0 +1,11 @@ + <?xml version='1.0' encoding='UTF-8'?> + <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'> + + <Subject><%= @host_meta.subject %></Subject> + + + <Link rel='lrdd' + type='application/xrd+xml' + template='<%= @host_meta.webfinger_template %>' /> + + </XRD> diff --git a/users/app/views/webfinger/search.erb b/users/app/views/webfinger/search.erb new file mode 100644 index 0000000..0bcb7e5 --- /dev/null +++ b/users/app/views/webfinger/search.erb @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> + <Subject>acct:<%= @subject.email_identifier %></Subject> + <Alias>"<%= user_url(@subject.subject) %>"</Alias> + <Link rel="public-key" type = 'PGP' href="<%= @subject.key %>"/> +</XRD> |