From 7ad5ec21fc99ae0023eb1635a9979915256b3555 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Sat, 11 Jan 2014 16:16:57 +0100
Subject: [PATCH] Cleaned up templates

by default no feature slider and static top menu
---
 .../templates/eventplanner/event_update_form.html     |  9 ---------
 .../templates/eventplanner/eventplanning_view.html    | 10 ----------
 eventplanner/templates/eventplanner/events_grid.html  | 10 ----------
 musicians/templates/musicians/addressbook.html        |  6 ------
 musicians/templates/musicians/change_password.html    |  9 ---------
 musicians/templates/musicians/login.html              | 11 -----------
 musicians/templates/musicians/musician_edit.html      |  9 ---------
 simpleforum/templates/simpleforum/simpleforum.html    | 11 -----------
 website/templates/website/base.html                   |  7 +------
 website/templates/website/mainpage.html               |  3 +++
 10 files changed, 4 insertions(+), 81 deletions(-)

diff --git a/eventplanner/templates/eventplanner/event_update_form.html b/eventplanner/templates/eventplanner/event_update_form.html
index 804a51d..2788d13 100644
--- a/eventplanner/templates/eventplanner/event_update_form.html
+++ b/eventplanner/templates/eventplanner/event_update_form.html
@@ -4,15 +4,6 @@
 {% load crispy_forms_tags %}
 
 
-<!-- No Feature slider -->
-{% block feature_slider %}
-{% endblock %}
-
-
-<!-- Static Navbar at top -->
-{% block navbar_options %} navbar navbar-inverse navbar-static-top {% endblock %}
-
-
 
 {% block content %}
 
diff --git a/eventplanner/templates/eventplanner/eventplanning_view.html b/eventplanner/templates/eventplanner/eventplanning_view.html
index f5082ff..7539ea6 100644
--- a/eventplanner/templates/eventplanner/eventplanning_view.html
+++ b/eventplanner/templates/eventplanner/eventplanning_view.html
@@ -3,16 +3,6 @@
 {% load sekizai_tags staticfiles %}
 
 
-<!-- No Feature slider -->
-{% block feature_slider %}
-{% endblock %}
-
-
-<!-- Static Navbar at top -->
-{% block navbar_options %} navbar navbar-inverse navbar-static-top {% endblock %}
-
-	
-
 {% block content %}
 	
 	{% addtoblock "css" %}
diff --git a/eventplanner/templates/eventplanner/events_grid.html b/eventplanner/templates/eventplanner/events_grid.html
index 996c942..05eb7ab 100644
--- a/eventplanner/templates/eventplanner/events_grid.html
+++ b/eventplanner/templates/eventplanner/events_grid.html
@@ -3,16 +3,6 @@
 {% load sekizai_tags staticfiles %}
 
 
-<!-- No Feature slider -->
-{% block feature_slider %}
-{% endblock %}
-
-
-<!-- Static Navbar at top -->
-{% block navbar_options %} navbar navbar-inverse navbar-static-top {% endblock %}
-
-
-
 {% block content %}
 	 {% addtoblock "css" %}
 	 	<style>
diff --git a/musicians/templates/musicians/addressbook.html b/musicians/templates/musicians/addressbook.html
index e37a697..0708404 100644
--- a/musicians/templates/musicians/addressbook.html
+++ b/musicians/templates/musicians/addressbook.html
@@ -4,12 +4,6 @@
 {% load sekizai_tags staticfiles %}
 
 
-{% block feature_slider %}
-{% endblock %}
-
-
-{% block navbar_options %} navbar navbar-inverse navbar-static-top {% endblock %}
-
 
 {% block content %}
 
diff --git a/musicians/templates/musicians/change_password.html b/musicians/templates/musicians/change_password.html
index 6097e44..e202d25 100644
--- a/musicians/templates/musicians/change_password.html
+++ b/musicians/templates/musicians/change_password.html
@@ -4,15 +4,6 @@
 {% load crispy_forms_tags %}
 
 
