Merge branch 'release/v8.04'

rowers/templates/frontpage.html

@@ -37,15 +37,21 @@
            alt="horizontal line">
     </div>
   </li>
-    {% if user.is_anonymous %}
-  <li>
+  {% if user.is_anonymous %}
+  <li class="grid_2">
+  </li>
+  <li style="text-align: center;">
     <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">
+  <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 %}
     <a class="button midden" href="/rowers/register">
       <h2 class="midden">Sign In</h2></a>
@@ -58,6 +64,8 @@
       </button>
     </form>  
   </li>
+  <li class="grid_2">
+  </li>
   <li class="grid_5">
     <div class="midden">
       <img src="/static/img/horizontal_line.png"

rowsandall_app/settings.py

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

static/css/frontstyles.css

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

static/css/rowsandall2.css

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

templates/newbasefront.html

@@ -142,14 +142,14 @@
       </style> 
 
     <div id="bgpic" class="splash"> 
-      <div class="wrapper">
+      <div class="wrapper" style="margin: 0 auto;">
 
       <header class="main-head">
         <ul>
           <li>
             <a href="/" title="Home">
               <img src="/static/img/logo7.png"
-                   alt="Rowsandall logo" width="200px">
+                   alt="Rowsandall logo" width="300px">
             </a>
           </li>
           <li>
@@ -203,7 +203,8 @@
       <side-nav class="side-nav">
         &nbsp;
       </side-nav>
-      
+
+      {% if user.is_authenticated %}
       <nav class="main-nav">
         <ul>
           <li id="nav-workouts"> 
@@ -233,11 +234,12 @@
           </li>
         </ul>
       </nav>
+      {% endif %}
 
       <main class="content">
         <ul class="main-content">
           {% if WARNING_MESSAGE != '' %}
-          <li class="grid_4">
+          <li class="grid_5">
             <p class="message">
               {{ WARNING_MESSAGE }}
             </p>
@@ -245,14 +247,14 @@
           {% endif %}
           {% if user.rower.protrialexpires and user.rower.protrialexpires|is_future_date %}
           {% if user.rower.plantrialexpires and user.rower.rowerplan != 'plan' %}
-          <li class="grid_4">
+          <li class="grid_5">
             <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>
             </p>
           </li>
           {% else %}
           {% if user.rower.rowerplan == 'basic' %}
-          <li class="grid_4">
+          <li class="grid_5">
             <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>
             </p>
@@ -261,7 +263,7 @@
           {% endif %}
           {% endif %}
           {% if user.rower.emailbounced %}
-          <li class="grid_4">
+          <li class="grid_5">
             <p class="message">
               Your email bounced. Please update your email address in the <a href="/rowers/me/edit/">user settings</a>
             </p>
@@ -269,7 +271,7 @@
           {% endif %}
           {% if messages %}
           {% for message in messages %}
-          <li class="grid_4">
+          <li class="grid_5">
           {% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}
             <p class="message">
               {% else %}
@@ -280,21 +282,6 @@
           </li>
           {% endfor %}
 	  {% 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>
 
         {% block main %}