3 files changed, 16 insertions, 40 deletions
diff --git a/users/app/views/email_settings/edit.html.haml b/users/app/views/email_settings/edit.html.haml
deleted file mode 100644
index 7757a31..0000000
--- a/users/app/views/email_settings/edit.html.haml
+++ /dev/null
@@ -1,38 +0,0 @@
-- form_options = {:url => user_email_settings_path(@user), :html => {:class => 'form-horizontal'}, :validate => true}
-- alias_error_class = @email_alias.username && !@email_alias.valid? ? 'error' : ''
-
-- content_for :head do
-  :css
-    table.aliases tr:first-child td {
-      border-top: none;
-    }
-
-= simple_form_for @user, form_options.dup do |f|
-  %legend= t(:email_aliases)
-  .control-group
-    %label.control-label= t(:current_aliases)
-    .controls
-      %table.table.table-condensed.no-header.slim.aliases
-        - if @user.email_aliases.any?
-          - @user.email_aliases.each do |email|
-            %tr
-              %td= email
-              %td= link_to(icon(:remove) + t(:remove), user_email_alias_path(@user, email), :method => :delete)
-        - else
-          %tr
-            %td{:colspan=>2}= t(:none)
-  .control-group{:class => alias_error_class}
-    %label.control-label= t(:add_email_alias)
-    .controls
-      = f.simple_fields_for :email_aliases, @email_alias do |e|
-        .input-append
-          = e.input_field :username
-          = e.submit t(:add), :class => 'btn'
-        = e.error :username
-
-= simple_form_for @user, form_options do |f|
-  %legend= t(:advanced_options)
-  = f.input :email_forward
-  = f.input :public_key, :as => :text, :hint => t(:use_ascii_key), :input_html => {:class => "full-width", :rows => 4}
-  .form-actions
-    = f.submit t(:save), :class => 'btn btn-primary'
diff --git a/users/app/views/users/_edit.html.haml b/users/app/views/users/_edit.html.haml
index 0402f37..5f74d32 100644
--- a/users/app/views/users/_edit.html.haml
+++ b/users/app/views/users/_edit.html.haml
@@ -23,6 +23,20 @@
       = f.submit t(:save), :class => 'btn btn-primary'
 
 -#
+-# CHANGE PGP KEY
+-#
+-# this will be replaced by a identities controller/view at some point
+-#
+
+- form_options = {:html => {:class => user_form_class('form-horizontal'), :id => 'update_pgp_key'}, :validate => true}
+= simple_form_for [:api, @user], form_options do |f|
+  %legend= t(:advanced_options)
+  = f.input :public_key, :as => :text, :hint => t(:use_ascii_key), :input_html => {:class => "full-width", :rows => 4}
+  .control-group
+    .controls
+      = f.submit t(:save), :class => 'btn'
+
+-#
 -# DESTROY ACCOUNT
 -#
 
@@ -48,4 +62,4 @@
   %p= t(:enable_description)
   = link_to enable_user_path(@user), :method => :post, :class => "btn btn-warning"  do
     %i.icon-ok.icon-white
-    = t(:enable)
-\ No newline at end of file
+      = t(:enable)
diff --git a/users/app/views/users/_warnings.html.haml b/users/app/views/users/_warnings.html.haml
index 7e0b2ce..79ab103 100644
--- a/users/app/views/users/_warnings.html.haml
+++ b/users/app/views/users/_warnings.html.haml
@@ -1,5 +1,5 @@
 %noscript
-  %div.alert.alert-error=t :js_required
+  %div.alert.alert-error=t :js_required_html
 #cookie_warning.alert.alert-error{:style => "display:none"}
   =t :cookie_disabled_warning
 :javascript