From d48fdcc7816c5e3ac51a0af7e135fafb321311f1 Mon Sep 17 00:00:00 2001
From: Luke Faraone <lfaraone@humbughq.com>
Date: Fri, 22 Feb 2013 11:58:54 -0500
Subject: [PATCH] Show button to enable users to log in with Google.

(imported from commit 52343e7e408c46f148b88e5eede9167fc77edce5)
---
 templates/zephyr/login.html      | 50 ++++++++++++++++++--------------
 templates/zephyr/portico.html    |  1 +
 zephyr/static/styles/portico.css | 10 +++++--
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/templates/zephyr/login.html b/templates/zephyr/login.html
index 0cb947ca3c..3b8bbaa847 100644
--- a/templates/zephyr/login.html
+++ b/templates/zephyr/login.html
@@ -26,29 +26,37 @@ autofocus('#id_username');
 </div>
 {% endif %}
 
-<form name="login_form" method="post" class="form-horizontal"
-      action="{% url django.contrib.auth.views.login %}?next={{ request.get_full_path }}">
-    {% csrf_token %}
-    <div class="control-group">
-        <label for="id_username" class="control-label">Email</label>
-        <div class="controls">
-            <input id="id_username" type="text" name="username" value="{{ email }}" maxlength="72" />
-        </div>
+<div class="row">
+    <div class="span5">
+        <form name="login_form" method="post" class="form-horizontal"
+              action="{% url django.contrib.auth.views.login %}?next={{ request.get_full_path }}">
+            {% csrf_token %}
+            <div class="control-group">
+                <label for="id_username" class="control-label">Email</label>
+                <div class="controls">
+                    <input id="id_username" type="text" name="username" value="{{ email }}" maxlength="72" />
+                </div>
+            </div>
+            <div class="control-group">
+                <label for="id_password" class="control-label">Password</label>
+                <div class="controls">
+                    {{ form.password }}
+                </div>
+            </div>
+            <div class="control-group">
+                <div class="controls">
+                    <input type="submit" class="btn btn-large btn-primary" value="Log in" />
+                    <span style="padding: 1em" />
+                    <a href="{% url django.contrib.auth.views.password_reset %}">Forgot password?</a>
+                </div>
+            </div>
+        </form>
     </div>
-    <div class="control-group">
-        <label for="id_password" class="control-label">Password</label>
-        <div class="controls">
-            {{ form.password }}
-        </div>
+    <div class="span4">
+        <span class="or">- or -</span>
+        <a href="/accounts/login/openid/" class="zocial google">Sign in with Google</a>
     </div>
-    <div class="control-group">
-        <div class="controls">
-            <input type="submit" class="btn btn-large btn-primary" value="Log in" />
-            <span style="padding: 1em" />
-            <a href="{% url django.contrib.auth.views.password_reset %}">Forgot password?</a>
-        </div>
-    </div>
-</form>
+</div>
 <script type="text/javascript">
 if (window.location.hash.substring(0, 1) === "#") {
     document.login_form.action += window.location.hash;
diff --git a/templates/zephyr/portico.html b/templates/zephyr/portico.html
index d831c20da5..622cdab890 100644
--- a/templates/zephyr/portico.html
+++ b/templates/zephyr/portico.html
@@ -11,6 +11,7 @@ hence the name.
 
     {% block customhead %}
     {% compressed_css 'portico' %}
+    <link href="/static/third/zocial/zocial.css" rel="stylesheet" />
     {% endblock %}
 
 {% block content %}
diff --git a/zephyr/static/styles/portico.css b/zephyr/static/styles/portico.css
index c4f1b5afb9..aac2a3c531 100644
--- a/zephyr/static/styles/portico.css
+++ b/zephyr/static/styles/portico.css
@@ -20,7 +20,7 @@ li {
 }
 
 .pitch {
-    width: 500px;
+    width: 600px;
 }
 
 .signup {
@@ -36,8 +36,12 @@ li {
 }
 
 .or {
-    padding-left: 25px;
-    padding-right: 25px;
+    padding-left: 15px;
+    padding-right: 15px;
+}
+
+.span4 .or {
+    padding-left: 0px;
 }
 
 .for_you {