From e47995dc9e9f1165f163604477a35858c44f6962 Mon Sep 17 00:00:00 2001
From: Andrea Gaither <angaither@gmail.com>
Date: Fri, 18 Apr 2014 12:05:07 -0400
Subject: [PATCH 1/3] Redirect with modal open on form error.

---
 .../dosomething_signup/dosomething_signup.signup_data_form.inc  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/modules/dosomething/dosomething_signup/dosomething_signup.signup_data_form.inc b/lib/modules/dosomething/dosomething_signup/dosomething_signup.signup_data_form.inc
index 70b90e36a..da3c51ab7 100644
--- a/lib/modules/dosomething/dosomething_signup/dosomething_signup.signup_data_form.inc
+++ b/lib/modules/dosomething/dosomething_signup/dosomething_signup.signup_data_form.inc
@@ -223,11 +223,13 @@ function dosomething_signup_data_validate_address($form, &$form_state) {
 
   // Did we not get any results?
   if (in_array('sorry', $formatted_address)) {
+    drupal_goto($_SERVER['REQUEST_URI'], array('fragment' => 'modal-signup-data-form'));
     form_set_error('dosomething_user_validate_address', t('Hmmm, we couldn’t find that address. Please try again.'));
   }
   // Did it come back from the api as ambiguous? -- Check with the user.
   elseif (in_array('ambiguous', $formatted_address)) {
     dosomething_signup_data_set_address_values($form, $form_state, $formatted_address);
+    drupal_goto($_SERVER['REQUEST_URI'], array('fragment' => 'modal-signup-data-form'));
     form_set_error('dosomething_user_ambiguous_address', t('Hmmm, we couldn’t find that address. Did you mean:'));
   }
   // We have a full address, save it!

From ef9afe5164cf683e8dc9b5623e7468a548c1cf8f Mon Sep 17 00:00:00 2001
From: David Furnes <dfurnes@dosomething.org>
Date: Fri, 18 Apr 2014 12:09:30 -0400
Subject: [PATCH 2/3] Bump Neue version for `.visually-hidden` and modal
 changes.

---
 lib/themes/dosomething/paraneue_dosomething/bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/themes/dosomething/paraneue_dosomething/bower.json b/lib/themes/dosomething/paraneue_dosomething/bower.json
index 6d15a2865..eff0d381f 100644
--- a/lib/themes/dosomething/paraneue_dosomething/bower.json
+++ b/lib/themes/dosomething/paraneue_dosomething/bower.json
@@ -20,7 +20,7 @@
     "tests"
   ],
   "dependencies": {
-    "neue": "DoSomething/neue#~3.3.0",
+    "neue": "DoSomething/neue#~3.4.0",
     "jquery": "~1.11.0",
     "mailcheck": "~1.0.3",
     "html5shiv": "~3.7.0",

From 708e17624dfdd755a0f7961ba926e00da635b45b Mon Sep 17 00:00:00 2001
From: David Furnes <dfurnes@dosomething.org>
Date: Fri, 18 Apr 2014 13:49:47 -0400
Subject: [PATCH 3/3] Hacky solution for showing errors in modal.

---
 .../dosomething_signup.signup_data_form.inc                  | 4 ++--
 .../paraneue_dosomething/scss/content/_modals.scss           | 5 +++++
 .../templates/campaign/node--campaign.tpl.php                | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/modules/dosomething/dosomething_signup/dosomething_signup.signup_data_form.inc b/lib/modules/dosomething/dosomething_signup/dosomething_signup.signup_data_form.inc
index da3c51ab7..76d5966e2 100644
--- a/lib/modules/dosomething/dosomething_signup/dosomething_signup.signup_data_form.inc
+++ b/lib/modules/dosomething/dosomething_signup/dosomething_signup.signup_data_form.inc
@@ -223,14 +223,14 @@ function dosomething_signup_data_validate_address($form, &$form_state) {
 
   // Did we not get any results?
   if (in_array('sorry', $formatted_address)) {
-    drupal_goto($_SERVER['REQUEST_URI'], array('fragment' => 'modal-signup-data-form'));
     form_set_error('dosomething_user_validate_address', t('Hmmm, we couldn’t find that address. Please try again.'));
+    drupal_goto($_SERVER['REQUEST_URI'], array('fragment' => 'modal-signup-data-form'));
   }
   // Did it come back from the api as ambiguous? -- Check with the user.
   elseif (in_array('ambiguous', $formatted_address)) {
     dosomething_signup_data_set_address_values($form, $form_state, $formatted_address);
-    drupal_goto($_SERVER['REQUEST_URI'], array('fragment' => 'modal-signup-data-form'));
     form_set_error('dosomething_user_ambiguous_address', t('Hmmm, we couldn’t find that address. Did you mean:'));
+    drupal_goto($_SERVER['REQUEST_URI'], array('fragment' => 'modal-signup-data-form'));
   }
   // We have a full address, save it!
   else {
diff --git a/lib/themes/dosomething/paraneue_dosomething/scss/content/_modals.scss b/lib/themes/dosomething/paraneue_dosomething/scss/content/_modals.scss
index fa6eb772a..ec5d726f8 100644
--- a/lib/themes/dosomething/paraneue_dosomething/scss/content/_modals.scss
+++ b/lib/themes/dosomething/paraneue_dosomething/scss/content/_modals.scss
@@ -3,6 +3,11 @@
 .modal-content {
   word-wrap: break-word;
 
+  .modal-messages {
+    // fit this guy to edge of modal
+    margin: -2rem -1.5rem 2rem;
+  }
+
   h2.banner {
     // fit this guy to edge of modal
     margin: -2rem -1.5rem 1rem;
diff --git a/lib/themes/dosomething/paraneue_dosomething/templates/campaign/node--campaign.tpl.php b/lib/themes/dosomething/paraneue_dosomething/templates/campaign/node--campaign.tpl.php
index 1e64d2423..91811c260 100644
--- a/lib/themes/dosomething/paraneue_dosomething/templates/campaign/node--campaign.tpl.php
+++ b/lib/themes/dosomething/paraneue_dosomething/templates/campaign/node--campaign.tpl.php
@@ -229,6 +229,7 @@
 
       <?php if (isset($signup_data_form)): ?>
       <script id="modal-signup-data-form" type="text/cached-modal">
+        <div class="js-messages-clone"></div>
         <a href="#" class="js-close-modal modal-close-button white">×</a>
           <div><?php print render($signup_data_form); ?></div>
         <a href="#" class="js-close-modal">Back to main page</a>