projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'debian' into b-3.6.1
[kivitendo-erp.git]
/
templates
/
webpages
/
amcvar
/
render_inputs_block.html
diff --git
a/templates/webpages/amcvar/render_inputs_block.html
b/templates/webpages/amcvar/render_inputs_block.html
index
3141a5a
..
984c589
100644
(file)
--- a/
templates/webpages/amcvar/render_inputs_block.html
+++ b/
templates/webpages/amcvar/render_inputs_block.html
@@
-1,6
+1,7
@@
[%- USE T8 %]
[%- USE HTML %]
[%- USE L %]
[%- USE T8 %]
[%- USE HTML %]
[%- USE L %]
+[%- USE P %]
[%- USE LxERP %][%- USE P -%]
[%- BLOCK cvar_inputs %]
[%- SET render_cvar_tag_options = {};
[%- USE LxERP %][%- USE P -%]
[%- BLOCK cvar_inputs %]
[%- SET render_cvar_tag_options = {};
@@
-10,9
+11,10
@@
SET render_cvar_tag_options.no_id = 1;
END;
%]
SET render_cvar_tag_options.no_id = 1;
END;
%]
-[%- IF (cvar.hide_non_editable && !cvar.var.flag_editable) || cvar.partsgroup_filtered %]
-[%- L.hidden_tag(cvar_tag_name, cvar.var.value, render_cvar_tag_options) %]
-[%- ELSIF !cvar.valid %]
+
+[%- IF (!cvar.hide_non_editable || cvar.var.flag_editable) && !cvar.partsgroup_filtered %]
+
+[%- IF !cvar.valid %]
[%- IF show_disabled_message %]
<i>[% 'Element disabled' | $T8 %]</i>
[%- END %]
[%- IF show_disabled_message %]
<i>[% 'Element disabled' | $T8 %]</i>
[%- END %]
@@
-25,6
+27,10
@@
[% render_cvar_tag_options.import(cols=cvar.var.width, rows=cvar.var.height);
L.textarea_tag(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
[% render_cvar_tag_options.import(cols=cvar.var.width, rows=cvar.var.height);
L.textarea_tag(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
+[%- ELSIF cvar.var.type == 'htmlfield' %]
+[% render_cvar_tag_options.import(cols=cvar.var.width, rows=cvar.var.height, class="texteditor");
+ L.textarea_tag(cvar_tag_name, L.restricted_html(cvar.value), render_cvar_tag_options) %]
+
[%- ELSIF cvar.var.type == 'date' %]
[%- L.date_tag(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
[%- ELSIF cvar.var.type == 'date' %]
[%- L.date_tag(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
@@
-55,14
+61,14
@@
[%- ELSIF cvar.var.type == 'customer' %]
[%- render_cvar_tag_options.type = 'customer' %]
[%- ELSIF cvar.var.type == 'customer' %]
[%- render_cvar_tag_options.type = 'customer' %]
-[%-
L.customer_vendor_
picker(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
+[%-
P.customer_vendor.
picker(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
[%- ELSIF cvar.var.type == 'vendor' %]
[%- render_cvar_tag_options.type = 'vendor' %]
[%- ELSIF cvar.var.type == 'vendor' %]
[%- render_cvar_tag_options.type = 'vendor' %]
-[%-
L.customer_vendor_
picker(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
+[%-
P.customer_vendor.
picker(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
[%- ELSIF cvar.var.type == 'part' %]
[%- ELSIF cvar.var.type == 'part' %]
-[%
L.part_selecto
r(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
+[%
P.part.picke
r(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
[%- ELSIF cvar.var.type == 'number' %]
[%- L.input_tag(cvar_tag_name, LxERP.format_amount(cvar.value, -2), render_cvar_tag_options) %]
[%- ELSIF cvar.var.type == 'number' %]
[%- L.input_tag(cvar_tag_name, LxERP.format_amount(cvar.value, -2), render_cvar_tag_options) %]
@@
-71,4
+77,7
@@
[% render_cvar_tag_options.maxlength=cvar.var.maxlength IF cvar.var.maxlength;
L.input_tag(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
[%- END %]
[% render_cvar_tag_options.maxlength=cvar.var.maxlength IF cvar.var.maxlength;
L.input_tag(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
[%- END %]
+
+[%- END %]
+
[%- END %]
[%- END %]