From db8202ccfcea23f811ce59e2d3a518e3100a9100 Mon Sep 17 00:00:00 2001
From: Cedric RICARD <cedric.ricard@calexium.com>
Date: Thu, 12 Jul 2007 05:52:30 +0000
Subject: [PATCH] Adding 'text_input_ro' Removing 'label' tag when empty on check-boxes

---
 calexium_lib/web/CXM_making_a_web_site.anubis | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/calexium_lib/web/CXM_making_a_web_site.anubis b/calexium_lib/web/CXM_making_a_web_site.anubis
index 4b4ff12..9003367 100644
--- a/calexium_lib/web/CXM_making_a_web_site.anubis
+++ b/calexium_lib/web/CXM_making_a_web_site.anubis
@@ -880,6 +880,7 @@ public type HTML_In_Form:
    private_download      (String abs_path, String name, String extra_ext, 
                             Maybe((String,List((String,String)))) action),    
    text_input            (String label_text, String label, String name, String init, Int32 width), 
+   text_input_ro         (String label_text, String label, String name, String init, Int32 width), 
    password_input        (String label_text, String label, String name, Int32 width), 
    text_area             (List(TextAreaOption), String name, String init, Int32 width, Int32 height), 
    file_upload           (String name, Int32 width), 
@@ -3082,7 +3083,8 @@ define List(Cell_Option)
    if member(l,left)      then l else
    if member(l,h_center)  then l else
    if member(l,right)     then l else
-   [left . l]. 
+   //[left . l]. CR: why ? there is no default because we can use CSS
+   l.
    
    
    Formating cells in a row. 
@@ -3501,6 +3503,10 @@ define Printable_tree
          [ "<label for=\"",label,"\">",label_text,"</label>",
            "<input type=text name=o",name," id=",label," size=",w," value=\"",i,"\">"],
          //["&nbsp; <input type=text name=o",n," size=",w," value=\"",i,"\">"], 
+       text_input_ro(label_text, label, name,i,w)           then 
+         [ "<label for=\"",label,"\">",label_text,"</label>",
+           "<input readonly=\"readonly\" type=text name=o",name," id=",label," size=",w," value=\"",i,"\">"],
+         //["&nbsp; <input type=text name=o",n," size=",w," value=\"",i,"\">"], 
        password_input(label_text, label, name,w)         then 
          [ "<label for=\"",label,"\">",label_text,"</label>",
            "<input type=password name=p",name," id=",label," size=",w,">"],
@@ -3522,7 +3528,7 @@ define Printable_tree
          [ "<label for=\"",label,"\">",label_text,"</label>",
            "<input type=radio name=o",n," id=",label," value=\"",v,"\"",(if c then " checked" else ""),">"],
        check_box(label_text, label,n,c)              then 
-         [ "<label for=\"",label,"\">",label_text,"</label>",
+         [ if length(label_text) > 0 then "<label for=\""+label+"\">"+label_text+"</label>" else "",
            "<input type=checkbox name=o",n," id=\"",label,"\""+(if c then " checked " else ""),">"]
        div(options, e)              then
         format(cinfo,sn,ic_v,any_div(options, e),format_element,is_https),    
@@ -3582,6 +3588,7 @@ define Bool
    foreign_link(o,u,n)        then false,
    private_download(p,n,e,a)  then false, 
    text_input(lt,l,n,i,w)     then false,
+   text_input_ro(lt,l,n,i,w)  then false,
    password_input(lt,l,n,w)   then false,
    text_area(o,n,i,w,h)       then false, 
    file_upload(n,w)           then true, 
--
libgit2 0.21.4