-<!-- No Feature slider -->
-{% block feature_slider %}
-{% endblock %}
-
-
-<!-- Static Navbar at top -->
-{% block navbar_options %} navbar navbar-inverse navbar-static-top {% endblock %}
-
-
 {% block content %}
 
 <div class="container">
diff --git a/musicians/templates/musicians/login.html b/musicians/templates/musicians/login.html
index 0141060..c780fe0 100644
--- a/musicians/templates/musicians/login.html
+++ b/musicians/templates/musicians/login.html
@@ -3,17 +3,6 @@
 
 {% load sekizai_tags staticfiles %}
 
-
-
-<!-- Static Navbar at top -->
-{% block navbar_options %} navbar navbar-inverse navbar-static-top {% endblock %}
-
-
-<!-- No Feature slider -->
-{% block feature_slider %}
-{% endblock %}
-
-
 {% block menu_contents %}
 {% endblock %}
 
diff --git a/musicians/templates/musicians/musician_edit.html b/musicians/templates/musicians/musician_edit.html
index f41de8c..d600dd9 100644
--- a/musicians/templates/musicians/musician_edit.html
+++ b/musicians/templates/musicians/musician_edit.html
@@ -4,15 +4,6 @@
 {% load crispy_forms_tags %}
 
 
-<!-- No Feature slider -->
-{% block feature_slider %}
-{% endblock %}
-
-
-<!-- Static Navbar at top -->
-{% block navbar_options %} navbar navbar-inverse navbar-static-top {% endblock %}
-
-
 
 {% block content %}
 
diff --git a/simpleforum/templates/simpleforum/simpleforum.html b/simpleforum/templates/simpleforum/simpleforum.html
index a9ff2cc..c7b5048 100644
--- a/simpleforum/templates/simpleforum/simpleforum.html
+++ b/simpleforum/templates/simpleforum/simpleforum.html
@@ -2,17 +2,6 @@
 
 {% load sekizai_tags staticfiles youtubefilter %}
 
-
-<!-- No Feature slider -->
-{% block feature_slider %}
-{% endblock %}
-
-
-<!-- Static Navbar at top -->
-{% block navbar_options %} navbar navbar-inverse navbar-static-top {% endblock %}
-
-
-
 {% block content %}
 
 
diff --git a/website/templates/website/base.html b/website/templates/website/base.html
index b4a669d..570d70b 100644
--- a/website/templates/website/base.html
+++ b/website/templates/website/base.html
@@ -13,11 +13,10 @@
 	{% render_block "css" %}
 </head>
 
-	
 <body class="pull_top">
 
 	<!--  Menu   -->
-    <div  class="{% block navbar_options %}navbar transparent navbar-inverse navbar-fixed-top {% endblock %}">
+    <div  class="{% block navbar_options %}navbar navbar-inverse navbar-static-top {% endblock %}">
       <div class="navbar-inner">
         <div class="container">
         	{% if not request.device.android %}
@@ -62,10 +61,6 @@
 
 
 	
-	{% block feature_slider %}
-		{% include "website/slider_intern_area.html" %}
-	{% endblock %}
-	
 	{% block content %} {% endblock %}
 
     <!-- footer -->
diff --git a/website/templates/website/mainpage.html b/website/templates/website/mainpage.html
index 185c8cb..5c4f2dc 100644
--- a/website/templates/website/mainpage.html
+++ b/website/templates/website/mainpage.html
@@ -2,9 +2,12 @@
 
 {% load sekizai_tags staticfiles %}
 
+{% block navbar_options %}  navbar transparent navbar-inverse navbar-fixed-top {% endblock %}
 
 {% block content %}
 	
+	{% include "website/slider_intern_area.html" %}
+	
 	{% include "eventplanner/countdown.inc.html" %}
 	{% include "eventplanner/routeToEventMap.inc.html" %}