Skip to content

aa.gusti / opensipkd-base

Go to a project
Commit 8d55d805 by aa.gusti
Options

Merge branch '5.0.3' into '5.0.3-oracle' 

5.0.3

See merge request !9
2 parents f409c726 561b196c
Inline Side-by-side
Showing 5 changed files with 14 additions and 7 deletions
opensipkd/base/__init__.py
...@@ -152,7 +152,7 @@ def get_menus(request): ...@@ -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/base_views.py
...@@ -83,6 +83,11 @@ class BaseView(object): ...@@ -83,6 +83,11 @@ class BaseView(object):
for key, value in request.headers.items(): for key, value in request.headers.items():
log.debug(f"{key}: {value}") log.debug(f"{key}: {value}")
log.debug("Init xhr: %s", self.req.is_xhr) log.debug("Init xhr: %s", self.req.is_xhr)
log.debug("X-Forwarded-Scheme %s", request.scheme)
log.debug("Changes http to https so %s", request.route_url('base-home'))
log.debug("X-Forwarded-Host %s", request.host)
log.debug("X-Forwarded-Server %s", request.server_name)
self.ses = self.req.session self.ses = self.req.session
self.db_session = DBSession self.db_session = DBSession
self.base = Base self.base = Base
......
opensipkd/base/views/templates/base.pt
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" tal:define="home request.home;"> <html lang="en" tal:define="home request.home.strip('/');">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
...@@ -73,7 +73,7 @@ ...@@ -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 @@ ...@@ -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
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en-us" tal:define=" <html lang="en-us" tal:define="
home request.home; home request.home.strip('/');
route_name route_name|request.matched_route.name; route_name route_name|request.matched_route.name;
css css|[]; css css|[];
js js|[]; js js|[];
...@@ -104,7 +104,7 @@ ...@@ -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>
...@@ -262,8 +262,10 @@ ...@@ -262,8 +262,10 @@
<script src="${home}/static/v3/js/osipkd.js"></script> <script src="${home}/static/v3/js/osipkd.js"></script>
<!-- LOOP ON JS RESOURCE --> <!-- LOOP ON JS RESOURCE -->
<tal:loop tal:repeat="js_resource js"> <tal:loop tal:repeat="js_resource js">
<script src="${home}${request.static_path(js_resource)}" tal:condition="js_resource[:4]!='http'"></script> <!--?<script src="${home}${request.static_path(js_resource)}" tal:condition="js_resource[:4]!='http'">A</script>-->
<script src="${request.static_url(js_resource)}" tal:condition="js_resource[:4]!='http'"></script>-->
<script src="${js_resource}" tal:condition="js_resource[:4]=='http'"></script> <script src="${js_resource}" tal:condition="js_resource[:4]=='http'"></script>
</tal:loop> </tal:loop>
<metal:js define-slot="js_files"></metal:js> <metal:js define-slot="js_files"></metal:js>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!