From b51441d5a8e1bab85040975222b1e7efce71179c Mon Sep 17 00:00:00 2001
From: Cedric RICARD <cedric.ricard@calexium.com>
Date: Mon, 6 Aug 2007 16:53:54 +0000
Subject: [PATCH] Adding file_upload field into mf_generic_form

---
 calexium_lib/web/CXM_making_a_web_site.anubis | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/calexium_lib/web/CXM_making_a_web_site.anubis b/calexium_lib/web/CXM_making_a_web_site.anubis
index e552b6d..e753b44 100644
--- a/calexium_lib/web/CXM_making_a_web_site.anubis
+++ b/calexium_lib/web/CXM_making_a_web_site.anubis
@@ -988,7 +988,7 @@ public type HTML_In_Form:
    text_input_ro         (List(InputAttrs), String label_text, HtmlId id, WebArgName name, InitialValue init, Int32 width), 
    password_input        (List(InputAttrs), String label_text, HtmlId id, WebArgName name, InitialValue init, Int32 width), 
    text_area             (List(TextAreaOption), String name, String init, Int32 width, Int32 height), 
-   file_upload           (String name, Int32 width), 
+   file_upload           (String label, HtmlId id, WebArgName name, Int32 width), 
    selector              (String name, Int32 size, List(String) choices), 
    selector              (String name, Int32 size, List(String) choices, String selected), 
    // List((String,String)) = List((code,name)) where : 
@@ -1108,6 +1108,9 @@ public define HTML_In_Form
   check_box_r    (List(InputAttrs) options, String label_text, WebArgName n, WebArgValue value, Bool checked)
   = check_box_r  (options, label_text, htmlId(n.name), n, value, checked).
 	
+public define HTML_In_Form
+	file_upload     (WebArgName name, Int32 width)
+	= file_upload("", htmlId(""), name, width).
    
    
 public type HTML_Off_Form:
@@ -3724,8 +3727,9 @@ define Printable_tree
            "<input type=password name=p",name," id=",id," size=",w," value=\"",i,"\"",format_attrs(options),">"],
        text_area(opts,n,i,w,h)          then
          ["<textarea ",format(opts)," name=o",n," cols=",w," rows=",h,">",i,"</textarea>"],
-       file_upload(n,w)            then 
-         ["<input type=file size=",w," name=o",n,">"],
+       file_upload(label, id, n, w)            then 
+         ["<label for=\"",id,"\">",label,"</label>",
+         	"<input type=file id=",id," size=",w," name=o",n,">"],
        selector(n,s,cs)            then 
          ["<select name=o",n," size=",s,">",format_choices(cs),"</select>"],
        selector(n,s,cs,sd)         then 
@@ -3808,7 +3812,7 @@ define Bool
    text_input_ro(o,lt,l,n,i,w) then false,
    password_input(o,lt,l,n,i,w) then false,
    text_area(o,n,i,w,h)       then false, 
-   file_upload(n,w)           then true, 
+   file_upload(l,i,n,w)       then true, 
    selector(n,s,c)            then false, 
    selector(n,s,c,p)          then false,  
    selector_c(n,s,c)          then false, 
--
libgit2 0.21.4