tweaked fb auth and some details

omidraha · Nov 16, 2013 · 5620a07 · 5620a07
1 parent d908e85
commit 5620a07
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/helios/templates/_castconfirm_password.html b/helios/templates/_castconfirm_password.html
@@ -12,3 +12,4 @@
 {% endif %}
 <input type="submit" value="check credentials" />
 </form>
+
diff --git a/helios/templates/election_freeze.html b/helios/templates/election_freeze.html
@@ -35,7 +35,7 @@ <h2 class="title">{{election.name}} &mdash; Freeze Ballot</h2>
 <form method="post" action="">
 <input type="hidden" name="csrf_token" value="{{csrf_token}}" />
 
-<input class="pretty" type="submit" value="Freeze the ballot" />
+<input class="button" type="submit" value="Freeze the ballot" />
 <button onclick="document.location='./view'; return false;">never mind</button>
 </form>
 {% endif %}

diff --git a/helios_auth/auth_systems/facebook.py b/helios_auth/auth_systems/facebook.py
@@ -57,7 +57,7 @@ def get_user_info_after_auth(request):
 
   info = utils.from_json(facebook_get('/me', {'access_token':access_token}))
 
-  return {'type': 'facebook', 'user_id' : info['id'], 'name': info['name'], 'email': info['email'], 'info': info, 'token': {'access_token': access_token}}
+  return {'type': 'facebook', 'user_id' : info['id'], 'name': info.get('name'), 'email': info.get('email'), 'info': info, 'token': {'access_token': access_token}}
 
 def update_status(user_id, user_info, token, message):
   """

diff --git a/server_ui/templates/base.html b/server_ui/templates/base.html
@@ -99,7 +99,6 @@ <h1><a href="/"><img src="/static/tinylogo.png"></a></h1>
     </div>
 
   </div>
-</body>
   <script>
     document.write('<script src=' +
       ('__proto__' in {} ? '/static/foundation/js/vendor/zepto' : '/static/foundation/js/vendor/jquery') +
@@ -111,4 +110,5 @@ <h1><a href="/"><img src="/static/tinylogo.png"></a></h1>
 	$(document).foundation();
       </script>
 
+</body>
 </html>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,4 @@
		{% endif %}
		<input type="submit" value="check credentials" />
		</form>