Renaming 'tooltip' attribute to 'title' to make it more 'HTML compliant'

Fix HTML code generated by CXM_dojo.anubis to be more W3C compliant.

Renaming 'tooltip' attribute to 'title' to make it more 'HTML compliant'
Fix HTML code generated by CXM_dojo.anubis to be more W3C compliant.
Cédric RICARD
1 parent 3d16bf3e
Showing 2 changed files with 55 additions and 27 deletions Show diff stats
calexium_lib/web/CXM_dojo.anubis
calexium_lib/web/CXM_making_a_web_site.anubis
@@ -40,26 +40,35 @@ public define HTML_Off_Form
   dojo_dialog
   	(
   	  String name,
-  	  String id,
+  	  String dialog_id,
   	  String execute,
   	)
 	=
 	sequence[
-	dojo_button(name,"dijit.byId('"+id+"').show()", "dialog_id"),
-	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>")
+  	dojo_button(name,"dijit.byId('"+dialog_id+"').show()", "dialog_id"),
+  	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([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 />")
   ]
 .
@@ -74,7 +83,7 @@ public define HTML_Off_Form
       Bool   can_edit
    )
   =
-  literal("<script>
+  literal("<script type=\"text/javascript\">
    	dojo.addOnLoad(function(){
   	  init_dojo_grid(\""+colum1+"\",\""+colum2+"\", \""+colum3+"\", \""+colum4+"\", "+ (if can_edit then "1" else "0")+");
    	  }
@@ -92,13 +101,13 @@ public define HTML_Off_Form
   	)
 	=
 	sequence([
-  	literal("</br>"),
+  	literal("<br/>"),
     div([class("message_box")],
       sequence([
 			  div([id("node3"), class("box nopad hidden")], name1),
 			  div([id("node4"), class("box two nopad")], name2),
 			])),
-  	literal("</br>"),
+  	literal("<br/>"),
 	]).
@@ -649,7 +649,10 @@ public type Text_Option:
    class(String),         //CSS class 
    id(String),
    style(String),
-   tooltip(String).
+   title(String).
+   
+public define Text_Option
+  tooltip(String s) = title(s).
    A list of 'Text_Option' must be given with each text you want to put in your page.
@@ -723,7 +726,7 @@ public type CoreAttrs:
   id        (String),
   class     (String),
   style     (String),
-  tooltip    (String),
+  title     (String),
   lang      (String), 
   dir       (Reading_Way),
   accesskey  (Word8),
@@ -734,7 +737,7 @@ public type CoreAttrs:
 public type InputAttrs:
   class     (String),
   style     (String),
-  tooltip    (String),
+  title     (String),
   lang      (String), 
   dir       (Reading_Way),
   accesskey  (Word8),
@@ -742,6 +745,11 @@ public type InputAttrs:
   attr      (String, String),
   event      (HtmlEvents, String).
+public define CoreAttrs
+  tooltip(String s) = title(s).
+public define InputAttrs
+  tooltip(String s) = title(s).
+
 public type I18n:
   lang  (String),
   dir   (Reading_Way).
@@ -1474,6 +1482,8 @@ public type HTTP_Answer:
                String content),
    custom_binary(String mime_type,
                  ByteArray content),
+   custom_tree(String mime_type,
+               Printable_tree content),
    http_raw(Printable_tree).
 public define HTTP_Answer
@@ -2926,7 +2936,7 @@ define List(Text_Option)
         get_text_options(t)
       else if h is style(_) then
         get_text_options(t)
-      else if h is tooltip(_) then
+      else if h is title(_) then
         get_text_options(t)
       else
       [  h .  get_text_options(t) ]
@@ -2954,7 +2964,7 @@ define List(CoreAttrs)
        [ id(name) .  get_css_class(t) ]
       else if h is style(the_style) then
        [ style(the_style) .  get_css_class(t) ]
-      else if h is tooltip(name) then
+      else if h is title(name) then
        [ tooltip(name) .  get_css_class(t) ]
       else
         get_css_class(t)
@@ -2994,7 +3004,7 @@ public define String
         style(style_string)  then
           " style=\"" + style_string + "\"",
-        tooltip(title_string) then  
+        title(title_string) then  
            " title=\"" + title_string + "\"",
         lang(lang) then  
@@ -3036,7 +3046,7 @@ define String
         style(style_string)  then
           " style=\"" + style_string + "\"",
-        tooltip(title_string) then  
+        title(title_string) then  
            " title=\"" + title_string + "\"",
         lang(lang) then  
@@ -3602,7 +3612,7 @@ define String
            class(class_name)then " class=\"" + class_name +"\"",
            id(id_name)      then " id=\"" + id_name +"\"",
            style(style_string)  then " style=\"" + style_string + "\"",
-           tooltip(title)   then " title=\"" + title +"\""
+           title(s)         then " title=\"" + s +"\""
          } + if t is [ ] then "" else ("; "+format(t))
      }.
@@ -4297,6 +4307,15 @@ define Printable_tree
             content . (Printable_tree)[]
           ],
+       custom_tree(String mime_type, Printable_tree content) then
+          [ "HTTP/1.1 200 OK", crlf,
+            format_headers(standard_headers),
+            format_headers(standard_headers_for(mime_type, length(content), success(charset))),
+            format_headers(additional_headers),
+            crlf .
+            content
+          ],
+          
        http_raw(Printable_tree content) then content
      }.