Anubis / Xlib

Commit 4e513d3a820ed29dae8140add32e4c76e0727fd7

Authored by David RENÉ
2 parents 0c55d6c8 eccfbd57

Merge branch 'release/ANUBIS_1_19' into HEAD 

Resolve Conflicts:	web/making_a_web_site.anubis
Showing 1 changed file with 16 additions and 2 deletions   Show diff stats
Inline Side-by-side
web/making_a_web_site.anubis
  Show/Hide comments   View file @4e513d3
... ... @@ -1308,6 +1308,18 @@ public define CoreAttrs formmethod(FormMethod method) = attr("formmethod", if me
1308 1308  
1309 1309  
1310 1310 'HTML_Off_Form' defines all the elements you may put outside any form.
  1311 +
  1312 +public define CoreAttrs method(String value) = attr("method", value).
  1313 +public define CoreAttrs for(String value) = attr("for", value).
  1314 +public define CoreAttrs placeholder(String value) = attr("placeholder", value).
  1315 +public define CoreAttrs action(WEB_Action_Name action)= attr("action", "/"+format_web_action_name(action)).
  1316 +public define CoreAttrs action(WEB_Action_Name action, List((String,String)) extra_ops)= attr("formaction", "/"+format_web_action_name(action, extra_ops)).
  1317 +public define CoreAttrs formaction(WEB_Action_Name action)= attr("action", "/"+format_web_action_name(action)).
  1318 +public define CoreAttrs formaction(WEB_Action_Name action, List((String,String)) extra_ops)= attr("formaction", "/"+format_web_action_name(action, extra_ops)).
  1319 +public define CoreAttrs formmethod(String value) = attr("formmethod", value).
  1320 +public define CoreAttrs form(String value) = attr("form", value).
  1321 +
  1322 +
1311 1323  
1312 1324 public define CoreAttrs method(String value) = attr("method", value).
1313 1325 public define CoreAttrs for(String value) = attr("for", value).
... ... @@ -1457,9 +1469,11 @@ public define HTML_Off_Form form(CoreAttrs attr, List(HTML_Off_Form) content)
1457 1469 public define HTML_Off_Form form(CoreAttrs attr, HTML_Off_Form content) = html_tag("form", [attr], [content]).
1458 1470 public define HTML_Off_Form form(List(CoreAttrs) attrs) = html_tag("form", attrs, []).
1459 1471 public define HTML_Off_Form form(CoreAttrs attr) = html_tag("form", [attr], []).
  1472 +
1460 1473 public define HTML_Off_Form form(List(HTML_Off_Form) content) = html_tag("form", [], content).
1461 1474 public define HTML_Off_Form form(HTML_Off_Form content) = html_tag("form", [], [content]).
1462 1475  
  1476 +
1463 1477 // <header>
1464 1478 public define HTML_Off_Form header(List(CoreAttrs) attrs, List(HTML_Off_Form) content) = html_tag("header", attrs, content).
1465 1479 public define HTML_Off_Form header(List(CoreAttrs) attrs, HTML_Off_Form content) = html_tag("header", attrs, [content]).
... ... @@ -1618,10 +1632,10 @@ public define HTML_Off_Form pre(List(CoreAttrs) attrs, String string)
1618 1632 // <progress>
1619 1633 public define HTML_Off_Form progress(List(CoreAttrs) attrs, Int value, Int max, List(HTML_Off_Form) content) = html_tag("progress", [attr("value", value), attr("max", max) . attrs], content).
1620 1634 public define HTML_Off_Form progress(List(CoreAttrs) attrs, Int value, Int max, HTML_Off_Form content) = html_tag("progress", [attr("value", value), attr("max", max) . attrs], [content]).
1621   -public define HTML_Off_Form progress(CoreAttrs _attr, Int value, Int max, HTML_Off_Form content) = html_tag("progress", [attr("value", value), attr("max", max) , _attr], [content]).
  1635 +public define HTML_Off_Form progress(CoreAttrs _attr, Int value, Int max, HTML_Off_Form content) = html_tag("progress", [attr("value", value), attr("max", max) , _attr], [content]).
1622 1636 public define HTML_Off_Form progress(Int value, Int max, HTML_Off_Form content) = html_tag("progress", [attr("value", value), attr("max", max)], [content]).
1623 1637 public define HTML_Off_Form progress(List(CoreAttrs) attrs, Int value, Int max, String content) = html_tag("progress", [attr("value", value), attr("max", max) . attrs], [text(content)]).
1624   -public define HTML_Off_Form progress(CoreAttrs _attr, Int value, Int max, String content) = html_tag("progress", [attr("value", value), attr("max", max), _attr], [text(content)]).
  1638 +public define HTML_Off_Form progress(CoreAttrs _attr, Int value, Int max, String content) = html_tag("progress", [attr("value", value), attr("max", max), _attr], [text(content)]).
1625 1639 public define HTML_Off_Form progress(List(CoreAttrs) attrs, Int value, Int max) = html_tag("progress", [attr("value", value), attr("max", max) . attrs], []).
1626 1640 public define HTML_Off_Form progress(CoreAttrs _attr, Int value, Int max) = html_tag("progress", [attr("value", value), attr("max", max), _attr], []).
1627 1641 public define HTML_Off_Form progress(Int value, Int max, String content) = html_tag("progress", [attr("value", value), attr("max", max)], [text(content)]).
... ...