From 514b869f50a0a7d077421a03bb894c76791468b5 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sun, 18 May 2014 10:11:34 -0700
Subject: Only display notice if user comes from a non-existent account page

---
 routes/users.coffee     |  6 +++++-
 views/sessions/new.html | 23 +++++++++++++----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/routes/users.coffee b/routes/users.coffee
index 687365c1..86132591 100644
--- a/routes/users.coffee
+++ b/routes/users.coffee
@@ -39,7 +39,11 @@ module.exports = (sessions) ->
           css: (-> global.css) 
         )
       else 
-        res.redirect('/login')
+        res.render('sessions/new', 
+          js: (-> global.js), 
+          css: (-> global.css),
+          notice: true
+        )
     )
 
   new: (req, res) ->
diff --git a/views/sessions/new.html b/views/sessions/new.html
index 897a1a98..2c8fcfa9 100644
--- a/views/sessions/new.html
+++ b/views/sessions/new.html
@@ -14,17 +14,20 @@
   <body>
     <div class="container-fluid">
       <div id="main-logo"></div>
-      <div class="notice">
-        <h2>Notice to Merchants</h2>
-        <p>On May 3, 2014, our hosting provider experienced a technical glitch that caused our server to be wiped out along with our database and backups.  Unfortunately this means that all CoinOS accounts will need to be recreated.  We're taking measures to ensure that we have off-site backups and redundant hosting in place so that this won't happen again.  Please contact us at <a href="mailto:info@bitcoincoop.org">info@bitcoincoop.org</a> and we'll provide a fuller explanation and help you get up and running again.  Our volunteer representatives will also be going out to visit some of you in the coming days. 
+
+      {{#notice}}
+        <div class="notice">
+          <h2>Notice to Merchants</h2>
+          <p>On May 3, 2014, our hosting provider experienced a technical glitch that caused our server to be wiped out along with our database and backups.  Unfortunately this means that all CoinOS accounts will need to be recreated.  We're taking measures to ensure that we have off-site backups and redundant hosting in place so that this won't happen again.  Please contact us at <a href="mailto:info@bitcoincoop.org">info@bitcoincoop.org</a> and we'll provide a fuller explanation and help you get up and running again.  Our volunteer representatives will also be going out to visit some of you in the coming days. 
+          </p>
+          <p> We're so sorry for the inconvenience and want to take this opportunity to let you know that we appreciate you using our system and working with us.  We've got lots of improvements in the works that we're excited to share with you soon.
+        </p>
+        <p>
+        Regards,<br />
+        Adam Soltys
         </p>
-        <p> We're so sorry for the inconvenience and want to take this opportunity to let you know that we appreciate you using our system and working with us.  We've got lots of improvements in the works that we're excited to share with you soon.
-      </p>
-      <p>
-      Regards,<br />
-      Adam Soltys
-      </p>
-      </div>
+        </div>
+      {{/notice}}
 
       <form action="login" method="post">
         <h2>Login</h2>
-- 
cgit v1.2.3