dojo editor is now HTML_Off_Form

Steve MARECHAL
1 parent 92613c96
Showing 1 changed file with 21 additions and 41 deletions Show diff stats
calexium_lib/web/CXM_dojo.anubis
@@ -429,24 +429,14 @@ public define HTML_Off_Form
   dojo_button
   	(
   	  HtmlId        html_id,
-  	  Maybe(String) class,
+//  	  Maybe(String) class,
   	  String        name,
-  	  Maybe(String) iconclass,
+  	  String iconclass,
   	  Maybe(String) tip_msg,
   	  String        execute,
   	)=
 	literal("
-  <button dojoType=\"dijit.form.Button\" id=\"" + html_id.id + "\"" +
-  if class is
-  {
-    failure then "",
-    success(class_name) then " class=\"" + class_name + "\""
-  } +
-  if iconclass is
-  {
-    failure then "",
-    success(iconclass_name) then " iconClass=\"" + iconclass_name + "\""
-  } + ">"
+    <button dojoType=\"dijit.form.Button\" id=\"" + html_id.id + "\" iconClass=\"" + iconclass + "\" >" 
   + name
   + "<script type=\"dojo/method\" event=\"onClick\">"
   + execute
@@ -460,38 +450,28 @@ public define HTML_Off_Form
   }).
 public define HTML_In_Form
-  dojo_button 
+   dojo_button
   	(
   	  HtmlId        html_id,
-  	  Maybe(String) class,
+//  	  Maybe(String) class,
   	  String        name,
-  	  Maybe(String) iconclass,
+  	  String iconclass,
   	  Maybe(String) tip_msg,
   	  String        execute,
   	)=
-	  literal("
-    <button dojoType=\"dijit.form.Button\" id=\"" + html_id.id + "\"" +
-    if class is
-    {
-      failure then "",
-      success(class_name) then " class=\"" + class_name + "\""
-    } +
-    if iconclass is
-    {
-      failure then "",
-      success(iconclass_name) then " iconClass=\"" + iconclass_name + "\""
-    } + ">"
-    + name
-    + "<script type=\"dojo/method\" event=\"onClick\">"
-    + execute
-    + "</script>"
-    + "</button>" +
-    if tip_msg is 
-    {
-      failure then "",
-      success(tip) then 
-        "<span dojoType=\"dijit.Tooltip\" connectId=\"" + html_id.id + "\">" + tip + "</span>"
-    }).
+	literal("
+    <button dojoType=\"dijit.form.Button\" id=\"" + html_id.id + "\" iconClass=\"" + iconclass + "\" >" 
+  + name
+  + "<script type=\"dojo/method\" event=\"onClick\">"
+  + execute
+  + "</script>"
+  + "</button>" +
+  if tip_msg is 
+  {
+    failure then "",
+    success(tip) then 
+      "<span dojoType=\"dijit.Tooltip\" connectId=\"" + html_id.id + "\">" + tip + "</span>"
+  }).
 public define HTML_Off_Form
@@ -515,13 +495,13 @@ public define HTML_In_Form
   div([attr("dojoType", "dijit.Declaration"), attr("widgetClass", name) . attributes ],
       content).
-public define HTML_In_Form
+public define HTML_Off_Form
   dojo_editor
   	(
       List(CoreAttrs)  attributes,
       HtmlId           html_id,
       WebArgName       input_name,
-      HTML_In_Form     text,
+      HTML_Off_Form     text,
     )=
     div([id(html_id.id), attr("name", input_name.name), attr("dojoType", "dijit.Editor")
 	  ,attr("extraPlugins", "['|', 'foreColor','hiliteColor',{name:'dojox.editor.plugins.FontChoice', command:'fontName', generic:true},'fontSize','formatBlock','|','createLink','insertImage']")