Minor improvements on selectors

Cédric RICARD
1 parent 3f69ca7e
Showing 1 changed file with 25 additions and 21 deletions Show diff stats
calexium_lib/web/CXM_making_a_web_site.anubis
@@ -916,7 +916,7 @@ public type Actioner_Aspect:
    button              (String url_off, String url_on),                    // rollover button
    button              (String url_off, String url_on, Int32 w, Int32 h),  // idem with size
    immediate_selector  (WebArgName name, Int32 size, List((WebArgValue,String)) choices),
-   immediate_selector  (WebArgName name, Int32 size, List((WebArgValue,String)) choices, String selected).
+   immediate_selector  (WebArgName name, Int32 size, List((WebArgValue,String)) choices, InitialValue selected).
@@ -991,13 +991,13 @@ public type HTML_In_Form:
    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 label, HtmlId id, WebArgName name, Int32 width), 
-   selector              (WebArgName name, Int32 size, List(String) choices), 
-   selector              (WebArgName name, Int32 size, List(String) choices, String selected), 
+   selector              (List(InputAttrs), String label_text, HtmlId id, WebArgName name, Int32 size, List(String) choices), 
+   selector              (List(InputAttrs), String label_text, HtmlId id, WebArgName name, Int32 size, List(String) choices, InitialValue selected), 
    // List((String,String)) = List((code,name)) where : 
    //    code is the web-arg value
    //    name appears in selector
-   selector_c            (WebArgName name, Int32 size, List((WebArgValue,String)) choices), 
-   selector_c            (WebArgName name, Int32 size, List((WebArgValue,String)) choices, String selected),
+   selector_c            (List(InputAttrs), String label_text, HtmlId id, WebArgName name, Int32 size, List((WebArgValue,String)) choices), 
+   selector_c            (List(InputAttrs), String label_text, HtmlId id, WebArgName name, Int32 size, List((WebArgValue,String)) choices, InitialValue selected),
    radio_button          (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked), 
    radio_button_r        (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked), 
    check_box             (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked),
@@ -2664,12 +2664,12 @@ public define Printable_tree
   format_choices
     (
       List(String) l,
-      String selected
+      InitialValue selected
     ) =
   if l is 
     {
       [ ] then [ ], 
-      [h . t] then if h = selected 
+      [h . t] then if h = selected.value
         then ["<option selected>",h . format_choices(t)]
         else ["<option>",h . format_choices(t,selected)]
     }.
@@ -2692,14 +2692,14 @@ public define Printable_tree
   format_choices
     (
       List((WebArgValue,String)) l,
-      String                selected
+      InitialValue               selected
     ) =
   if l is 
     {
       [ ] then [ ], 
       [h . t] then 
        if h is (val,item) then 
-       if item = selected 
+       if item = selected.value 
          then ["<option value=\""+val.value+"\" selected>",item . format_choices(t)]
          else ["<option value=\""+val.value+"\">",item . format_choices(t,selected)]
     }.
@@ -3743,14 +3743,18 @@ define Printable_tree
        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 
-         ["<select name=o",n," size=",s,">",format_choices(cs,sd),"</select>"],
-       selector_c(n,s,cs)            then 
-         ["<select name=o",n," size=",s,">",format_choices(cs),"</select>"],
-       selector_c(n,s,cs,sd)         then 
-         ["<select name=o",n," size=",s,">",format_choices(cs,sd),"</select>"],
+       selector(opts, label, id, n,s,cs)            then 
+         ["<label for=\"",id,"\">",label,"</label>",
+          "<select name=o",n," size=",s,format_attrs(opts),">",format_choices(cs),"</select>"],
+       selector(opts, label, id, n,s,cs,sd)         then 
+         ["<label for=\"",id,"\">",label,"</label>",
+          "<select name=o",n," size=",s,format_attrs(opts),">",format_choices(cs,sd),"</select>"],
+       selector_c(opts, label, id, n,s,cs)            then 
+         ["<label for=\"",id,"\">",label,"</label>",
+          "<select name=o",n," size=",s,format_attrs(opts),">",format_choices(cs),"</select>"],
+       selector_c(opts, label, id, n,s,cs,sd)         then 
+         ["<label for=\"",id,"\">",label,"</label>",
+          "<select name=o",n," size=",s,format_attrs(opts),">",format_choices(cs,sd),"</select>"],
        radio_button(options, label_text, id, n, v, c)         then  
          [ "<label for=\"",id,"\">",label_text,"</label>",
@@ -3826,10 +3830,10 @@ define Bool
    password_input(o,lt,l,n,i,w) then false,
    text_area(o,n,i,w,h)       then false, 
    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, 
-   selector_c(n,s,c,p)        then false,  
+   selector(o,l,i,n,s,c)			then false, 
+   selector(o,l,i,n,s,c,p)		then false,  
+   selector_c(o,l,i,n,s,c)		then false, 
+   selector_c(o,l,i,n,s,c,p)  then false,  
    radio_button(o,_,_,n,v,c)  then false,
    radio_button_r(o,_,_,n,v,c) then false,
    check_box(o,_,_,n,v,c)     then false,