sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

using grid better on front page

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-18 08:46:12 +02:00
parent b415846a98
commit e990a17cce
3 changed files with 90 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
rowers/templates/frontpage.html
View File

@@ -14,51 +14,6 @@
<h2 class="midden">For Rowers. By Rowers.</h2>
</p>
</li>
{% if user.is_anonymous %}
<li>
&nbsp;
</li>
<li>
&nbsp;
</li>
<li>
<a class="button midden" href="/rowers/register">
<h1 class="midden">
<div class="rounder whiteborder">SIGN UP FREE</div>
</h1>
</a>
</li>
<li>
&nbsp;
</li>
<li>
&nbsp;
</li>
<li>
&nbsp;
</li>
<li>
&nbsp;
</li>
<li class="rounder whiteborder">
<form id="idLogInForm" method="post" action="{% url 'login' %}" class="loginForm">{% csrf_token %}
<a class="button midden" href="/rowers/register">
<h2 class="midden">Sign In</h2></a>
{{ form.as_p }}
<button class="midden button white"
id="idLogInSubmit"
name="idLogInSubmit"
type="submit">Login
</button>
</form>
</li>
<li>
&nbsp;
</li>
<li>
&nbsp;
</li>
{% endif %}
<li class="grid_5">
<p class="midden">There is no shortage of training advice for rowers.</p>
@@ -69,10 +24,49 @@
you are, set objectives, make a plan, track progress,
and adjust based on the results you are getting.
</p>
<h2 class="midden">WHAT WE OFFER</h2>
<p class="midden">This site is more than a rowing log book. It enables you
and your coach
to plan and track all your rowing, indoor and on the water, with a large
number of devices and apps. On top of that, it offers the best in
rowing data analytics. Train smart.
</li>
<li class="grid_5">
<div class="midden">
<img src="/static/img/horizontal_line.png"
alt="horizontal line">
</div>
</li>
{% if user.is_anonymous %}
<li>
&nbsp;
<a class="button midden" href="/rowers/register">
<h1 class="midden">
<div class="rounder whiteborder">SIGN UP FREE</div>
</h1>
</a>
</li>
<li class="rounder whiteborder">
<form id="idLogInForm" method="post" action="{% url 'login' %}" class="loginForm">{% csrf_token %}
<a class="button midden" href="/rowers/register">
<h2 class="midden">Sign In</h2></a>
<a href="/password_reset/">Forgot password?</a>
{{ form.as_p }}
<button class="midden button white"
id="idLogInSubmit"
name="idLogInSubmit"
type="submit">Login
</button>
</form>
</li>
<li class="grid_5">
<div class="midden">
<img src="/static/img/horizontal_line.png"
alt="horizontal line">
</div>
</li>
{% endif %}
<li class="grid_5">
<h2 class="midden">WHAT WE OFFER</h2>
</li>
<li class="frontitem">
<h3 class="midden">LOG</h3>
@@ -105,15 +99,6 @@
Compare your results between workouts and with other rowers in your team
</p>
</li>
<li>
&nbsp;
</li>
<li>
&nbsp;
</li>
<li>
&nbsp;
</li>
<li>
<a class="button midden" href="">
<h2 class="midden"><div class="rounder whiteborder">and more</div></h2>
@@ -131,15 +116,15 @@
alt="horizontal line">
</div>
</li>
<li class="grid_5">
<p class="midden">
<a class="twitter-follow-button"
href="https://twitter.com/rowsandall">
Follow @rowsandall</a>
</p>
</li>
</ul>
<p class="midden">
<a class="twitter-follow-button"
href="https://twitter.com/rowsandall">
Follow @rowsandall</a>
</p>
<p class="midden">
Local Time: {% now "jS F Y H:i" %}
</p>

64
rowers/templates/registration/login.html
View File

@@ -1,39 +1,43 @@
{% extends "basefront.html" %}
{% extends "newbasefront.html" %}
{% block content %}
{% block main %}
{% if form.errors %}
<p>Your username and password didn't match. Please try again.</p>
{% endif %}
<form method="post" action="{% url 'django.contrib.auth.views.login' %}">
{% csrf_token %}
<table>
<tr>
<td>{{ form.username.label_tag }}</td>
<td>{{ form.username }}</td>
</tr>
<tr>
<td>{{ form.password.label_tag }}</td>
<td>{{ form.password }}</td>
</tr>
<tr>
<td></td>
<td><a href="/password_reset/">Forgot password?</a></td>
</tr>
</table>
<input type="submit" value="login" />
<input type="hidden" name="next" value="{{ next }}" />
</form>
<p class="midden"><a class="twitter-follow-button"
href="https://twitter.com/rowsandall">
Follow @rowsandall</a>
</p>
<ul class="main-content">
<li class="frontitem">
<form method="post" action="{% url 'django.contrib.auth.views.login' %}">
{% csrf_token %}
<table>
<tr>
<td>{{ form.username.label_tag }}</td>
<td>{{ form.username }}</td>
</tr>
<tr>
<td>{{ form.password.label_tag }}</td>
<td>{{ form.password }}</td>
</tr>
<tr>
<td></td>
<td><a href="/password_reset/">Forgot password?</a></td>
</tr>
</table>
<input type="submit" value="login" />
<input type="hidden" name="next" value="{{ next }}" />
</form>
</li>
</ul>
<p class="midden"><a class="twitter-follow-button"
href="https://twitter.com/rowsandall">
Follow @rowsandall</a>
</p>
{% endblock %}

8
static/css/rowsandall2.css
View File

@@ -288,6 +288,14 @@ th.rotate > div > span {
color: black;
}
.frontitem label {
color: black;
}
.frontitem a {
color: #1c75bc;
}
.vignet {
border-radius: 50%;
display: block;