Adding direct access to each settings tab through menu

Erik Zambom
1 parent 77d33269
Showing 4 changed files with 31 additions and 25 deletions Show diff stats
app/templates/admin_settings.html
app/templates/home.html
app/urls.py
app/views.py
@@ -17,32 +17,34 @@
 </div>
 {% endfor %}
 <!-- Nav tabs -->
+
 <ul class="nav nav-tabs md-pills pills-ins" role="tablist">
+	{% if form.safe_conection.errors or form.host.errors or form.default_from_email.errors %}
+		<li class="nav-item">
+			<a class="nav-link {% if page == 'system' %}active{% endif %}" data-toggle="tab" href="#system" role="tab"><i class="fa fa-cog"></i> {% trans "System" %}</a>
+		</li>
+		<li class="nav-item">
+			<a class="nav-link  {% if page == 'mail_sender' %}active{% endif %}" data-toggle="tab" href="#mail_sender" role="tab"><i class="fa fa-envelope"></i> {% trans "Mail Sender" %}</a>
+		</li>
+	{% else %}
+		<li class="nav-item">
+			<a class="nav-link {% if page == 'system' %}active{% endif %}" data-toggle="tab" href="#system" role="tab"><i class="fa fa-cog"></i> {% trans "System" %}</a>
+		<li class="nav-item">
+			<a class="nav-link {% if page == 'mail_sender' %}active{% endif %}" data-toggle="tab" href="#mail_sender" role="tab"><i class="fa fa-envelope"></i> {% trans "Mail Sender" %}</a>
+		</li>
+	{% endif %}
 	<li class="nav-item">
-		{% if form.safe_conection.errors or form.host.errors or form.default_from_email.errors %}
-		<a class="nav-link" data-toggle="tab" href="#panel1" role="tab"><i class="fa fa-cog"></i> {% trans "System" %}</a>
-	</li>
-	<li class="nav-item">
-		<a class="nav-link active" data-toggle="tab" href="#panel2" role="tab"><i class="fa fa-envelope"></i> {% trans "Mail Sender" %}</a>
+		<a class="nav-link {% if page == 'security' %}active{% endif %}" data-toggle="tab" href="#security" role="tab"><i class="fa fa-lock"></i> {% trans "Security" %}</a>
 	</li>
-	{% else %}
-	<a class="nav-link active" data-toggle="tab" href="#panel1" role="tab"><i class="fa fa-cog"></i> {% trans "System" %}</a>
-<li class="nav-item">
-	<a class="nav-link" data-toggle="tab" href="#panel2" role="tab"><i class="fa fa-envelope"></i> {% trans "Mail Sender" %}</a>
-</li>
-{% endif %}
-<li class="nav-item">
-	<a class="nav-link" data-toggle="tab" href="#panel3" role="tab"><i class="fa fa-lock"></i> {% trans "Security" %}</a>
-</li>
 </ul>
 <!-- Tab panels -->
 <div class="tab-content">
 	<!--Panel 1-->
 	{% if form.errors %}
-	<div class="tab-pane fade" id="panel1" role="tabpanel">
+	<div class="tab-pane fade" id="system" role="tabpanel">
 		{% else %}
-		<div class="tab-pane fade in active" id="panel1" role="tabpanel">
+		<div class="tab-pane fade {% if page == 'system' %}in active{% endif %}" id="system" role="tabpanel">
 			{% endif %}
 			<div class="panel panel-default">
 				<div class="panel-body">
@@ -60,10 +62,10 @@
 		<!--Panel 2-->
 		{% if form.errors %}
-		<div class="tab-pane fade in active" id="panel2" role="tabpanel">
+		<div class="tab-pane fade in active" id="mail_sender" role="tabpanel">
 			{% else %}
-			<div class="tab-pane fade" id="panel2" role="tabpanel">
-				{% endif %}
+			<div class="tab-pane fade {% if page == 'mail_sender' %}in active{% endif %}" id="mail_sender" role="tabpanel">
+				{% endif %} 
 				<div class="panel panel-default">
 					<form class="form-horizontal" method="post">
 						{% csrf_token %}
@@ -252,7 +254,7 @@
 			<!--/.Panel 2-->
 			<!--Panel 3-->
-			<div class="tab-pane fade" id="panel3" role="tabpanel">
+			<div class="tab-pane fade {% if page == 'security' %}in active{% endif %}" id="security" role="tabpanel">
 				<div class="panel panel-default">
 					<div class="panel-body">
 						<div class="togglebutton">
@@ -110,9 +110,9 @@
                       <a href="#menu_settings" class="accordion" data-toggle="collapse">{% trans 'Settings' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
                       <div id="menu_settings" class="collapse">
                         <ul class="nav nav-pill nav-stacked accordion_list">
-                            <li> <a href="{% url 'app:settings' %}">{% trans "System" %}</a></li>
-                            <li> <a href="{% url 'app:settings' %}">{% trans "Mail Sender" %}</a></li>
-                            <li> <a href="{% url 'app:settings' %}">{% trans "Security" %}</a></li>
+                            <li> <a href="{% url 'app:settings' page='system' %}">{% trans "System" %}</a></li>
+                            <li> <a href="{% url 'app:settings' page='mail_sender' %}">{% trans "Mail Sender" %}</a></li>
+                            <li> <a href="{% url 'app:settings' page='security' %}">{% trans "Security" %}</a></li>
                         </ul>
                       </div>
                     </li>
@@ -4,5 +4,5 @@ from . import views
 urlpatterns = [
     url(r'^$', views.AppIndex.as_view(), name='index'),
-    url(r'^settings/$', views.AmadeusSettings.as_view(), name='settings'),
+    url(r'^settings/(?P<page>[\w_-]+)/$', views.AmadeusSettings.as_view(), name='settings'),
 ]
@@ -51,7 +51,10 @@ class AmadeusSettings(LoginRequiredMixin, HasRoleMixin, generic.CreateView):
 	model = EmailBackend
 	template_name = 'admin_settings.html'
 	form_class = EmailBackendForm
-	success_url = reverse_lazy('app:settings')
+	#success_url = reverse_lazy('app:settings')
+
+	def get_success_url(self):
+		return reverse_lazy('app:settings', kwargs = {'page': self.kwargs['page']})
 	def form_invalid(self, form):
 		return self.render_to_response(self.get_context_data(form=form))
@@ -75,6 +78,7 @@ class AmadeusSettings(LoginRequiredMixin, HasRoleMixin, generic.CreateView):
 	def get_context_data(self, **kwargs):
 		context = super(AmadeusSettings, self).get_context_data(**kwargs)
+		context['page'] = self.kwargs.get('page')
 		if not self.request.method == 'POST':
 			try:
 				setting = EmailBackend.objects.latest('id')
	@@ -4,5 +4,5 @@ from . import views		@@ -4,5 +4,5 @@ from . import views
4		4
5	urlpatterns = [	5	urlpatterns = [
6	url(r'^$', views.AppIndex.as_view(), name='index'),	6	url(r'^$', views.AppIndex.as_view(), name='index'),
7	- url(r'^settings/$', views.AmadeusSettings.as_view(), name='settings'),	7	+ url(r'^settings/(?P<page>[\w_-]+)/$', views.AmadeusSettings.as_view(), name='settings'),
8	]	8	]