start to remove HTML_Row and cell and replace it by tr and td

David RENÉ
1 parent 272e47b2
Showing 1 changed file with 20 additions and 16 deletions Show diff stats
web/widgets/css_helper.anubis
@@ -182,39 +182,39 @@ public define ChangeListItem
   )=
   change_list_item("", label, value).
-define HTML_Row(HTML_Off_Form)
-  make_row
+define HTML_Off_Form
+  make_tr
   (
     ChangeListItem  item,
     Int             odd,
   )=
   if item is change_list_item(icon, label, value) then
   //with bg = (Cell_Option)   else core_attrs([class()]),
-  row([],
+  tr([],
     if icon = "" then
-        [ cell([core_attrs([class("label")])],text(label)),
-          cell(value)
+        [ td(class("label"),text(label)),
+          td(value)
         ]
     else
-        [ cell([core_attrs([class("icon "+icon)])],text("")),
-          cell([core_attrs([class("label")])],text(label)),
-          cell(value)
+        [ td(class("icon "+icon),text("")),
+          td(class("label"),text(label)),
+          td(value)
         ]
      )
   .
-define List(HTML_Row(HTML_Off_Form))
+define List(HTML_Off_Form)
   make_changelist_rows
   (
-    List(ChangeListItem)          items,
-    List(HTML_Row(HTML_Off_Form)) so_far,
-    Int                           odd
+    List(ChangeListItem)  items,
+    List(HTML_Off_Form)   so_far,
+    Int                   odd
   )=
   if items is
   {
     []      then reverse(so_far),
     [h . t] then 
-      make_changelist_rows(t, [ make_row(h, odd) . so_far], 1 - odd)
+      make_changelist_rows(t, [ make_tr(h, odd) . so_far], 1 - odd)
   }.
 public define HTML_Partial_Content
@@ -223,7 +223,7 @@ public define HTML_Partial_Content
     List(ChangeListItem) items
   )=
   partial_content([css(css_file("xlib/css/changelists.css"))],
-  div([class("changelist")],
+  div(class("changelist"),
     table([/*class("module"), */ attr("cellspacing","0")], make_changelist_rows(items, [], 1))))
   .
@@ -242,9 +242,11 @@ public define HTML_Off_Form
   (
     String title,
     String keyword,
-    Int  width,
+    Int  width
   ) =
-  literal("<a id=\"help_"+keyword+"\" class=\"jTipu jTip_help\" name=\""+title+"\" href=\"/?a=ajax_show_tooltip&amp;tooltip_id="+keyword+"&width="+width+"\"></a>").
+  a([id("help_"+keyword), class("jTipu jTip_help"), attr("name",title)], href(action_name("ajax_show_tooltip"), [("tooltip_id",keyword),("width",to_String(width))])).
+  
+//  literal("<a id=\"help_"+keyword+"\" class=\"jTipu jTip_help\" name=\""+title+"\" href=\"/?a=ajax_show_tooltip&amp;tooltip_id="+keyword+"&width="+width+"\"></a>").
   actioner(same,same, link([id("help_" + keyword), class("jTip jTip_help"), attr("target", "_blank")], " ", success(title)), "ajax_show_tooltip", [("tooltip_id", keyword), ("width", to_decimal(width))], []).
@@ -254,6 +256,8 @@ public define HTML_Off_Form
     String title,
     String keyword,
   ) =
+  a([id("help_"+keyword), class("jTipu jTip_help"), attr("name",title)], href(action_name("ajax_show_tooltip"), [("tooltip_id",keyword)])).
+
   literal("<a id=\"help_"+keyword+"\" class=\"jTipu jTip_help\" name=\""+title+"\" href=\"/?a=ajax_show_tooltip&amp;tooltip_id="+keyword+"\"></a>").
   actioner(same,same, link([id("help_" + keyword), class("jTip jTip_help"), attr("target", "_blank")], " ", success(title)), "ajax_show_tooltip", [("tooltip_id", keyword)], []).