From 5a8ad66825e236308195fd3737e98d52a3322d5b Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 29 Mar 2017 10:26:55 +0200
Subject: fix: bring back wrapped signup button with cancel

---
 app/views/account/new.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

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
 -#
-- 
cgit v1.2.3


From 49618effe081ebf5e72a5945fa1822c471369cf0 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 3 Apr 2017 09:21:20 +0200
Subject: fix: error message display in production

only use the <pre> tag if the response was a text message i.e. during dev errors.
Use the alert-danger class of bootstrap 3 rather than alert-error.
---
 app/assets/javascripts/leap.js  | 2 +-
 app/assets/javascripts/users.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

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>'
       };
     }
   }
-- 
cgit v1.2.3