diff options
| author | jessib <jessib@riseup.net> | 2013-09-26 11:38:35 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-09-26 11:38:35 -0700 |
| commit | dba941539011f5e0634585e6c11a1c7f58110876 (patch) | |
| tree | 75ffdf66bdfaf61be5a75beb3b39f03ba1c4cd77 /users/app/views/users/_edit.html.haml | |
| parent | 663d37eef8fae9f1d27d115e48a7136309eab960 (diff) | |
| parent | 4f8414298750193b6de3daff08364ec745a6a761 (diff) | |
Merge pull request #90 from azul/feature/use-token-auth
Feature/use token auth
Diffstat (limited to 'users/app/views/users/_edit.html.haml')
| -rw-r--r-- | users/app/views/users/_edit.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/users/app/views/users/_edit.html.haml b/users/app/views/users/_edit.html.haml index 5f74d32..9d2473b 100644 --- a/users/app/views/users/_edit.html.haml +++ b/users/app/views/users/_edit.html.haml @@ -10,7 +10,8 @@ -# however, we don't want the user to change their login without generating a new key, so we hide the ui for this -# (although it works perfectly fine to change username if the field was visible). -# -- form_options = {:url => '/not-used', :html => {:class => user_form_class('form-horizontal'), :id => 'update_login_and_password'}, :validate => true} + +- form_options = {:url => '/not-used', :html => {:class => user_form_class('form-horizontal'), :id => 'update_login_and_password', :data => {token: session[:token]}}, :validate => true} = simple_form_for @user, form_options do |f| %legend= t(:change_password) = hidden_field_tag 'user_param', @user.to_param @@ -28,13 +29,13 @@ -# 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} +- form_options = {:html => {:class => user_form_class('form-horizontal'), :id => 'update_pgp_key', :data => {token: session[:token]}}, :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' + = f.submit t(:save), :class => 'btn', :data => {"loading-text" => "Saving..."} -# -# DESTROY ACCOUNT |