Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring

Felipe Bormann
2 parents 7bb19368 abba39a2
Showing 5 changed files with 29 additions and 22 deletions Show diff stats
amadeus/context_processors.py
amadeus/templates/base.html
themes/urls.py
themes/views.py
users/templates/users/login.html
@@ -11,7 +11,11 @@ def theme(request):
 	theme = Themes.objects.get(id = 1)
 	context['theme'] = theme
-
+	if ("contrast_check" in request.COOKIES.keys()):
+		context ['contrast_cookie'] = True
+	else:
+		context ['contrast_cookie'] = False
+	
 	return context
 def notifies(request):
@@ -48,4 +52,4 @@ def chat_notifies(request):
 	context['chat_notifications_count'] = notifications
-	return context
 \ No newline at end of file
+	return context
@@ -63,10 +63,15 @@
 	<!-- Summernote -->
 	<script src="{% static 'summernote/summernote.js' %}" type="text/javascript"></script>
 	<link href="{% static 'summernote/summernote.css' %}" type="text/css" rel="stylesheet" />
+	{% if contrast_cookie %}
+	    <link rel="stylesheet" type="text/css" href="{% static 'css/themes/contrast.css' %}">
+	{% else %}
+		{% with 'css/themes/'|add:theme.css_style|add:'.css' as theme_selected %}
+				<link rel="stylesheet" type="text/css" href="{% static theme_selected %}">
+		{% endwith %}
+	{% endif %}
+
-    {% with 'css/themes/'|add:theme.css_style|add:'.css' as theme_selected %}
-        <link rel="stylesheet" type="text/css" href="{% static theme_selected %}">
-    {% endwith %}
 </head>
@@ -5,5 +5,4 @@ urlpatterns = [
 	url(r'^$', views.IndexView.as_view(), name = 'manage'),
 	url(r'^basic_elements$', views.BasicElementsSettings.as_view(), name = 'basic'),
 	url(r'^css_selector$', views.CSSStyleSettings.as_view(), name = 'css'),
-	url(r'^contrast$',views.Contrast, name = 'contrast'),
 ]
@@ -3,7 +3,7 @@ from django.shortcuts import render
 from django.contrib import messages
 from django.core.urlresolvers import reverse, reverse_lazy
 from django.utils.translation import ugettext_lazy as _
-from django.http import HttpResponse, JsonResponse, HttpResponseRedirect
+from django.http import HttpResponse, JsonResponse, HttpResponseRedirect,HttpRequest
 from django.shortcuts import redirect
 from braces import views as braces_mixins
@@ -79,16 +79,3 @@ class CSSStyleSettings(braces_mixins.LoginRequiredMixin, braces_mixins.Staffuser
 		context['settings_menu_active'] = "settings_menu_active"
 		return context
-
-def Contrast(request):
-	theme = Themes.objects.get(id = 1)
-
-	if theme.css_style == 'contrast':
-		theme.css_style = 'green'
-	else:
-		theme.css_style = 'contrast'
-	theme.save()
-
-	caminho = request.META.get('HTTP_REFERER')
-	
-	return HttpResponseRedirect(caminho)
@@ -87,7 +87,7 @@
                                            <span >[{{LANGUAGE_CODE}}]  </span>
                                         </a>
-                                        <a href="{% url 'themes:contrast'%}" style="margin-left:10px;"><i class="glyphicon glyphicon-adjust"></i></a>
+                                        <a href="" id = "contrast_button" style="margin-left:10px;"><i class="glyphicon glyphicon-adjust"></i></a>
                                         <ul class="dropdown-menu">
@@ -146,7 +146,19 @@
         </div>
     </div>
-
+<script type="text/javascript">
+    $("#contrast_button" ).click(function() {
+      if (Cookies.get('contrast_check')) {
+        Cookies.remove('contrast_check')
+        location.reload()
+      }
+      else {
+        Cookies.set('contrast_check','anonymous')
+        location.reload()
+      }
+
+    });
+</script>
 {% endblock%}
 {% block footer %}
	@@ -5,5 +5,4 @@ urlpatterns = [		@@ -5,5 +5,4 @@ urlpatterns = [
5	url(r'^$', views.IndexView.as_view(), name = 'manage'),	5	url(r'^$', views.IndexView.as_view(), name = 'manage'),
6	url(r'^basic_elements$', views.BasicElementsSettings.as_view(), name = 'basic'),	6	url(r'^basic_elements$', views.BasicElementsSettings.as_view(), name = 'basic'),
7	url(r'^css_selector$', views.CSSStyleSettings.as_view(), name = 'css'),	7	url(r'^css_selector$', views.CSSStyleSettings.as_view(), name = 'css'),
8	- url(r'^contrast$',views.Contrast, name = 'contrast'),
9	]	8	]
	@@ -3,7 +3,7 @@ from django.shortcuts import render		@@ -3,7 +3,7 @@ from django.shortcuts import render
3	from django.contrib import messages	3	from django.contrib import messages
4	from django.core.urlresolvers import reverse, reverse_lazy	4	from django.core.urlresolvers import reverse, reverse_lazy
5	from django.utils.translation import ugettext_lazy as _	5	from django.utils.translation import ugettext_lazy as _
6	-from django.http import HttpResponse, JsonResponse, HttpResponseRedirect	6	+from django.http import HttpResponse, JsonResponse, HttpResponseRedirect,HttpRequest
7	from django.shortcuts import redirect	7	from django.shortcuts import redirect
8		8
9	from braces import views as braces_mixins	9	from braces import views as braces_mixins
	@@ -79,16 +79,3 @@ class CSSStyleSettings(braces_mixins.LoginRequiredMixin, braces_mixins.Staffuser		@@ -79,16 +79,3 @@ class CSSStyleSettings(braces_mixins.LoginRequiredMixin, braces_mixins.Staffuser
79	context['settings_menu_active'] = "settings_menu_active"	79	context['settings_menu_active'] = "settings_menu_active"
80		80
81	return context	81	return context
82	-
83	-def Contrast(request):
84	- theme = Themes.objects.get(id = 1)
85	-
86	- if theme.css_style == 'contrast':
87	- theme.css_style = 'green'
88	- else:
89	- theme.css_style = 'contrast'
90	- theme.save()
91	-
92	- caminho = request.META.get('HTTP_REFERER')
93	-
94	- return HttpResponseRedirect(caminho)