1.bugfix: layout, 2.logout redirect url

blackholll · Apr 7, 2019 · 8ae2f29 · 8ae2f29
1 parent 6bfad34
commit 8ae2f29
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/apps/account/views.py b/apps/account/views.py
@@ -214,7 +214,7 @@ def get(self, request, *args, **kwargs):
         :return:
         """
         logout(request)
-        return redirect('/manage')
+        return redirect('/manage/')
 
 
 class LoonUserRoleView(View):

diff --git a/templates/base_header.html b/templates/base_header.html
@@ -3,7 +3,7 @@
   <header class="main-header">
 
     <!-- Logo -->
-    <a href="index2.html" class="logo">
+    <a href="/manage/" class="logo">
       <!-- mini logo for sidebar mini 50x50 pixels -->
       <span class="logo-mini"><b>L</b>Flow</span>
       <!-- logo for regular state and mobile devices -->

diff --git a/templates/base_nav.html b/templates/base_nav.html
@@ -7,9 +7,9 @@
 
     <!-- Optionally, you can add icons to the links -->
     {% if active_nav == 'overview' %}
-    <li class="active"><a href="/manage"><i class="fa fa-dashboard"></i> <span>总览</span></a></li>
+    <li class="active"><a href="/manage/"><i class="fa fa-dashboard"></i> <span>总览</span></a></li>
     {% else %}
-    <li><a href="/manage"><i class="fa fa-dashboard"></i> <span>总览</span></a></li>
+    <li><a href="/manage/"><i class="fa fa-dashboard"></i> <span>总览</span></a></li>
     {% endif %}
 
     {% if active_nav == 'doc' %}

diff --git a/templates/user_and_permission/token_manage.html b/templates/user_and_permission/token_manage.html
@@ -98,7 +98,6 @@ <h4 class="modal-title">调用权限</h4>
           </div>
         </div>
         <!-- /.modal-content -->
-      </div>
       <!-- /.modal-dialog -->
     </div>
   </div>

diff --git a/templates/user_and_permission/user_manage.html b/templates/user_and_permission/user_manage.html
@@ -79,7 +79,7 @@ <h4 class="modal-title" id="userRoleTitle">用户角色</h4>
         </div>
 
 </div>
-
+</div>
 <!-- /.content-wrapper -->
 
 {% endblock %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,7 +98,6 @@ <h4 class="modal-title">调用权限</h4> @@
               </div>
             </div>
             <!-- /.modal-content -->
-          </div>
           <!-- /.modal-dialog -->
         </div>
       </div>
@@ Expand Down @@