Fixes

citoplasma/generate_admin_class.py

@@ -1,10 +1,10 @@
-from citoplasma.lists import SimpleList
+from paramecio.citoplasma.lists import SimpleList
 from bottle import request, redirect 
-from citoplasma.urls import add_get_parameters
-from citoplasma.templates import set_flash_message
-from cromosoma.formsutils import show_form
-from citoplasma.i18n import I18n
-from citoplasma.httputils import GetPostFiles
+from paramecio.citoplasma.urls import add_get_parameters
+from paramecio.citoplasma.mtemplates import set_flash_message
+from paramecio.cromosoma.formsutils import show_form
+from paramecio.citoplasma.i18n import I18n
+from paramecio.citoplasma.httputils import GetPostFiles
 
 class GenerateAdminClass:
     

citoplasma/lists.py

@@ -1,9 +1,9 @@
 #By default id is not showed
 
-from citoplasma.pages import Pages
-from citoplasma.urls import add_get_parameters
-from citoplasma.sessions import get_session
-from citoplasma.i18n import I18n
+from paramecio.citoplasma.pages import Pages
+from paramecio.citoplasma.urls import add_get_parameters
+from paramecio.citoplasma.sessions import get_session
+from paramecio.citoplasma.i18n import I18n
 from bottle import request
 import sys
 

citoplasma/mtemplates.py

@@ -46,6 +46,10 @@ class ptemplate:
         
         self.add_filter(add_js_home)
         
+        self.add_filter(add_css_home_local)
+        
+        self.add_filter(add_js_home_local)
+        
         self.add_filter(add_header_home)
         
         #self.auto_reload=True
@@ -56,11 +60,15 @@ class ptemplate:
         HeaderHTML.js=[]
         HeaderHTML.header=[]
         HeaderHTML.cache_header=[]
+        HeaderHTML.css_local={}
+        HeaderHTML.js_local={}
     
     def clean_header_cache(self):
         
         HeaderHTML.css=[]
         HeaderHTML.js=[]
+        HeaderHTML.css_local={}
+        HeaderHTML.js_local={}
         HeaderHTML.header=[]
         HeaderHTML.cache_header=[]
     
@@ -80,8 +88,8 @@ class ptemplate:
         
         #Standard templates
         
-        standard_templates=path.dirname(__name__)+'/templates'
-
+        standard_templates=path.dirname(__file__)+'/templates'
+        #print(standard_templates)
         return TemplateLookup(directories=[theme_templates, module_templates, standard_templates], default_filters=['h'], input_encoding='utf-8', encoding_errors='replace')
 
         #return Environment(autoescape=self.guess_autoescape, auto_reload=True, loader=FileSystemLoader([theme_templates, module_templates]))
@@ -128,6 +136,10 @@ class HeaderHTML:
         for js in HeaderHTML.js:
             final_js.append('<script language="Javascript" src="'+make_media_url('js/'+js)+'"></script>')
         
+        for module, arr_js in HeaderHTML.js_local.items():
+            for js in arr_js:
+                final_js.append('<script language="Javascript" src="'+make_media_url_module('js/'+js, module)+'"></script>')
+        
         return "\n".join(final_js)
 
     def css_home():
@@ -137,6 +149,12 @@ class HeaderHTML:
         for css in HeaderHTML.css:
             final_css.append('<link href="'+make_media_url('css/'+css)+'" rel="stylesheet" type="text/css"/>')
 
+        for module, arr_css in HeaderHTML.css_local.items():
+            
+            for css in arr_css:
+            
+                final_css.append('<link href="'+make_media_url_module('css/'+css, module)+'" rel="stylesheet" type="text/css"/>')
+
         return "\n".join(final_css)
 
 
@@ -158,15 +176,35 @@ def add_css_home(css):
     
     if not css in HeaderHTML.css:
         HeaderHTML.css.append(css)
-    
-    return ""
-    
+        
+    return ''
+        
 def add_js_home(js):
     
     if not js in HeaderHTML.js:
         HeaderHTML.js.append(js)
+
+    return ''
+
+def add_css_home_local(css, module):
     
-    return ""
+    if not css in HeaderHTML.css_local:
+        
+        HeaderHTML.css_local[module]=HeaderHTML.css_local.get(module, [])
+        
+        HeaderHTML.css_local[module].append(css)
+
+    return ''
+
+def add_js_home_local(js, module):
+    
+    if not js in HeaderHTML.js_local:
+        
+        HeaderHTML.js_local[module]=HeaderHTML.js_local.get(module, [])
+        
+        HeaderHTML.js_local[module].append(js)
+
+    return ''
 
 def set_flash_message(message):
     

citoplasma/pages.py

@@ -1,8 +1,8 @@
 #!/usr/bin/python3
 
 from math import ceil, floor
-from citoplasma.urls import add_get_parameters
-from citoplasma.i18n import I18n
+from paramecio.citoplasma.urls import add_get_parameters
+from paramecio.citoplasma.i18n import I18n
 
 class Pages: 
 

citoplasma/templates/admin/home.html

@@ -5,10 +5,10 @@
 <title>${title}</title>
 <!--<link href="{{'css/admin/admin.css'|make_media_url}}" rel="stylesheet" type="text/css"/>
 <link href="{{'css/font-awesome.min.css'|make_media_url}}" rel="stylesheet" type="text/css"/>-->
-${add_css_home('admin/admin.css')}
-${add_css_home('font-awesome.min.css')}
+${add_css_home_local('admin.css', 'admin')}
+${add_css_home_local('font-awesome.min.css', 'admin')}
 ${HeaderHTML.css_home()|n}
-${add_js_home('jquery.min.js')}
+${add_js_home_local('jquery.min.js', 'admin')}
 ${HeaderHTML.js_home()|n}
 ${HeaderHTML.header_home()|n}
 </head>

citoplasma/templates/admin/login.phtml

@@ -4,9 +4,9 @@
     <title><%block name="title">${lang('admin', 'login', 'Paramecio Login')}</%block></title>
     <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'>
-    ${add_js_home('jquery.min.js')}
-    ${add_css_home('admin/login.css')}
-    ${add_css_home('font-awesome.min.css')}
+    ${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">