summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/leap.js2
-rw-r--r--app/assets/javascripts/users.js2
-rw-r--r--app/views/account/new.html.haml2
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
-#