diff options
| author | azul <azul@riseup.net> | 2017-04-03 08:17:34 +0000 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2017-04-03 08:17:34 +0000 |
| commit | 552483c9e3f73952839e934374e2aa8b07681f4d (patch) | |
| tree | 3b6897989567212bd7f4abda2a8586bf8c80f789 | |
| parent | 5984d295daac2aa75d0c4dd5bceff4f5b18113a4 (diff) | |
| parent | 49618effe081ebf5e72a5945fa1822c471369cf0 (diff) | |
Merge branch 'fix/error-display' into 'master'
Fix error display
See merge request !33
| -rw-r--r-- | app/assets/javascripts/leap.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/users.js | 2 | ||||
| -rw-r--r-- | app/views/account/new.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/leap.js b/app/assets/javascripts/leap.js index c12a2d6..5084efa 100644 --- a/app/assets/javascripts/leap.js +++ b/app/assets/javascripts/leap.js @@ -3,7 +3,7 @@ // add a bootstrap alert to the page via javascript. // function alert_message(msg) { - $('#messages').append('<div class="alert alert-error"><a class="close" data-dismiss="alert">×</a><pre>'+msg+'</pre></div>'); + $('#messages').append('<div class="alert alert-danger"><a class="close" data-dismiss="alert">×</a>'+msg+'</div>'); } ClientSideValidations.formBuilders['SimpleForm::FormBuilder'].wrappers.bootstrap = ClientSideValidations.formBuilders['SimpleForm::FormBuilder'].wrappers["default"]; diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js index 9a10532..d080b49 100644 --- a/app/assets/javascripts/users.js +++ b/app/assets/javascripts/users.js @@ -139,7 +139,7 @@ return message.errors || { base: message.error }; } else { return { - base: message + base: '<pre>' + message + '</pre>' }; } } diff --git a/app/views/account/new.html.haml b/app/views/account/new.html.haml index 4766945..cbf45cb 100644 --- a/app/views/account/new.html.haml +++ b/app/views/account/new.html.haml @@ -28,5 +28,5 @@ - else = f.input :invite_code, :as => "hidden", :input_html => { :value => " ", :id => :srp_invite_code } - = f.button :submit # :wrapped, cancel: home_path + = f.button :wrapped, cancel: home_path -# |