diff --git a/paramecio/citoplasma/mtemplates.py b/paramecio/citoplasma/mtemplates.py index 5d34d17..80ea371 100644 --- a/paramecio/citoplasma/mtemplates.py +++ b/paramecio/citoplasma/mtemplates.py @@ -234,6 +234,7 @@ class STemplate: return Template(html_code) +# DEPRECATED, use utilities from mako for personalize headers. class HeaderHTML: diff --git a/paramecio/citoplasma/urls.py b/paramecio/citoplasma/urls.py index 71b0912..f161c2a 100644 --- a/paramecio/citoplasma/urls.py +++ b/paramecio/citoplasma/urls.py @@ -80,18 +80,31 @@ def get_actual_url(): if config.yes_static==True: - def make_media_url(file_path): + def make_media_url(file_path, module=''): - return config.media_url+'media/'+file_path + if module=='': + + return config.media_url+'media/'+file_path + + else: + + return make_media_url_module(file_path, module) def make_media_url_module(file_path, module): return config.media_url+'mediafrom/'+module+'/'+file_path else: - def make_media_url(file_path): + def make_media_url(file_path, module=''): - return config.media_url+'media/'+file_path + if module=='': + + return config.media_url+'media/'+file_path + + else: + + return make_media_url_module(file_path, module) + def make_media_url_module(file_path, module): diff --git a/paramecio/modules/admin/templates/admin/home.html b/paramecio/modules/admin/templates/admin/home.html index 5bf7d79..623ac11 100644 --- a/paramecio/modules/admin/templates/admin/home.html +++ b/paramecio/modules/admin/templates/admin/home.html @@ -11,18 +11,18 @@ ${make_url('admin/'+module)}\ ${title} -${add_css_home_local('admin.css', 'admin')} -${add_css_home_local('font-awesome.min.css', 'admin')} -${add_css_home_local('responsive-nav.css', 'admin')} -${add_css_home_local('tooltipster.bundle.min.css', 'admin')} -${add_js_home_local('jquery.min.js', 'admin')} -${add_js_home_local('responsive-nav.min.js', 'admin')} -${add_js_home_local('tooltipster.bundle.min.js', 'admin')} ${HeaderHTML.css_home()|n} + + + + <%block name="extra_css"> ${HeaderHTML.js_home()|n} + + + <%block name="extra_js"> ${HeaderHTML.header_home()|n} diff --git a/paramecio/modules/admin/templates/admin/login.phtml b/paramecio/modules/admin/templates/admin/login.phtml index 10950f1..47de95a 100644 --- a/paramecio/modules/admin/templates/admin/login.phtml +++ b/paramecio/modules/admin/templates/admin/login.phtml @@ -4,10 +4,10 @@ <%block name="title">${lang('admin', 'login', 'Paramecio Login')}</%block> - ${add_js_home_local('jquery.min.js', 'admin')} - ${add_css_home_local('login.css', 'admin')} - ${add_css_home_local('font-awesome.min.css', 'admin')} + + ${HeaderHTML.css_home()|n} + ${HeaderHTML.js_home()|n} <%block name="ajax">