From d6bed48a837a7638ad8b13f260d58f3d4cb6c9c6 Mon Sep 17 00:00:00 2001
From: Antonio de la Rosa <antonio.delarosa@salirdelhoyo.com>
Date: Fri, 21 Aug 2020 01:17:45 +0200
Subject: [PATCH] Fixers in fields

---
 paramecio2/libraries/db/extrafields/i18nfield.py  |  4 ++--
 paramecio2/libraries/mtemplates.py                | 15 +++++++++++++++
 .../libraries/templates/forms/i18nform.phtml      |  3 +--
 .../libraries/templates/forms/texthtmlform.phtml  |  4 ++--
 .../modules/admin/templates/dashboard.phtml       |  3 ++-
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/paramecio2/libraries/db/extrafields/i18nfield.py b/paramecio2/libraries/db/extrafields/i18nfield.py
index bf7b96a..5893c13 100644
--- a/paramecio2/libraries/db/extrafields/i18nfield.py
+++ b/paramecio2/libraries/db/extrafields/i18nfield.py
@@ -4,8 +4,8 @@ import json
 from paramecio2.libraries.db.webmodel import PhangoField
 from paramecio2.libraries.db.coreforms import BaseForm
 from paramecio2.libraries.db.extraforms.i18nform import I18nForm
-from paramecio.citoplasma.i18n import I18n
-from paramecio.citoplasma.httputils import GetPostFiles
+from paramecio2.libraries.i18n import I18n
+#from paramecio.citoplasma.httputils import GetPostFiles
 import json
 import re
 
diff --git a/paramecio2/libraries/mtemplates.py b/paramecio2/libraries/mtemplates.py
index b99b948..374c573 100644
--- a/paramecio2/libraries/mtemplates.py
+++ b/paramecio2/libraries/mtemplates.py
@@ -48,6 +48,8 @@ class PTemplate:
         
         self.filters={}
         
+        self.js={}
+        
         self.add_filter(I18n.lang)
         
         #self.add_filter(make_url)
@@ -59,6 +61,19 @@ class PTemplate:
         self.add_filter(csrf_token)
         
         self.add_filter(add_get_parameters)
+        
+        self.add_filter(self.add_js)
+        
+        self.add_filter(self.load_js)
+
+    def add_js(self, js, module=''):
+        
+        self.js[js]='<script language="Javascript" src="{}"></script>'.format(make_media_url('js/'+js, module))
+        
+    def load_js(self):
+        
+        return "\n".join(self.js.values())
+        
 
     """
     def gettext(self, text):
diff --git a/paramecio2/libraries/templates/forms/i18nform.phtml b/paramecio2/libraries/templates/forms/i18nform.phtml
index 4dd6551..756e5a4 100644
--- a/paramecio2/libraries/templates/forms/i18nform.phtml
+++ b/paramecio2/libraries/templates/forms/i18nform.phtml
@@ -1,4 +1,3 @@
-${add_js_home_local('tools.js', 'admin')}
 <%
 
 choose=''
@@ -29,7 +28,7 @@ choose=''
         <%
         form.default_value=default_value[i18n]
         %>
-        <span id="${name_form}_${i18n}_switch" class="${name_form}_i18n_form">${form.form()|n}</span>        <a class="choose_flag ${name_form}_i18n_flag lang_form" id="${name_form}_${i18n}_element" href="#"><img src="${make_media_url_module('images/languages/'+i18n+'.png', 'admin')}" alt="${name_form}_${i18n}"/></a> 
+        <span id="${name_form}_${i18n}_switch" class="${name_form}_i18n_form">${form.form()|n}</span>        <a class="choose_flag ${name_form}_i18n_flag lang_form" id="${name_form}_${i18n}_element" href="#"><img src="${make_media_url('images/languages/'+i18n+'.png', 'admin')}" alt="${name_form}_${i18n}"/></a> 
     % endfor 
 % endif
 </div>
diff --git a/paramecio2/libraries/templates/forms/texthtmlform.phtml b/paramecio2/libraries/templates/forms/texthtmlform.phtml
index d567bc0..0c4cb7f 100644
--- a/paramecio2/libraries/templates/forms/texthtmlform.phtml
+++ b/paramecio2/libraries/templates/forms/texthtmlform.phtml
@@ -8,7 +8,7 @@ tinymce.init({
     selector: '#${form.name_field_id}',
     height: 500,
     menubar: true,
-    plugins: 'print preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media template codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists textcolor wordcount imagetools contextmenu colorpicker textpattern',
+    plugins: 'code print preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media template codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists textcolor wordcount imagetools contextmenu colorpicker textpattern',
     toolbar: 'formatselect | fontsizeselect bold italic underline strikethrough forecolor backcolor | link | alignleft aligncenter alignright alignjustify  | numlist bullist outdent indent  | removeformat',
     fontsize_formats: "8pt 10pt 12pt 14pt 18pt 24pt 36pt 48pt 64pt 100pt 120pt",    
     content_css: '//www.tinymce.com/css/codepen.min.css',
@@ -19,4 +19,4 @@ tinymce.init({
     }
 });
 </script>
-${add_js_home_local('tinymce/tinymce.min.js', 'admin')}
+${add_js('tinymce/tinymce.min.js', 'admin')}
diff --git a/paramecio2/modules/admin/templates/dashboard.phtml b/paramecio2/modules/admin/templates/dashboard.phtml
index 02bed53..033a9af 100644
--- a/paramecio2/modules/admin/templates/dashboard.phtml
+++ b/paramecio2/modules/admin/templates/dashboard.phtml
@@ -2,7 +2,7 @@
 <html>
 <head>                                                                                          
 <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>
 <link href="${make_media_url('css/admin.css', 'admin')}" rel="stylesheet" />
 <link href="${make_media_url('css/font-awesome.min.css', 'admin')}" rel="stylesheet" />
@@ -14,6 +14,7 @@
 <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>
+${load_js()|n}
 <%block name="extra_js">
 </%block>
 <%block name="extra_header">