From 2a07480e20ea7e8ffc629c5870c9d16df71939ff Mon Sep 17 00:00:00 2001 From: Akshen Date: Wed, 30 May 2018 10:52:33 +0530 Subject: Update base.html - Navbar fixed in base.html - Header blocks removed from all other templates - testimonials and benefits page removed along with its testcases --- static/workshop_app/css/sticky-footer.css | 3 +- .../templates/statistics_app/profile_stats.html | 29 -------- .../statistics_app/workshop_public_stats.html | 18 ----- .../templates/statistics_app/workshop_stats.html | 30 +------- .../static/workshop_app/css/sticky-footer.css | 3 +- .../templates/workshop_app/activation.html | 4 +- workshop_app/templates/workshop_app/base.html | 70 ++++++++++++++++--- workshop_app/templates/workshop_app/booking.html | 29 -------- .../templates/workshop_app/create_workshop.html | 27 -------- .../templates/workshop_app/edit_profile.html | 49 +------------ .../templates/workshop_app/how_to_participate.html | 59 ++++------------ workshop_app/templates/workshop_app/index.html | 2 +- workshop_app/templates/workshop_app/login.html | 20 +----- workshop_app/templates/workshop_app/logout.html | 18 ----- workshop_app/templates/workshop_app/manage.html | 27 -------- .../templates/workshop_app/my_workshops.html | 49 ------------- .../templates/workshop_app/profile_updated.html | 48 ------------- .../templates/workshop_app/propose_workshop.html | 27 -------- .../workshop_app/registration/register.html | 19 ----- .../templates/workshop_app/self_workshop.html | 16 ----- .../templates/workshop_app/testimonals.html | 80 ---------------------- .../templates/workshop_app/view_benefits.html | 68 ------------------ workshop_app/templates/workshop_app/view_faq.html | 40 ----------- .../templates/workshop_app/view_profile.html | 48 ------------- .../workshop_app/view_workshoptype_details.html | 62 ----------------- .../workshop_app/view_workshoptype_list.html | 58 ---------------- .../templates/workshop_app/workshop_stats.html | 20 ------ workshop_app/tests/test_views.py | 8 --- workshop_app/urls.py | 3 - workshop_app/views.py | 20 ------ 30 files changed, 85 insertions(+), 869 deletions(-) delete mode 100644 workshop_app/templates/workshop_app/testimonals.html delete mode 100644 workshop_app/templates/workshop_app/view_benefits.html diff --git a/static/workshop_app/css/sticky-footer.css b/static/workshop_app/css/sticky-footer.css index bad5ff7..3db4f72 100644 --- a/static/workshop_app/css/sticky-footer.css +++ b/static/workshop_app/css/sticky-footer.css @@ -13,7 +13,7 @@ /* OnActive Tab */ .navbar-custom .navbar-nav > .active > a { color: black; - background: white; + background: white; } .navbar-custom .navbar-nav > li > a:hover, @@ -32,6 +32,7 @@ } .navbar-custom .navbar-brand:hover{ + color: white; } /** diff --git a/statistics_app/templates/statistics_app/profile_stats.html b/statistics_app/templates/statistics_app/profile_stats.html index a0f83d9..7c0c2b5 100644 --- a/statistics_app/templates/statistics_app/profile_stats.html +++ b/statistics_app/templates/statistics_app/profile_stats.html @@ -4,35 +4,6 @@ Profile Statistics {% endblock %} - -{% block header %} - -{% endblock %} - {% block extra %} diff --git a/statistics_app/templates/statistics_app/workshop_public_stats.html b/statistics_app/templates/statistics_app/workshop_public_stats.html index cfc95c4..a42f818 100644 --- a/statistics_app/templates/statistics_app/workshop_public_stats.html +++ b/statistics_app/templates/statistics_app/workshop_public_stats.html @@ -4,24 +4,6 @@ Open Statistics {% endblock %} -{% block header %} - -{% endblock %} - {% block extra %} diff --git a/statistics_app/templates/statistics_app/workshop_stats.html b/statistics_app/templates/statistics_app/workshop_stats.html index dd0d7bd..6a48279 100644 --- a/statistics_app/templates/statistics_app/workshop_stats.html +++ b/statistics_app/templates/statistics_app/workshop_stats.html @@ -1,38 +1,12 @@ {% extends 'workshop_app/base.html' %} {% block title %} - Statistics + Workshop Statistics {% endblock %} -{% block header %} - -{% endblock %} {% block extra %} + diff --git a/workshop_app/static/workshop_app/css/sticky-footer.css b/workshop_app/static/workshop_app/css/sticky-footer.css index f04b48f..3db4f72 100644 --- a/workshop_app/static/workshop_app/css/sticky-footer.css +++ b/workshop_app/static/workshop_app/css/sticky-footer.css @@ -32,8 +32,7 @@ } .navbar-custom .navbar-brand:hover{ - color: black; - background-color: #efefef; + color: white; } /** diff --git a/workshop_app/templates/workshop_app/activation.html b/workshop_app/templates/workshop_app/activation.html index f9fc805..dc6114a 100644 --- a/workshop_app/templates/workshop_app/activation.html +++ b/workshop_app/templates/workshop_app/activation.html @@ -8,7 +8,7 @@