updated - related issue #22

OkularID · Oct 12, 2020 · d77735f · d77735f
1 parent 1f544ea
commit d77735f
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 34 deletions.
diff --git a/templates/accounts/change_password.html b/templates/accounts/change_password.html
@@ -0,0 +1,23 @@
+{% extends 'base.html' %}
+{% load static %}
+{% load compress %}
+{% load crispy_forms_tags %}
+
+{% block title %}Change Password | ReservasiDulu{% endblock title %}
+
+{% block content %}
+    <div class="container">
+    <div class="row">
+        <div class="col-lg-12 col-12 px-lg-5 py-lg-5 px-3 py-3">
+            <h2>Change Your Password</h2>
+            <form method="post">
+                {% csrf_token %}
+                {{ form | crispy }}
+{#                <button class="btn btn-outline-secondary" type="button" value="Back" onclick="window.history.back()">Cancel</button>#}
+{#                <input type="button" value="Back" onclick="window.history.back()" />#}
+                <button type="submit" class="btn btn-outline-success">Submit</button>
+            </form>
+        </div>
+    </div>
+    </div>
+{% endblock content %}
diff --git a/templates/accounts/custom_shit.html b/templates/accounts/custom_shit.html
@@ -9,7 +9,7 @@
                     <li><a class="nav_custom{% if url_name == 'my_products' %} active {% endif %}" href="{% url 'my_products' %}">My Invitation</a></li>
                     <li><a class="nav_custom{% if url_name == 'my_guests' %} active {% endif %}" href="{% url 'my_guests' %}">My Guests</a></li>
                     <li><a class="nav_custom{% if url_name == 'account' %} active {% endif %}" href="{% url 'account' %}">Profile</a></li>
-                    <li><a class="" href="">Login Info</a></li>
+                    <li><a class="nav_custom{% if url_name == 'change_pass' %} active {% endif %}" href="{% url 'change_pass' %}">Login Info</a></li>
                 </ul>
             </div>
         </div>

diff --git a/templates/accounts/guests.html b/templates/accounts/guests.html
@@ -1,4 +1,6 @@
 {% extends 'base.html' %}
+{% load static %}
+
 
 {% block content %}
 <title>{% block title %} My Guests | Reservasi Dulu {% endblock %}</title>

diff --git a/templates/accounts/products.html b/templates/accounts/products.html
@@ -20,14 +20,13 @@ <h3 class="mb-lg-2p">My Invitation</h3>
                         <div class="container-fluid card">
                             <div class="row">
                                 <div class="col-lg-3">
-                                    <img class="img-fluid" src="{{ i.theme.theme_img.url }}" alt="reservasidulu" />
+                                    <img class="img-fluid" src="{{ i.theme.theme_thumbnail.url }}" alt="reservasidulu" />
                                 </div>
                                 <div class="col-lg-6">
                                     <div class="boxc info">
                                         <div class="title">{{ i.theme.theme_name }}</div>
                                         <div class="category">{{ i.theme.theme_category }}</div>
-                                        <div class="date">created: {{ i.theme_data.created }}</div>
-                                        {#<div class="date">{{ i.theme_data.created }}</div>#}
+                                        <div class="date">created: {{ i.theme.created }}</div>
                                     </div>
                                 </div>
                                 <div class="col-lg-3">

diff --git a/templates/base.html b/templates/base.html
@@ -30,35 +30,6 @@
     {% endif %}
 {% endwith %}
 
-{# message 1 #}
-{% if messages %}
-<ul class="messages">
-    {% for message in messages %}
-    <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
-    {% endfor %}
-</ul>
-{% endif %}
-
-{# message 2 #}
-{% if messages %}
-    <div class="alert alert-success messages">
-        {% for message in messages %}
-            <span{% if message.tags %} class="{{ message.tags }}"{% endif %}>
-            {% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}Important: {% endif %}
-            {{ message }}<br/>
-            </span>
-        {% endfor %}
-    </div>
-{% endif %}
-
-{# message 3 #}
-{% if messages %}
-  <ul class="messages">
-    {% for message in messages %}
-      <li class="{{ message.tags }}">{{ message }}</li>
-    {% endfor %}
-  </ul>
-{% endif %}
 
 {% block content %}
     {# content goes here #}

diff --git a/templates/shared/navbar.html b/templates/shared/navbar.html
@@ -6,7 +6,33 @@
 
 
 {% load static %}
-    <div class="preloader"></div>
+{#    <div class="preloader"></div>#}
+
+<style>
+    ul.messages {
+        background-color: red;
+        color: blue;
+        display: block !important;
+        z-index: 1030;
+        position: relative;
+        margin: 0 auto;
+        width: 400px;
+        height: 400px;
+        list-style-type: none;
+    }
+    ul.message li {
+
+    }
+</style>
+    {% if messages %}
+    <ul class="messages" >
+        {% for message in messages %}
+        <li style="background-color: blue" {% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+        {% endfor %}
+    </ul>
+    {% endif %}
+
+
     <nav id="navigation" class="fadein">
         <div class="container-fluid padres pt-lg-20 pb-lg-20 pl-lg-5p pr-lg-5p">
             {% with url_name=request.resolver_match.url_name %}