paramecio/parameciofm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simple fixes to templates and url media

Browse source
This commit is contained in:
Antonio de la Rosa 2020-01-12 20:33:10 +01:00
parent 46d901e830
commit dc7e5689b7
5 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
paramecio/citoplasma/mtemplates.py
View file

@ -234,6 +234,7 @@ class STemplate:
return Template(html_code) return Template(html_code)
# DEPRECATED, use utilities from mako for personalize headers.
class HeaderHTML: class HeaderHTML:

17
paramecio/citoplasma/urls.py
View file

@ -80,19 +80,32 @@ def get_actual_url():
if config.yes_static==True: if config.yes_static==True:
def make_media_url(file_path): def make_media_url(file_path, module=''):
if module=='':
return config.media_url+'media/'+file_path return config.media_url+'media/'+file_path
else:
return make_media_url_module(file_path, module)
def make_media_url_module(file_path, module): def make_media_url_module(file_path, module):
return config.media_url+'mediafrom/'+module+'/'+file_path return config.media_url+'mediafrom/'+module+'/'+file_path
else: else:
def make_media_url(file_path): def make_media_url(file_path, module=''):
if module=='':
return config.media_url+'media/'+file_path return config.media_url+'media/'+file_path
else:
return make_media_url_module(file_path, module)
def make_media_url_module(file_path, module): def make_media_url_module(file_path, module):
return config.media_url+'media/'+module+'/'+file_path return config.media_url+'media/'+module+'/'+file_path

14
paramecio/modules/admin/templates/admin/home.html
View file

@ -11,18 +11,18 @@ ${make_url('admin/'+module)}\
<meta http-equiv="content-type" content="text/html; charset=UTF-8"> <meta http-equiv="content-type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0;"> <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0;">
<title>${title}</title> <title>${title}</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} ${HeaderHTML.css_home()|n}
<link href="${make_media_url('css/admin.css', 'admin')}" rel="stylesheet" />
<link href="${make_media_url('css/font-awesome.min.css', 'admin')}" rel="stylesheet" />
<link href="${make_media_url('css/responsive-nav.css', 'admin')}" rel="stylesheet" />
<link href="${make_media_url('css/tooltipster.bundle.min.css', 'admin')}" rel="stylesheet" />
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
<%block name="extra_css"> <%block name="extra_css">
</%block> </%block>
${HeaderHTML.js_home()|n} ${HeaderHTML.js_home()|n}
<script language="Javascript" src="${make_media_url('js/jquery.min.js', 'admin')}"></script>
<script language="Javascript" src="${make_media_url('js/responsive-nav.min.js', 'admin')}"></script>
<script language="Javascript" src="${make_media_url('js/tooltipster.bundle.min.js', 'admin')}"></script>
<%block name="extra_js"> <%block name="extra_js">
</%block> </%block>
${HeaderHTML.header_home()|n} ${HeaderHTML.header_home()|n}

6
paramecio/modules/admin/templates/admin/login.phtml
View file

@ -4,10 +4,10 @@
<title><%block name="title">${lang('admin', 'login', 'Paramecio Login')}</%block></title> <title><%block name="title">${lang('admin', 'login', 'Paramecio Login')}</%block></title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"> <meta http-equiv="content-type" content="text/html; charset=UTF-8">
<link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
${add_js_home_local('jquery.min.js', 'admin')} <link href="${make_media_url('css/login.css', 'admin')}" rel='stylesheet' type='text/css'>
${add_css_home_local('login.css', 'admin')} <link href="${make_media_url('css/font-awesome.min.css', 'admin')}" rel='stylesheet' type='text/css'>
${add_css_home_local('font-awesome.min.css', 'admin')}
${HeaderHTML.css_home()|n} ${HeaderHTML.css_home()|n}
<script language="Javascript" src="${make_media_url('js/jquery.min.js', 'admin')}"></script>
${HeaderHTML.js_home()|n} ${HeaderHTML.js_home()|n}
<%block name="ajax"> <%block name="ajax">
<script language="javascript"> <script language="javascript">

2
paramecio/modules/admin/templates/admin/register.phtml
View file

@ -26,8 +26,6 @@
} }
else else
{ {
//alert(JSON.stringify(data));
//$('#result_register').html('Error');
$('#loading').hide(); $('#loading').hide();