Merge branch 'master' of github.com:junkafarian/watchdog

public/css/register.css

@@ -1,4 +1,5 @@
 #message{
 	width:		100%;
 	height:		180px;
+	padding:	10px;
 }

public/css/style.css

@@ -395,6 +395,10 @@ form input.long{
 	font-weight:	bold;
 }
 
+#friends{
+	margin:		30px 0;
+}
+
 #friends ul, #friends li{
 	list-style:	none;
 	margin:		0;
@@ -404,6 +408,10 @@ form input.long{
 	vertical-align:	top;
 }
 
+#friends li{
+	margin:		2px 0;
+}
+
 #friends .pic{
 	display:	block;
 }

routes/index.js

@@ -156,6 +156,7 @@ exports.adduser = function(req, res){
     var usr = new models.User(user_data.username, user_data.password, key, user_data.email, [user_data.contact01, user_data.contact02, user_data.contact03, user_data.contact04, user_data.contact05]);
     users.add_user(usr);
 
+
     request('https://api.twitter.com/1/users/lookup.json?screen_name='+user_data.twitter, function (error, response, body) {
         if (!error && response.statusCode == 200) {
            var tid = JSON.parse(body)[0].id;
@@ -164,11 +165,8 @@ exports.adduser = function(req, res){
            updateTwitterStream();
         }
     })
+    res.redirect('/signedin');
 
-
-    res.render('generic_message', {
-        locals:{'message': 'registered! This is your secret key to update your status from anywhere else:<br><h2>'+key+'</h2><br>'}
-    });
 }
 
 

views/registration.mustache

@@ -19,7 +19,7 @@
 
 	<div class="row clearfix">
 		<label class="fullWidth" for="message">Your emergency message:</label>
-	 	<textarea class="fullWidth" id="message" name="user[email]"></textarea>
+	 	<textarea placeholder="This is an emergency alert - XXX has gone missing. Please follow these instructions:" class="fullWidth" id="message" name="user[email]"></textarea>
 	</div>
 
 	<p>If we think you are in danger, we will send your message to the following email addresses:</p>