UI designed for find bus template. Cahnges merged with parent branche…

…d and committed
jameskomo · Sep 7, 2019 · ca77d0f · ca77d0f
1 parent c0e4b4f
commit ca77d0f
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 47 deletions.
diff --git a/myapp/templates/myapp/booklist.html b/myapp/templates/myapp/booklist.html
@@ -1,7 +1,8 @@
 {% extends 'myapp/base.html' %}
+{% load crispy_forms_tags %}
 {% block content %}
 <h3>{{msg}}</h3>
-<h2>Buses Booked</h2>
+<h2>Buses Booked/Cancelled</h2>
 <table class="table table-striped">
     <thead>
     <td>BOOKING ID</td>
@@ -35,25 +36,20 @@ <h2>Buses Booked</h2>
     </tr>
     {% endfor %}
 </table>
-<form action="{% url 'cancellings' %}" method="post">
-    <h3>Choose bus to Cancel</h3>
-    {% csrf_token %}
-    <div class="col-auto">
-        <label for="example-email-input" class="col-2 col-form-label">Bus ID</label>
-        <div class="col-5">
-            <input name='bus_id' class="form-control" type="number" id="example-email-input">
-        </div>
+    <div class="content-section">
+        <form action="{% url 'cancellings' %}" method="post">
+            {% csrf_token %}
+            <fieldset class="form-group">
+                <legend class="border-bottom mb-4">Cancel Booking</legend>
+                {{ form|crispy }}
+            </fieldset>
+            <div>
+                <input name='bus_id' class="form-control" type="number" id="example-email-input" placeholder="Enter ID of the Bus to Cancel from table above">
+            </div>
+            <div class="form-group">
+                <button class="btn btn-outline-info" type="submit">Cancel</button>
+            </div>
+            {{error}}
+        </form>
     </div>
-
-    <br>
-    <br>
-    <div>
-        <button type="submit" class="btn btn-primary float-left">Cancel bus</button>
-    </div>
-
-
-    {{error}}
-
-</form>
-
-{% endblock %}
+{% endblock content %}
diff --git a/myapp/templates/myapp/list.html b/myapp/templates/myapp/list.html
@@ -1,4 +1,5 @@
 {% extends 'myapp/base.html' %}
+{% load crispy_forms_tags %}
 {% block content %}
 <h3>{{msg}}</h3>
 <h2>List of buses</h2>
@@ -32,30 +33,25 @@ <h2>List of buses</h2>
     </tr>
     {% endfor %}
 </table>
-<form action="{% url 'bookings' %}" method="post">
-    <h3>Choose bus to book</h3>
-    {% csrf_token %}
-    <div class="col-auto">
-        <label for="example-email-input" class="col-2 col-form-label">Bus ID</label>
-        <div class="col-5">
-            <input name='bus_id' class="form-control" type="number" id="example-email-input">
-        </div>
-    </div>
-    <div class="col=auto">
-        <label for="example-email-input" class="col-2 col-form-label">Number of seats</label>
-        <div class="col-5">
-            <input name='no_seats' class="form-control" type="number">
-        </div>
-    </div>
-    <br>
-    <br>
-    <div>
-        <button type="submit" class="btn btn-primary float-left">Book bus</button>
-    </div>
-
-
-    {{error}}
-
-</form>
 
+<div class="content-section">
+        <form action="{% url 'bookings' %}" method="post">
+            {% csrf_token %}
+            <fieldset class="form-group">
+                <legend class="border-bottom mb-4">Bus Booking</legend>
+                {{ form|crispy }}
+            </fieldset>
+            <div>
+                <input name='bus_id' class="form-control" type="number" id="example-email-input" placeholder="Enter ID of the Bus to Book">
+            </div>
+            <div>
+                <input name='no_seats' class="form-control" type="number" placeholder="Enter No of Seats to Book Here">
+            </div>
+            <br>
+            <div class="form-group">
+                <button class="btn btn-outline-info" type="submit">Book</button>
+            </div>
+            {{error}}
+        </form>
+    </div>
 {% endblock %}