Fixes in links for installations in nginx directory

This commit is contained in:
Antonio de la Rosa 2016-07-01 05:06:47 +02:00
parent 4335675035
commit 7e34e37ced
3 changed files with 14 additions and 7 deletions

View file

@ -1,6 +1,6 @@
import os, sys, traceback, inspect, resource import os, sys, traceback, inspect, resource
from importlib import import_module from importlib import import_module
from bottle import route, get, post, run, default_app, abort, request, response, static_file, load, hook from bottle import route, get, post, run, default_app, abort, request, response, static_file, load, hook, error
from settings import config, modules from settings import config, modules
from beaker.middleware import SessionMiddleware from beaker.middleware import SessionMiddleware
from mimetypes import guess_type from mimetypes import guess_type
@ -172,6 +172,13 @@ if config.session_enabled==True:
@hook('before_request') @hook('before_request')
def strip_path(): def strip_path():
request.environ['PATH_INFO'] = request.environ['PATH_INFO'].rstrip('/') request.environ['PATH_INFO'] = request.environ['PATH_INFO'].rstrip('/')
# Set error screen if not debug setted
if config.debug==False:
@error(404)
def error404(error):
return 'Error: page not found'
def run_app(app): def run_app(app):

View file

@ -1,8 +1,8 @@
<%def name="check_menu(module)">\ <%def name="check_menu(module)">\
% if module[:1]=='/': % if module[:1]=='/':
${module}\ ${make_url(module[1:])}\
% else: % else:
${'/admin/'+module}\ ${make_url('admin/'+module)}\
% endif % endif
</%def> </%def>
<!DOCTYPE html> <!DOCTYPE html>
@ -39,7 +39,7 @@ ${HeaderHTML.header_home()|n}
</%def> </%def>
% if lang_selected!=None: % if lang_selected!=None:
% for i18n in arr_i18n: % for i18n in arr_i18n:
<a class="${select_lang(i18n, lang_selected)}" href="/change_lang/${i18n}"><img src="${make_media_url_module('images/languages/'+i18n+'.png', 'admin')}" alt="${i18n}"/></a> <a class="${select_lang(i18n, lang_selected)}" href="${make_url('change_lang/'+i18n)}"><img src="${make_media_url_module('images/languages/'+i18n+'.png', 'admin')}" alt="${i18n}"/></a>
% endfor % endfor
% endif % endif
@ -51,7 +51,7 @@ ${HeaderHTML.header_home()|n}
% for module in menu: % for module in menu:
% if type(menu[module]).__name__=='list': % if type(menu[module]).__name__=='list':
% if menu[module][0]!="": % if menu[module][0]!="":
<a href="${make_url(check_menu(module).strip())|n}">${menu[module][0]}</a> <a href="${check_menu(module).strip()|n}">${menu[module][0]}</a>
% endif % endif
% else: % else:
% if menu[module]!="": % if menu[module]!="":

View file

@ -10,9 +10,9 @@ from paramecio.cromosoma.webmodel import WebModel
port=8080 port=8080
debug=True debug=False
reloader=True reloader=False
admin_folder='admin' admin_folder='admin'