Change css templatetag by context_processor

Zambom
1 parent b4af4330
Showing 5 changed files with 16 additions and 23 deletions Show diff stats
amadeus/context_processors.py
amadeus/settings.py
amadeus/templates/base.html
amadeus/templates/css_theme.html
amadeus/templatetags/css_theme.py
@@ -0,0 +1,10 @@
+from themes.models import Themes
+
+def theme(request):
+	context = {}
+
+	theme = Themes.objects.get(id = 1)
+
+	context['theme'] = theme
+
+	return context
 \ No newline at end of file
@@ -92,6 +92,7 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
+                'amadeus.context_processors.theme',
             ],
         },
     },
 <!DOCTYPE html>
-{% load static i18n django_bootstrap_breadcrumbs css_theme %}
+{% load static i18n django_bootstrap_breadcrumbs %}
 {% get_current_language as LANGUAGE_CODE %}
 <html>
@@ -59,7 +59,9 @@
 	<!-- Summernote -->
 	<script src="{% static 'summernote/summernote.js' %}" type="text/javascript"></script>
 	<link href="{% static 'summernote/summernote.css' %}" type="text/css" rel="stylesheet" />
-    {% css_theme %}
+    {% with 'css/themes/'|add:theme.css_style|add:'.css' as theme_selected %}
+        <link rel="stylesheet" type="text/css" href="{% static theme_selected %}">
+    {% endwith %}
 </head>
 <body>
@@ -73,7 +75,7 @@
                 </button>
                 <a class="navbar-brand" href="{% url 'subjects:home' %}">
                     <img class="logo pull-left" src="{% static 'img/topo-amadeus-white.png'  %}" alt="Logo" />
-                    <span class="pull-right project_name">Projeto Amadeus</span>
+                    <span class="pull-right project_name">{{ theme.title }}</span>
                 </a>
             </div>
             <div class="navbar-collapse collapse navbar-responsive-collapse">
@@ -1,5 +0,0 @@
-{% load static %}
-
-{% with 'css/themes/'|add:theme|add:'.css' as theme_selected %}
-	<link rel="stylesheet" type="text/css" href="{% static theme_selected %}">
-{% endwith %}
 \ No newline at end of file
@@ -1,15 +0,0 @@
-from django import template
-
-from themes.models import Themes
-
-register = template.Library()
-
-@register.inclusion_tag('css_theme.html')
-def css_theme():
-	theme = Themes.objects.get(id = 1)
-	
-	context = {
-		'theme': theme.css_style
-	}
-
-	return context
 \ No newline at end of file
	@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
		1	+from themes.models import Themes
		2	+
		3	+def theme(request):
		4	+ context = {}
		5	+
		6	+ theme = Themes.objects.get(id = 1)
		7	+
		8	+ context['theme'] = theme
		9	+
		10	+ return context
0	\ No newline at end of file	11	\ No newline at end of file
	@@ -1,5 +0,0 @@		@@ -1,5 +0,0 @@
1	-{% load static %}
2	-
3	-{% with 'css/themes/'\|add:theme\|add:'.css' as theme_selected %}
4	- <link rel="stylesheet" type="text/css" href="{% static theme_selected %}">
5	-{% endwith %}
6	\ No newline at end of file	0	\ No newline at end of file
	@@ -1,15 +0,0 @@		@@ -1,15 +0,0 @@
1	-from django import template
2	-
3	-from themes.models import Themes
4	-
5	-register = template.Library()
6	-
7	-@register.inclusion_tag('css_theme.html')
8	-def css_theme():
9	- theme = Themes.objects.get(id = 1)
10	-
11	- context = {
12	- 'theme': theme.css_style
13	- }
14	-
15	- return context
16	\ No newline at end of file	0	\ No newline at end of file