Commit 1167a13be96bf681df6f7df29fa7dd1a295c3318
1 parent
272e47b2
start to remove HTML_Row and cell and replace it by tr and td
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 |
| 182 | 182 | )= |
| 183 | 183 | change_list_item("", label, value). |
| 184 | 184 | |
| 185 | -define HTML_Row(HTML_Off_Form) | |
| 186 | - make_row | |
| 185 | +define HTML_Off_Form | |
| 186 | + make_tr | |
| 187 | 187 | ( |
| 188 | 188 | ChangeListItem item, |
| 189 | 189 | Int odd, |
| 190 | 190 | )= |
| 191 | 191 | if item is change_list_item(icon, label, value) then |
| 192 | 192 | //with bg = (Cell_Option) else core_attrs([class()]), |
| 193 | - row([], | |
| 193 | + tr([], | |
| 194 | 194 | if icon = "" then |
| 195 | - [ cell([core_attrs([class("label")])],text(label)), | |
| 196 | - cell(value) | |
| 195 | + [ td(class("label"),text(label)), | |
| 196 | + td(value) | |
| 197 | 197 | ] |
| 198 | 198 | else |
| 199 | - [ cell([core_attrs([class("icon "+icon)])],text("")), | |
| 200 | - cell([core_attrs([class("label")])],text(label)), | |
| 201 | - cell(value) | |
| 199 | + [ td(class("icon "+icon),text("")), | |
| 200 | + td(class("label"),text(label)), | |
| 201 | + td(value) | |
| 202 | 202 | ] |
| 203 | 203 | ) |
| 204 | 204 | . |
| 205 | 205 | |
| 206 | -define List(HTML_Row(HTML_Off_Form)) | |
| 206 | +define List(HTML_Off_Form) | |
| 207 | 207 | make_changelist_rows |
| 208 | 208 | ( |
| 209 | - List(ChangeListItem) items, | |
| 210 | - List(HTML_Row(HTML_Off_Form)) so_far, | |
| 211 | - Int odd | |
| 209 | + List(ChangeListItem) items, | |
| 210 | + List(HTML_Off_Form) so_far, | |
| 211 | + Int odd | |
| 212 | 212 | )= |
| 213 | 213 | if items is |
| 214 | 214 | { |
| 215 | 215 | [] then reverse(so_far), |
| 216 | 216 | [h . t] then |
| 217 | - make_changelist_rows(t, [ make_row(h, odd) . so_far], 1 - odd) | |
| 217 | + make_changelist_rows(t, [ make_tr(h, odd) . so_far], 1 - odd) | |
| 218 | 218 | }. |
| 219 | 219 | |
| 220 | 220 | public define HTML_Partial_Content |
| ... | ... | @@ -223,7 +223,7 @@ public define HTML_Partial_Content |
| 223 | 223 | List(ChangeListItem) items |
| 224 | 224 | )= |
| 225 | 225 | partial_content([css(css_file("xlib/css/changelists.css"))], |
| 226 | - div([class("changelist")], | |
| 226 | + div(class("changelist"), | |
| 227 | 227 | table([/*class("module"), */ attr("cellspacing","0")], make_changelist_rows(items, [], 1)))) |
| 228 | 228 | . |
| 229 | 229 | |
| ... | ... | @@ -242,9 +242,11 @@ public define HTML_Off_Form |
| 242 | 242 | ( |
| 243 | 243 | String title, |
| 244 | 244 | String keyword, |
| 245 | - Int width, | |
| 245 | + Int width | |
| 246 | 246 | ) = |
| 247 | - literal("<a id=\"help_"+keyword+"\" class=\"jTipu jTip_help\" name=\""+title+"\" href=\"/?a=ajax_show_tooltip&tooltip_id="+keyword+"&width="+width+"\"></a>"). | |
| 247 | + a([id("help_"+keyword), class("jTipu jTip_help"), attr("name",title)], href(action_name("ajax_show_tooltip"), [("tooltip_id",keyword),("width",to_String(width))])). | |
| 248 | + | |
| 249 | +// literal("<a id=\"help_"+keyword+"\" class=\"jTipu jTip_help\" name=\""+title+"\" href=\"/?a=ajax_show_tooltip&tooltip_id="+keyword+"&width="+width+"\"></a>"). | |
| 248 | 250 | |
| 249 | 251 | 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))], []). |
| 250 | 252 | |
| ... | ... | @@ -254,6 +256,8 @@ public define HTML_Off_Form |
| 254 | 256 | String title, |
| 255 | 257 | String keyword, |
| 256 | 258 | ) = |
| 259 | + a([id("help_"+keyword), class("jTipu jTip_help"), attr("name",title)], href(action_name("ajax_show_tooltip"), [("tooltip_id",keyword)])). | |
| 260 | + | |
| 257 | 261 | literal("<a id=\"help_"+keyword+"\" class=\"jTipu jTip_help\" name=\""+title+"\" href=\"/?a=ajax_show_tooltip&tooltip_id="+keyword+"\"></a>"). |
| 258 | 262 | |
| 259 | 263 | actioner(same,same, link([id("help_" + keyword), class("jTip jTip_help"), attr("target", "_blank")], " ", success(title)), "ajax_show_tooltip", [("tooltip_id", keyword)], []). | ... | ... |