Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Show button to enable users to log in with Google. 

(imported from commit 52343e7e408c46f148b88e5eede9167fc77edce5)
This commit is contained in:
Luke Faraone 2013-02-22 11:58:54 -05:00
parent e1cdbd14d3
commit d48fdcc781
3 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
templates/zephyr/login.html
View File

@ -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;

1
templates/zephyr/portico.html
View File

@ -11,6 +11,7 @@ hence the name.
{% block customhead %}
{% compressed_css 'portico' %}
<link href="/static/third/zocial/zocial.css" rel="stylesheet" />
{% endblock %}
{% block content %}

10
zephyr/static/styles/portico.css
View File

@ -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 {