X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Frequirement_spec_item%2F_function_block_form.html;h=8b227e0a7790833a265cfa3200ca069a3ff9a8ea;hb=ce560cb72869e4d2adfd7fdcf67d75221946af34;hp=cdf25283ae838ea2fa5a7c480a67fe67d3452332;hpb=bf1c1594a3120dbaaa4cf20cbedf5a2c72d14f58;p=kivitendo-erp.git

diff --git a/templates/webpages/requirement_spec_item/_function_block_form.html b/templates/webpages/requirement_spec_item/_function_block_form.html
index cdf25283a..8b227e0a7 100644
--- a/templates/webpages/requirement_spec_item/_function_block_form.html
+++ b/templates/webpages/requirement_spec_item/_function_block_form.html
@@ -2,9 +2,9 @@
 [% DEFAULT id_base = 'edit_function_block_' _ SELF.item.id %]
 [%- SET a_options = '' %]
 [%- IF SELF.item.id %]
- [%- SET a_options = "to_show: '#" _ SELF.item.get_type _ "-content-top-" _ SELF.item.id _ "'" %]
+ [%- SET a_options = "to_show: '#" _ SELF.item.item_type _ "-content-top-" _ SELF.item.id _ "'" %]
 [%- END %]
-[%- IF SELF.item.get_type == 'sub-function-block' %]
+[%- IF SELF.item.item_type == 'sub-function-block' %]
  [%- SET a_options = a_options ? a_options _ ', ' : a_options %]
  [%- SET a_options = a_options _ "to_hide_if_empty: '#sub-function-block-container-" _ SELF.item.parent_id _ "'" %]
 [%- END %]
@@ -13,17 +13,31 @@
  [% L.hidden_tag('id',                             SELF.item.id, id=id_base _ '_id') %]
  [% L.hidden_tag(id_base _ '.requirement_spec_id', SELF.item.requirement_spec_id) %]
  [% L.hidden_tag(id_base _ '.parent_id',           SELF.item.parent_id) %]
+ [% L.hidden_tag(id_base _ '.item_type',           SELF.item.item_type) %]
  [% IF insert_after %]
   [% L.hidden_tag(id_base _ '.insert_after',       insert_after) %]
  [% END %]
 
  <div>
-  <div style="width: 19%; float: right;">
-   [%- LxERP.t8("Dependencies") %]:<br>
-   [%- L.select_tag(id_base _ '.dependencies[]', DEPENDENCIES, default=SELECTED_DEPENDENCIES, with_optgroups=1, multiple=1, size=8, style="width: 100%") %]
+  <div style="width: 58%; float: left">
+   <div>
+[%- IF SELF.item.id -%]
+    [% LxERP.t8("Description of #1", SELF.item.fb_number) %]
+[%- ELSIF SELF.item.item_type == 'function-block' -%]
+    [%- LxERP.t8("Add function block") %]
+[%- ELSE -%]
+    [%- LxERP.t8("Add sub function block") %]
+[%- END -%]:<br>
+    [% L.textarea_tag(id_base _ '.description_as_restricted_html', SELF.item.description_as_restricted_html, id=id_base _ '_description', rows=8, style="width: 100%", class='texteditor') %]
+   </div>
+
+   <div style="margin-top: 10px">
+    [% L.ajax_submit_tag('controller.pl?action=RequirementSpecItem/ajax_' _ (SELF.item.id ? 'update' : 'create'), '#' _ id_base _ '_form', LxERP.t8('Save'), id=id_base _ '_submit') %]
+    <a href="#" onclick="kivi.requirement_spec.cancel_edit_item_form('[% id_base %]', { [% a_options %] })">[%- LxERP.t8("Cancel") %]</a>
+   </div>
   </div>
 
-  <div style="width: 19%; float: right; margin-right: 5px">
+  <div style="width: 19%; float: left; margin-left: 20px">
    [%- LxERP.t8("Complexity") %]:<br>
    [%- L.select_tag(id_base _ '.complexity_id', SELF.complexities, title_key='description', default=SELF.item.complexity_id, style="width: 100%") %]<br>
 
@@ -36,20 +50,14 @@
 [%- END %]
   </div>
 
-  <div style="width: 59%">
-[%- IF SELF.item.id -%]
-   [% LxERP.t8("Description of #1", SELF.item.fb_number) %]
-[%- ELSIF SELF.item.get_type == 'function-block' -%]
-   [%- LxERP.t8("Add function block") %]
-[%- ELSE -%]
-   [%- LxERP.t8("Add sub function block") %]
-[%- END -%]:<br>
-   [% L.textarea_tag(id_base _ '.description', SELF.item.description, rows=8, style="width: 100%") %]
+  <div style="width: 19%; float: left; margin-left: 10px">
+   [%- LxERP.t8("Dependencies") %]:<br>
+   [%- L.select_tag(id_base _ '.dependencies[]', DEPENDENCIES, default=SELECTED_DEPENDENCIES, with_optgroups=1, multiple=1, size=8, style="width: 100%") %]
   </div>
+
+  <div style="clear: both"></div>
  </div>
 
  <p>
-  [% L.ajax_submit_tag('controller.pl?action=RequirementSpecItem/ajax_' _ (SELF.item.id ? 'update' : 'create'), '#' _ id_base _ '_form', LxERP.t8('Save')) %]
-  <a href="#" onclick="cancel_edit_item_form('[% id_base %]', { [% a_options %] })">[%- LxERP.t8("Cancel") %]</a>
  </p>
 </form>