changes over changes

2019-10-27 05:23:59 +01:00
parent ac3da881b3
commit 196020243c
12 changed files with 163 additions and 6 deletions
@@ -1,18 +1,44 @@
+{% load static %}
+
 <html>

 <head>
+    <title>Bloom Hunting</title>
+
+    <link rel="shortcut icon" type="image/png" href="{% static 'favicon.ico' %}"/>
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
+    <link rel="stylesheet" type="text/css" href="{% static 'mobile/base.css' %}">

 </head>

 <body>

-    <div id=content>
+    <div id="main">
+    <div id='header'>
+        <a href="{% url 'map:index' %}">
+        <img id="map_icon" class="right" src='{% static 'mobile/map_icon.png' %}' />
+        </a>
+        <div id='heading'>
+            <div class='inner'>
+                <img src='{% static 'favicon.ico' %}' />
+                <h1 id='title'>Bloom up your city</h1>
+
+            </div>
+        </div>
+    </div>
+
+    <div id="content">
    {% block content %}
    {% endblock %}
    </div>
+    </div>

+    <!-- FOOTER -->
+    <div id='footer'>
+        <p class='left'>Bloom Hunting - a Ökostadt Heidelberg initiative</p>
+        <p>A Climathon Heidelberg project</p>
+    </div>
 </body>

 </html>
@@ -7,4 +7,9 @@
 <p>Hunt blooming trees in your area.</p>

 <a class="btn btn-default" id="btn_scan" href="{% url 'mobile:scan' %}">Scan a blooming tree</a>
+
+<p>Hey, some predictions</p>
+
+<p>{{ prediction }}</p>
+
 {% endblock %}
@@ -7,13 +7,18 @@

 <p>{{ question.text }}</p>

+<table>
+    <tr>
 {% for option in question.options %}
-
+<td width=30%>
 <form action="" method="post">
    {% csrf_token %}
    <input name="question" type="hidden" value="{{ question.key }}">
    <input name="chosen_option" class="btn btn-default" type="submit" value="{{ option.text }}">
 </form>
+</td>
 {% endfor %}
+    </tr>
+</table>

 {% endblock %}
@@ -11,8 +11,8 @@ tree is blooming.<p>
    {% csrf_token %}
    <input type="text" name="name">
    <input type="hidden" name="tree" value="{{ tree.name }}">
-    <input id="in_long" type="text" name="longitude">
-    <input id="in_lat" type="text" name="latitude">
+    <input id="in_long" type="hidden" name="longitude">
+    <input id="in_lat" type="hidden" name="latitude">
    <input type="submit" value="Name your tree">
 </form>