update url login

opensipkd/base/__init__.py

@@ -152,7 +152,7 @@ def get_menus(request):
 
 
 
 
 def get_home(request):
 def get_home(request):
-    return request.route_url('base-home')
+    return request.route_url('base-home').strip('/')
     # [:-1]
     # [:-1]
 
 
 
 

opensipkd/base/views/templates/base.pt

@@ -73,7 +73,7 @@
       <div class="navbar-collapse collapse" tal:condition="not request.user">
       <div class="navbar-collapse collapse" tal:condition="not request.user">
         <ul class="nav navbar-nav navbar-right" style="margin-right:0px;">
         <ul class="nav navbar-nav navbar-right" style="margin-right:0px;">
           <li>
           <li>
-            <a href="${request.route_url('base-login')}">Login</a>
+            <a href="${request.route_url('base-login')}?next=${home}">Login</a>
           </li>
           </li>
         </ul>
         </ul>
       </div>
       </div>

opensipkd/base/views/templates/base3.1.pt

@@ -120,7 +120,7 @@
             <!-- User info -->
             <!-- User info -->
             <ul tal:condition="not request.user" class="header-dropdown-list hidden-xs">
             <ul tal:condition="not request.user" class="header-dropdown-list hidden-xs">
                 <li>
                 <li>
-                    <a href="${home}/login" class="dropdown-toggle"><i class="fa fa-lg fa-fw fa-user"></i>Login</a>
+                    <a  href="${request.route_url('base-login')}?next=${home}" class="dropdown-toggle"><i class="fa fa-lg fa-fw fa-user"></i>Login</a>
                 </li>
                 </li>
             </ul>
             </ul>
             <ul tal:condition="request.user" class="header-dropdown-list hidden-xs">
             <ul tal:condition="request.user" class="header-dropdown-list hidden-xs">

opensipkd/base/views/templates/base5.pt

@@ -104,7 +104,7 @@
 
 
             <ul tal:condition="not request.user" class="header-dropdown-list">
             <ul tal:condition="not request.user" class="header-dropdown-list">
                 <li>
                 <li>
-                    <a href="${home}/login" class="dropdown-toggle"><i class="fa fa-lg fa-fw fa-user"></i>Login</a>
+                    <a href="${request.route_url('base-login')}?next=${home}" class="dropdown-toggle"><i class="fa fa-lg fa-fw fa-user"></i>Login</a>
                 </li>
                 </li>
             </ul>
             </ul>