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

Merge branch 'release/v8.04'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-18 11:54:26 +02:00
parent e903a36699 a5000c7cf3
commit 4dbbe4377b
5 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/templates/frontpage.html
View File

@@ -37,15 +37,21 @@
alt="horizontal line"> alt="horizontal line">
</div> </div>
</li> </li>
{% if user.is_anonymous %} {% if user.is_anonymous %}
<li> <li class="grid_2">
</li>
<li style="text-align: center;">
<a class="button midden" href="/rowers/register"> <a class="button midden" href="/rowers/register">
<h1 class="midden"> <h1 class="midden">
<div class="rounder whiteborder">SIGN UP FREE</div> <div class="rounder whiteborder">SIGN UP FREE</div>
</h1> </h1>
</a> </a>
</li> </li>
<li class="rounder whiteborder"> <li class="grid_2">
</li>
<li class="grid_2">
</li>
<li style="text-align: center;" class="rounder whiteborder">
<form id="idLogInForm" method="post" action="{% url 'login' %}" class="loginForm">{% csrf_token %} <form id="idLogInForm" method="post" action="{% url 'login' %}" class="loginForm">{% csrf_token %}
<a class="button midden" href="/rowers/register"> <a class="button midden" href="/rowers/register">
<h2 class="midden">Sign In</h2></a> <h2 class="midden">Sign In</h2></a>
@@ -58,6 +64,8 @@
</button> </button>
</form> </form>
</li> </li>
<li class="grid_2">
</li>
<li class="grid_5"> <li class="grid_5">
<div class="midden"> <div class="midden">
<img src="/static/img/horizontal_line.png" <img src="/static/img/horizontal_line.png"

2
rowsandall_app/settings.py
View File

@@ -107,6 +107,8 @@ ROOT_URLCONF = 'rowsandall_app.urls'
# '^admin/', # '^admin/',
# '^rowers/histo') # '^rowers/histo')
APPEND_SLASH = True
TEMPLATES = [ TEMPLATES = [
{ {
'BACKEND': 'django.template.backends.django.DjangoTemplates', 'BACKEND': 'django.template.backends.django.DjangoTemplates',

6
static/css/frontstyles.css
View File

@@ -366,7 +366,7 @@
padding: 1.2em 1.2em 1.2em 1.2em; padding: 1.2em 1.2em 1.2em 1.2em;
font-size: 1.3rem; font-size: 1.3rem;
color: white; color: white;
background-color: rgba(0,0,0,0.3) background-color: rgba(0,0,0,0.6)
} }
.content h1 { .content h1 {
@@ -472,6 +472,8 @@
.main-content li { .main-content li {
margin: 0; margin: 0;
overflow-x: hidden; overflow-x: hidden;
margin-left: 15px;
margin-right: 15px;
} }
@@ -575,7 +577,7 @@
.main-content { .main-content {
display: grid; display: grid;
grid-template-columns: repeat(3,1fr); grid-template-columns: repeat(5,1fr);
grid-gap: 10px; grid-gap: 10px;
} }

2
static/css/rowsandall2.css
View File

@@ -277,7 +277,7 @@ th.rotate > div > span {
} }
.whiteborder { .whiteborder {
border: solid 1px white; border: solid 2px #aaa;
} }
.frontitem { .frontitem {

33
templates/newbasefront.html
View File

@@ -142,14 +142,14 @@
</style> </style>
<div id="bgpic" class="splash"> <div id="bgpic" class="splash">
<div class="wrapper"> <div class="wrapper" style="margin: 0 auto;">
<header class="main-head"> <header class="main-head">
<ul> <ul>
<li> <li>
<a href="/" title="Home"> <a href="/" title="Home">
<img src="/static/img/logo7.png" <img src="/static/img/logo7.png"
alt="Rowsandall logo" width="200px"> alt="Rowsandall logo" width="300px">
</a> </a>
</li> </li>
<li> <li>
@@ -203,7 +203,8 @@
<side-nav class="side-nav"> <side-nav class="side-nav">
&nbsp; &nbsp;
</side-nav> </side-nav>
{% if user.is_authenticated %}
<nav class="main-nav"> <nav class="main-nav">
<ul> <ul>
<li id="nav-workouts"> <li id="nav-workouts">
@@ -233,11 +234,12 @@
</li> </li>
</ul> </ul>
</nav> </nav>
{% endif %}
<main class="content"> <main class="content">
<ul class="main-content"> <ul class="main-content">
{% if WARNING_MESSAGE != '' %} {% if WARNING_MESSAGE != '' %}
<li class="grid_4"> <li class="grid_5">
<p class="message"> <p class="message">
{{ WARNING_MESSAGE }} {{ WARNING_MESSAGE }}
</p> </p>
@@ -245,14 +247,14 @@
{% endif %} {% endif %}
{% if user.rower.protrialexpires and user.rower.protrialexpires|is_future_date %} {% if user.rower.protrialexpires and user.rower.protrialexpires|is_future_date %}
{% if user.rower.plantrialexpires and user.rower.rowerplan != 'plan' %} {% if user.rower.plantrialexpires and user.rower.rowerplan != 'plan' %}
<li class="grid_4"> <li class="grid_5">
<p class="successmessage"> <p class="successmessage">
{{ user.rower.protrialexpires|date_dif|ddays }} days left of your Self-Coach trial - Would you like to <a href="/rowers/planmembership">upgrade now?</a> {{ user.rower.protrialexpires|date_dif|ddays }} days left of your Self-Coach trial - Would you like to <a href="/rowers/planmembership">upgrade now?</a>
</p> </p>
</li> </li>
{% else %} {% else %}
{% if user.rower.rowerplan == 'basic' %} {% if user.rower.rowerplan == 'basic' %}
<li class="grid_4"> <li class="grid_5">
<p class="successmessage"> <p class="successmessage">
{{ user.rower.protrialexpires|date_dif|ddays }} days left of your Pro trial - Would you like to <a href="/rowers/promembership">upgrade now?</a> {{ user.rower.protrialexpires|date_dif|ddays }} days left of your Pro trial - Would you like to <a href="/rowers/promembership">upgrade now?</a>
</p> </p>
@@ -261,7 +263,7 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if user.rower.emailbounced %} {% if user.rower.emailbounced %}
<li class="grid_4"> <li class="grid_5">
<p class="message"> <p class="message">
Your email bounced. Please update your email address in the <a href="/rowers/me/edit/">user settings</a> Your email bounced. Please update your email address in the <a href="/rowers/me/edit/">user settings</a>
</p> </p>
@@ -269,7 +271,7 @@
{% endif %} {% endif %}
{% if messages %} {% if messages %}
{% for message in messages %} {% for message in messages %}
<li class="grid_4"> <li class="grid_5">
{% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %} {% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}
<p class="message"> <p class="message">
{% else %} {% else %}
@@ -280,21 +282,6 @@
</li> </li>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if breadcrumbs %}
<li class="grid_4">
<p>
<span>
<em>You are here:</em>
{% for crumb in breadcrumbs %}
<a href="{{ crumb.url }}"><em>{{ crumb.name }}</em></a>
{% if not forloop.last %}
&nbsp;/&nbsp;
{% endif %}
{% endfor %}
</span>
</p>
</li>
{% endif %}
</ul> </ul>
{% block main %} {% block main %}