Anubis / Xlib

Commit e701df09a9f57ac32a3f1dc2a8f10e9b58367cd9

Authored by David RENÉ
1 parent 74411f8f

[-] remove unused label from HTML_Off_form. This break the type HTML_Off_form, a… 

…ll source use this type must be recompiled
[+] add some helper in html_tag to use String directly instead of "text"
Showing 2 changed files with 24 additions and 11 deletions   Show diff stats
Inline Side-by-side
web/making_a_web_site.anubis
  Show/Hide comments   View file @e701df0
... ... @@ -1473,6 +1473,7 @@ public define HTML_Off_Form h6(HTML_Off_Form content)
1473 1473 // <hr>
1474 1474 public define HTML_Off_Form hr = html_void_tag("hr", []).
1475 1475 public define HTML_Off_Form hr(List(CoreAttrs) attrs) = html_void_tag("hr", attrs).
  1476 +public define HTML_Off_Form hr(CoreAttrs attr) = html_void_tag("hr", [attr]).
1476 1477  
1477 1478 // <iframe>
1478 1479 public define HTML_Off_Form iframe(CoreAttrs _attr, String src, Int width, Int height) =
... ... @@ -1521,6 +1522,9 @@ public define HTML_Off_Form label(List(CoreAttrs) attrs, List(HTML_Off_Form) con
1521 1522 public define HTML_Off_Form label(CoreAttrs attr, List(HTML_Off_Form) content) = html_tag("label", [attr], content).
1522 1523 public define HTML_Off_Form label(List(HTML_Off_Form) content) = html_tag("label", [], content).
1523 1524 public define HTML_Off_Form label(HTML_Off_Form content) = html_tag("label", [], [content]).
  1525 +public define HTML_Off_Form label(String string) = html_tag("label", [], [text(string)]).
  1526 +public define HTML_Off_Form label(CoreAttrs attr, String string) = html_tag("label", [attr], [text(string)]).
  1527 +public define HTML_Off_Form label(List(CoreAttrs) attrs, String string) = html_tag("label", attrs, [text(string)]).
1524 1528  
1525 1529 // <li>
1526 1530 public define HTML_Off_Form li(List(CoreAttrs) attrs, List(HTML_Off_Form) content) = html_tag("li", attrs, content).
... ... @@ -1528,6 +1532,9 @@ public define HTML_Off_Form li(List(CoreAttrs) attrs, HTML_Off_Form content)
1528 1532 public define HTML_Off_Form li(CoreAttrs attr, HTML_Off_Form content) = html_tag("li", [attr], [content]).
1529 1533 public define HTML_Off_Form li(List(HTML_Off_Form) content) = html_tag("li", [], content).
1530 1534 public define HTML_Off_Form li(HTML_Off_Form content) = html_tag("li", [], [content]).
  1535 +public define HTML_Off_Form li(String string) = html_tag("li", [], [text(string)]).
  1536 +public define HTML_Off_Form li(CoreAttrs attr, String string) = html_tag("li", [attr], [text(string)]).
  1537 +public define HTML_Off_Form li(List(CoreAttrs) attrs, String string) = html_tag("li", attrs, [text(string)]).
1531 1538  
1532 1539 // <nav>
1533 1540 public define HTML_Off_Form nav(List(CoreAttrs) attrs, List(HTML_Off_Form) content) = html_tag("nav", attrs, content).
... ... @@ -1622,19 +1629,25 @@ public define HTML_Off_Form tfoot(HTML_Off_Form content)
1622 1629  
1623 1630 // <th>
1624 1631 public define HTML_Off_Form th(List(CoreAttrs) attrs, List(HTML_Off_Form) content) = html_tag("th", attrs, content).
1625   -public define HTML_Off_Form th(List(CoreAttrs) attrs, HTML_Off_Form content) = html_tag("th", attrs, [content]).
1626   -public define HTML_Off_Form th(CoreAttrs attr, List(HTML_Off_Form) content) = html_tag("th", [attr], content).
1627   -public define HTML_Off_Form th(CoreAttrs attr, HTML_Off_Form content) = html_tag("th", [attr], [content]).
1628   -public define HTML_Off_Form th(List(HTML_Off_Form) content) = html_tag("th", [], content).
1629   -public define HTML_Off_Form th(HTML_Off_Form content) = html_tag("th", [], [content]).
  1632 +public define HTML_Off_Form th(List(CoreAttrs) attrs, HTML_Off_Form content) = html_tag("th", attrs, [content]).
  1633 +public define HTML_Off_Form th(CoreAttrs attr, List(HTML_Off_Form) content) = html_tag("th", [attr], content).
  1634 +public define HTML_Off_Form th(CoreAttrs attr, HTML_Off_Form content) = html_tag("th", [attr], [content]).
  1635 +public define HTML_Off_Form th(List(HTML_Off_Form) content) = html_tag("th", [], content).
  1636 +public define HTML_Off_Form th(HTML_Off_Form content) = html_tag("th", [], [content]).
  1637 +public define HTML_Off_Form th(String string) = html_tag("th", [], [text(string)]).
  1638 +public define HTML_Off_Form th(CoreAttrs attr, String string) = html_tag("th", [attr], [text(string)]).
  1639 +public define HTML_Off_Form th(List(CoreAttrs) attrs, String string) = html_tag("th", attrs, [text(string)]).
1630 1640  
1631 1641 // <td>
1632   -public define HTML_Off_Form td(List(CoreAttrs) attrs, List(HTML_Off_Form) content) = html_tag("td", attrs, content).
1633   -public define HTML_Off_Form td(List(CoreAttrs) attrs, HTML_Off_Form content) = html_tag("td", attrs, [content]).
  1642 +public define HTML_Off_Form td(List(CoreAttrs) attrs, List(HTML_Off_Form) content) = html_tag("td", attrs, content).
  1643 +public define HTML_Off_Form td(List(CoreAttrs) attrs, HTML_Off_Form content) = html_tag("td", attrs, [content]).
1634 1644 public define HTML_Off_Form td(CoreAttrs attr, List(HTML_Off_Form) content) = html_tag("td", [attr], content).
1635 1645 public define HTML_Off_Form td(CoreAttrs attr, HTML_Off_Form content) = html_tag("td", [attr], [content]).
1636   -public define HTML_Off_Form td(List(HTML_Off_Form) content) = html_tag("td", [], content).
1637   -public define HTML_Off_Form td(HTML_Off_Form content) = html_tag("td", [], [content]).
  1646 +public define HTML_Off_Form td(List(HTML_Off_Form) content) = html_tag("td", [], content).
  1647 +public define HTML_Off_Form td(HTML_Off_Form content) = html_tag("td", [], [content]).
  1648 +public define HTML_Off_Form td(String string) = html_tag("td", [], [text(string)]).
  1649 +public define HTML_Off_Form td(CoreAttrs attr, String string) = html_tag("td", [attr], [text(string)]).
  1650 +public define HTML_Off_Form td(List(CoreAttrs) attrs, String string) = html_tag("td", attrs, [text(string)]).
1638 1651  
1639 1652 // <tr>
1640 1653 public define HTML_Off_Form tr(List(CoreAttrs) attrs, List(HTML_Off_Form) content) = html_tag("tr", attrs, content).
... ... @@ -5162,7 +5175,7 @@ define Printable_tree
5162 5175 format(cinfo,ic_v,any_foreign_link(options,url,name),format_element,is_https, action_count, head_tags),
5163 5176 private_download(url,name,extra,action) then
5164 5177 format(cinfo,ic_v,any_private_download(url,name,extra,action),format_element,is_https, action_count, head_tags),
5165   - label(n) then ["<a name=\"",n,"\">"],
  5178 +// label(n) then ["<a name=\"",n,"\">"],
5166 5179 form(fn,attributs, l) then
5167 5180 [
5168 5181 "<form id=\"",fn,"\"",
... ...
web/types/making_a_web_site.anubis
  Show/Hide comments   View file @e701df0
... ... @@ -459,7 +459,7 @@ public type HTML_Off_Form:
459 459 foreign_link (List(Text_Option), String url, String name),
460 460 private_download (String abs_path, String name, String extra_ext,
461 461 Maybe((String,List((String,String)))) action),
462   - label (String name),
  462 + //label (String name),
463 463 form (HTML_Id form_id, List(CoreAttrs), List(HTML_In_Form) content),
464 464 form (HTML_Id form_id, List(CoreAttrs),
465 465 WEB_Action_Name action, List((String,String)) extra_ops,
... ...