diff --git a/paramecio/citoplasma/generate_admin_class.py b/paramecio/citoplasma/generate_admin_class.py
index eacb10e..f0a46dc 100644
--- a/paramecio/citoplasma/generate_admin_class.py
+++ b/paramecio/citoplasma/generate_admin_class.py
@@ -51,6 +51,8 @@ class GenerateAdminClass:
self.post_update=None
+ self.text_home=I18n.lang('common', 'home', 'Home')
+
def show(self):
getpostfiles=GetPostFiles()
@@ -209,6 +211,8 @@ class GenerateConfigClass:
self.post_update=None
+ self.text_home=I18n.lang('common', 'home', 'Home')
+
def show(self):
getpostfiles=GetPostFiles()
diff --git a/paramecio/citoplasma/templates/utils/insertform.phtml b/paramecio/citoplasma/templates/utils/insertform.phtml
index f5ca9dc..b753fc7 100644
--- a/paramecio/citoplasma/templates/utils/insertform.phtml
+++ b/paramecio/citoplasma/templates/utils/insertform.phtml
@@ -1,4 +1,4 @@
-
${lang('common', 'home', 'Home')} >> \
+
${admin.text_home|n} >> \
% if id!='0':
${title_edit} \
%else:
diff --git a/paramecio/citoplasma/templates/utils/list.phtml b/paramecio/citoplasma/templates/utils/list.phtml
index 8ab9f12..8d395e6 100644
--- a/paramecio/citoplasma/templates/utils/list.phtml
+++ b/paramecio/citoplasma/templates/utils/list.phtml
@@ -22,6 +22,7 @@
% endif
% if not simplelist.table_div:
+
% for field in simplelist.fields_showed:
@@ -57,22 +58,30 @@
%>
% endfor
+
% else:
+<%
+
+size_td=round(100/(len(simplelist.fields_showed)+len(simplelist.arr_extra_options)))
+
+%>
+
-
+
-
+
<%
pos=0
%>
% for row in list:
+
<%
if not 'pos' in row:
row['pos']=pos
@@ -80,18 +89,19 @@
% for field in simplelist.fields_showed:
% if simplelist.model.fields[field].escape==True:
-
${simplelist.model.fields[field].show_formatted(row[field])}
+
${simplelist.model.fields[field].show_formatted(row[field])}
% else:
-
${str(simplelist.model.fields[field].show_formatted(row[field]))|n}
+ ${str(simplelist.model.fields[field].show_formatted(row[field]))|n}
% endif
% endfor
% for extra_field_func in simplelist.arr_extra_options:
- ${ simplelist.set_options(extra_field_func, row)|n }
+ ${ simplelist.set_options(extra_field_func, row)|n }
% endfor
<%
pos+=1
%>
+
% endfor
diff --git a/paramecio/cromosoma/coreforms.py b/paramecio/cromosoma/coreforms.py
index 7bf1458..bbf360c 100644
--- a/paramecio/cromosoma/coreforms.py
+++ b/paramecio/cromosoma/coreforms.py
@@ -130,7 +130,7 @@ class SelectModelForm(SelectForm):
with self.model.select([self.field_name, self.field_value], True) as cur:
for arr_value in cur:
- self.arr_select[arr_value[self.field_value]]=arr_value[self.field_name]
+ self.arr_select[arr_value[self.field_value]]=self.model.fields[self.field_name].show_formatted(arr_value[self.field_name])
try:
diff --git a/paramecio/modules/admin/media/css/admin.css b/paramecio/modules/admin/media/css/admin.css
index c95682b..cf8678f 100644
--- a/paramecio/modules/admin/media/css/admin.css
+++ b/paramecio/modules/admin/media/css/admin.css
@@ -395,7 +395,7 @@ margin-right:auto;
}
-.title_list td {
+.title_list td, .fields_span_title {
margin:0px;
padding:4px;
@@ -408,7 +408,23 @@ margin-right:auto;
}
-.row_list td {
+.fields_span_title, div.options_td , div.fields_span_table_data {
+
+ box-sizing: border-box;
+ display:inline-block;
+ /*margin-top:4px;*/
+ /*border: solid #000 1px;*/
+}
+
+.tr_list_div , div.fields_span_table_data {
+
+ margin-top:4px;
+ margin-left: 4px;
+ margin-right: 2px;
+
+}
+
+.row_list td, div.fields_span_table_data {
/*border:solid #cccccc;
border-width:1px;*/
@@ -416,6 +432,13 @@ margin-right:auto;
}
+div.fields_span_table_data {
+
+ box-sizing: border-box;
+ margin: 0px;
+
+}
+
.cont_text, .cont
{