Rename sys_mask.mask into sys_mask.fname

[misc/kostenrechnung] / lib / mask.php

diff --git a/lib/mask.php b/lib/mask.php
index 65ee93a..03e772d 100644 (file)
--- a/lib/mask.php
+++ b/lib/mask.php
@@ -12,9 +12,15 @@
 
 function build_form($name, $fields)
 {
+  global $jscode;
   $ret = array();
 
-  $ret[] = '<div class="form" style="clear: both;">';
+  $jscode[] = 'Rico.onLoad( function() {';
+  $jscode[] = "form_init();";
+  $jscode[] = '});';
+
+  $ret[] = '<div class="form">';
+  $ret[] = '<p id="form_title">Datensatz bearbeiten</p>';
   $ret[] = '<form id="form_edit">';
 
   $ret[] = '<input type="hidden" id="edit_id" name="id" value="">';
@@ -150,6 +156,11 @@ function build_mask($name, $mask)
   else
     $details = array();
 
+  if (array_key_exists('edit', $mask))
+    $edit = build_form($name, $mask['edit']);
+  else
+    $edit = array();
+
   $title = $mask['title'];
   if (array_key_exists('subtitle', $mask))
     $title .= ' &ndash; ' . $mask['subtitle'];
@@ -161,8 +172,9 @@ function build_mask($name, $mask)
   return array_merge($head,
                     $grid,
                     array('</div>','<div class="left">'),
-                    $status,
                     $details,
+                    $edit,
+                    $status,
                     array('</div>'));
 }
 
@@ -182,9 +194,7 @@ function mask($name)
   if (array_key_exists('table',$mask) && array_key_exists('list',$mask))
     $ret = build_mask($name, $mask);
 
-  if (array_key_exists('edit', $mask))
-    $ret = array_merge($ret, build_form($name, $mask['edit']));
-
+  error_log(count($ret));
   return implode("\n", $ret);
 }