dojo dialog, file added

Steve MARECHAL
1 parent a7adcfe6
Showing 2 changed files with 30 additions and 20 deletions Show diff stats
calexium_lib/web/CXM_dojo.anubis
calexium_lib/web/CXM_making_a_web_site.anubis
@@ -44,35 +44,30 @@ public define HTML_Off_Form
   	  String name,
   	  String dialog_id,
   	  String execute,
+  	  Bool   file
   	)
 	=
 	sequence[
-  	dojo_button(name,"dijit.byId('"+dialog_id+"').show()", "dialog_id"),
+  	dojo_button(name,"dijit.byId('"+dialog_id+"').show()", dialog_id + "_button"),
   	div([attr("dojoType", "dijit.Dialog"), id(dialog_id), title(name), attr("execute", execute)],
   	  table([], 
   	        empty, 
   	        [
-  	          row([], [cell([], literal("<input dojoType=dijit.form.TextBox type=\"text\" name=\"name\" id=\"name_"+dialog_id+"\" />"))]),
+  	          row([], [cell([], literal("<input dojoType=dijit.form.TextBox " + 
+  	                              (if file then 
+  	                                "type=\"file\"" 
+  	                              else
+  	                                "type=\"text\"")
+  	                            + " name=\"name\" id=\"name_"+dialog_id+"\" />")
+  	         
+  	          )]),
   	          row([], [cell([columns(2), h_center], literal("<button dojoType=dijit.form.Button type=\"submit\">OK</button>"))]),
   	        ],
   	        empty)),
   	literal("<br/>"),
-//  	literal("
-//    <div dojoType=\"dijit.Dialog\" id=\""+id+"\" title=\""+name+"\"
-//  		execute=\""+execute+"\">
-//  	<table>
-//  		<tr>
-//  			<td><input dojoType=dijit.form.TextBox type=\"text\" name=\"name\" id=\"name_"+id+"\"></td>
-//  		</tr>
-//  		
-//  		<tr>
-//  			<td colspan=\"2\" align=\"center\">
-//  				<button dojoType=dijit.form.Button type=\"submit\">OK</button></td>
-//  		</tr>
-//  	</table>
-//  </div><br />")
   ]
 .
+
 public type DojoGridEditor:
   inputEditor,
   boolEditor,
@@ -367,6 +362,16 @@ public define HTML_Off_Form
       content).
  
  
+ public define HTML_In_Form
+  dojo_declaration
+  	(
+      String          name,
+      List(CoreAttrs) attributes,
+      HTML_In_Form   content
+    )=
+  div([attr("dojoType", "dijit.Declaration"), attr("widgetClass", name) . attributes ],
+      content).
+
 public define HTML_In_Form
   dojo_editor
   	(
@@ -1053,7 +1053,7 @@ public type HTML_In_Form:
    check_box_r           (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked),
    div                   (List(CoreAttrs), HTML_In_Form content),
    div_empty             (List(CoreAttrs)),
-   hidden                (WebArgName name, InitialValue init).
+   hidden                (HtmlId id, WebArgName name, InitialValue init).
  
  
    'HTML_In_Form'  defines all  the  elements  you may  put  within a  form.  We define  a
@@ -1194,6 +1194,11 @@ public define HTML_In_Form
 public define HTML_In_Form
   file_upload     (WebArgName name, Int width)
   = file_upload([], "", htmlId(""), name, width).
+  
+public define HTML_In_Form
+  hidden  (WebArgName name, InitialValue init)
+  = if name is wan(web_name) then
+  hidden(htmlId(web_name), name, init).
  
 public type HTML_Body:...
  
@@ -3999,8 +4004,8 @@ define Printable_tree
         format(cinfo,sn,ic_v,any_div(options, e),format_element,is_https),    
        div_empty(options)           then
         format(cinfo,sn,ic_v,any_div_empty(options),format_element,is_https),
-       hidden(name, value)          then
-         ["<input type=\"hidden\" name=\"",name,"\" value=\"",value,"\" />"],
+       hidden(id, name, value)          then
+         ["<input type=\"hidden\" id=\"",id,"\" name=\"",name,"\" value=\"",value,"\" />"],
  
      }. 
  
@@ -4081,7 +4086,7 @@ define Bool
    check_box_r(o,_,_,n,v,c)   then false,
    div(o,c)                   then contains_an_upload(c),
    div_empty(o)               then false,
-   hidden(_,_)                then false
+   hidden(_,_,_)              then false
      }. 
  
 define String