Show button to enable users to log in with Google.

(imported from commit 52343e7e408c46f148b88e5eede9167fc77edce5)

templates/zephyr/login.html

@@ -26,6 +26,8 @@ autofocus('#id_username');
 </div>
 {% endif %}
 
+<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 %}
@@ -49,6 +51,12 @@ autofocus('#id_username');
                 </div>
             </div>
         </form>
+    </div>
+    <div class="span4">
+        <span class="or">- or -</span>
+        <a href="/accounts/login/openid/" class="zocial google">Sign in with Google</a>
+    </div>
+</div>
 <script type="text/javascript">
 if (window.location.hash.substring(0, 1) === "#") {
     document.login_form.action += window.location.hash;

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 %}

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 {