From 65e4efb987c1fb391f94dfc404214ab1847a1082 Mon Sep 17 00:00:00 2001
From: Antonio de la Rosa <webmaster@web-t-sys.com>
Date: Fri, 19 Feb 2016 02:22:51 +0100
Subject: [PATCH] FIxes in i18nform

---
 paramecio/citoplasma/i18n.py                        | 8 +++++++-
 paramecio/citoplasma/templates/forms/i18nform.phtml | 8 +++++++-
 paramecio/cromosoma/coreforms.py                    | 6 ++++++
 paramecio/cromosoma/extraforms/i18nform.py          | 6 ++++--
 paramecio/modules/admin/media/css/admin.css         | 2 +-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/paramecio/citoplasma/i18n.py b/paramecio/citoplasma/i18n.py
index bd85d03..a8b5130 100644
--- a/paramecio/citoplasma/i18n.py
+++ b/paramecio/citoplasma/i18n.py
@@ -34,7 +34,7 @@ class I18n:
     l={}
     
     @staticmethod
-    def lang(module, symbol, text_default):
+    def get_default_lang():
         
         lang=I18n.default_lang
         
@@ -46,6 +46,12 @@ class I18n:
             
             lang=s['lang']
             
+        return lang
+    
+    @staticmethod
+    def lang(module, symbol, text_default):
+        
+        lang=I18n.get_default_lang()
         
         I18n.l[lang]=I18n.l.get(lang, {})
         
diff --git a/paramecio/citoplasma/templates/forms/i18nform.phtml b/paramecio/citoplasma/templates/forms/i18nform.phtml
index c6506dd..fd8c489 100644
--- a/paramecio/citoplasma/templates/forms/i18nform.phtml
+++ b/paramecio/citoplasma/templates/forms/i18nform.phtml
@@ -1,6 +1,5 @@
 ${add_js_home_local('tools.js', 'admin')}
 <div id="languages_form">
-${form.form()|n}
 <%def name="select_lang(i18n, lang_selected)">
     % if i18n==lang_selected:
         choose_flag
@@ -8,8 +7,15 @@ ${form.form()|n}
         no_choose_flag
     % endif
 </%def>
+<%def name="hide_lang(i18n, lang_selected)">
+    % if i18n!=lang_selected:
+        style="display:none;"
+    % endif
+</%def>
 % if lang_selected!=None:
     % for i18n in arr_i18n:
+        ${form.change_name(name_form+'_'+i18n)}
+        <span${hide_lang(i18n, lang_selected)} id="${name_form}_switch">${form.form()|n}</span>
         <a class="${select_lang(i18n, lang_selected)} lang_form" href="#"><img src="${make_media_url_module('images/languages/'+i18n+'.png', 'admin')}" alt="${name_form}_${i18n}"/></a> 
     % endfor 
 % endif
diff --git a/paramecio/cromosoma/coreforms.py b/paramecio/cromosoma/coreforms.py
index a177c67..0020b70 100644
--- a/paramecio/cromosoma/coreforms.py
+++ b/paramecio/cromosoma/coreforms.py
@@ -32,6 +32,12 @@ class BaseForm:
         value=str(value)
         
         return value.replace('"', '&quot;').replace("'", '&#39;')
+    
+    def change_name(self, new_name):
+        
+        self.name=new_name
+        
+        return ""
 
 class TextForm(BaseForm):
     
diff --git a/paramecio/cromosoma/extraforms/i18nform.py b/paramecio/cromosoma/extraforms/i18nform.py
index 9e0f3e4..43fd896 100644
--- a/paramecio/cromosoma/extraforms/i18nform.py
+++ b/paramecio/cromosoma/extraforms/i18nform.py
@@ -13,5 +13,7 @@ class I18nForm(BaseForm):
         self.form_child=form
     
     def form(self):
-        print(self.name)
-        return standard_t.load_template('forms/i18nform.phtml', name_form=self.name, form=self.form_child, arr_i18n=I18n.dict_i18n, lang_selected=I18n.default_lang)
\ No newline at end of file
+        
+        lang_selected=I18n.get_default_lang()
+        
+        return standard_t.load_template('forms/i18nform.phtml', name_form=self.name, form=self.form_child, arr_i18n=I18n.dict_i18n, lang_selected=lang_selected)
\ No newline at end of file
diff --git a/paramecio/modules/admin/media/css/admin.css b/paramecio/modules/admin/media/css/admin.css
index 051567e..2af39d9 100644
--- a/paramecio/modules/admin/media/css/admin.css
+++ b/paramecio/modules/admin/media/css/admin.css
@@ -67,7 +67,7 @@ h1
 	font-weight:normal;
 	font-style:italic;
 	color:#04004e;
-	background-image:url('../images/button_head.png');
+	/*background-image:url('../images/button_head.png');*/
 	background-repeat: no-repeat;
 	/*padding-left:65px;*/
 	/*height:60px;