GNOME.org
 

[chronojump-server] Home page changes The home page shows the logo of the club (not uploaded) and the options in two col

commit b8cd398b3a5368d86cdbc2ef771f616a9c4822e4
Author: Marcos Venteo García <mventeo gmail com>
Date:   Tue May 23 18:23:14 2017 +0200

    Home page changes
    The home page shows the logo of the club (not uploaded) and the options in two columns.
    Added a basic footer section with a proposal of authorship
    Now in home page, top navigation is not shown instead of, a big logo is shown with the title of the 
application and the name of the club

 chronojump-flask/static/css/app.css   |   17 +++++++++++++-
 chronojump-flask/templates/base.html  |   24 ++++++++++----------
 chronojump-flask/templates/index.html |   40 +++++++++++++++++++++++++++-----
 3 files changed, 61 insertions(+), 20 deletions(-)
---
diff --git a/chronojump-flask/static/css/app.css b/chronojump-flask/static/css/app.css
index f6ffda3..2edbd35 100644
--- a/chronojump-flask/static/css/app.css
+++ b/chronojump-flask/static/css/app.css
@@ -5,14 +5,30 @@
 /* Stylesheet from chronojump home page */
 body {
     font-family: "Source Sans Pro",HelveticaNeue-Light,"Helvetica Neue Light","Helvetica 
Neue",Helvetica,Arial,"Lucida Grande",sans-serif;
+    padding-bottom: 70px;
     margin-top: 100px;
 }
 
+body.home {
+    margin-top: 0px;
+}
+
+
 .navbar-fixed-top {
     background-color: #0f2351;
     height: 80px;
 }
 
+.header-index {
+    background-color: #0f2351;
+    height: 250px;
+}
+
+.header-index h1, .header-index h3 {
+    color: #fff;
+    font-weight: bold;
+}
+
 .navbar-fixed-top ul.nav > li > a{
     padding-top: 30px;
     color: #d5d9db;
@@ -31,5 +47,4 @@ body {
 .footer {
     background-color: #2b2b2b;
     color: #ffffff;
-    min-height: 400px;
 }
diff --git a/chronojump-flask/templates/base.html b/chronojump-flask/templates/base.html
index f5d2c9c..9afc034 100644
--- a/chronojump-flask/templates/base.html
+++ b/chronojump-flask/templates/base.html
@@ -5,12 +5,11 @@
     <title>Chronojump encoder</title>
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', 
filename='bootstrap/css/bootstrap.min.css')}}" />
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', 
filename='font-awesome/css/font-awesome.min.css')}}" />
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/app.css')}}" />
-    {% block extra_stylesheet %}
-    {% endblock %}
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/app.css')}}" /> {% block 
extra_stylesheet %} {% endblock %}
 </head>
 
-<body>
+<body class="{% block body_class %}{% endblock %}">
+    {% block nav %}
     <nav class="navbar navbar-default navbar-fixed-top">
         <div class="container-fluid">
             <div class="navbar-header">
@@ -26,24 +25,25 @@
                 <li><a href="#">RFID Perduda</a></li>
                 <!--<li><a href="#">Tancar Sessió</a></li>-->
 
-        </li>
-      </ul>
+                </li>
+            </ul>
         </div>
     </nav>
+    {% endblock %}
+
     <div id="main" class="container">
         {% block main_content %}{% endblock %}
     </div>
 
-    <!--<footer class="footer">
-        <div class="container">
-
+    <nav class="navbar navbar-default navbar-fixed-bottom footer">
+        <div class="container-fluid">
+            <p class="navbar-text navbar-left">Chronojump encoder és un servei ofert per Chronojump 
Boscosystem ®</p>
 
         </div>
-    </footer>-->
+    </nav>
     <script src="{{ url_for('static', filename='jquery/jquery-3.2.1.min.js')}}" /></script>
     <script src="{{ url_for('static', filename='bootstrap/js/bootstrap.min.js')}}" /></script>
-    {% block extra_js %}
-    {% endblock %}
+    {% block extra_js %} {% endblock %}
 </body>
 
 </html>
diff --git a/chronojump-flask/templates/index.html b/chronojump-flask/templates/index.html
index 655c5b1..cca7ff1 100644
--- a/chronojump-flask/templates/index.html
+++ b/chronojump-flask/templates/index.html
@@ -1,14 +1,40 @@
 {% extends 'base.html' %}
 
-{% block main_content %}
-<div class="center-block">
-    <div>
+{% block body_class %}home{% endblock %}
 
-    <a class="btn btn-primary btn-lg" href="/results">Resultats</a>
-    <a class="btn btn-primary btn-lg" href="player_list">Llistat jugadors</a>
-    <a class="btn btn-primary btn-lg" href="player_add">Afegir jugador</a>
-    <a class="btn btn-primary btn-lg" href="rfid_lost">RFID perduda</a>
+{% block nav %}
+<div class="container-fluid header-index">
+    <div class="row">
+        <div class="col-md-6" style="margin-top:60px">
+            <img class="img-responsive" src="{{ url_for('static', 
filename='images/cropped-chronojump-logo-web.png')}}" height="180px">
+        </div>
+        <div class="col-md-6" style="margin-top:60px">
+            <h1 class="text-center text-uppercase">Chronojump encoder</h1>
+            <h3 class="text-center text-uppercase">CLUB NAME</h3>
+        </div>
+    </div>
 </div>
+
+{% endblock %}
+
+
+{% block main_content %}
+<div class="row" style="margin-top:100px">
+    <div class="col-md-6">
+
+    </div>
+    <div class="col-md-6">
+        <h2 class="text-center text-uppercase">Opcions</h2>
+    </div>
+    <div class="col-md-6" >
+        <img src="{{url_for('static', filename='images/logo-club.png')}}" class="img-responsive 
center-block" width="200px"/>
+    </div>
+    <div class="col-md-6">
+        <a class="btn btn-primary btn-lg btn-block" href="/results">Resultats</a>
+        <a class="btn btn-primary btn-lg btn-block" href="player_list">Llistat jugadors</a>
+        <a class="btn btn-primary btn-lg btn-block" href="player_add">Afegir jugador</a>
+        <a class="btn btn-primary btn-lg btn-block" href="rfid_lost">RFID perduda</a>
+    </div>
 </div>
 
 <!--
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]