From 75265fb59e12b464ee95517cd60e3f561280586b Mon Sep 17 00:00:00 2001
From: totoro <david.rene@rack-matrix.com>
Date: Thu, 4 May 2023 12:07:56 +0900
Subject: [PATCH] add helper (formaction, formmethod, main) for html_tag add button with a String as argument add form without CoreAttrs as argument

---
 web/making_a_web_site.anubis       | 35 ++++++++++++++++++++++++-----------
 web/types/making_a_web_site.anubis | 15 +++++++++++++--
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/web/making_a_web_site.anubis b/web/making_a_web_site.anubis
index 0f5c670..535812a 100644
--- a/web/making_a_web_site.anubis
+++ b/web/making_a_web_site.anubis
@@ -120,14 +120,6 @@ public define String
   _HTML_encode_entities(explode(source), [])
 .
 
-//public define String
-//  encode_HTML_entities
-//  (
-//    String source
-//  )=
-//.
-
-//read CXM_html_tooltip.anubis
 
    * (1) Structure of a web site. 
    
@@ -1302,9 +1294,17 @@ url,
 week
 .
 
+public type FormMethod:
+  get,
+  post
+.
 
 //public type HTML_Body:...
    
+public define CoreAttrs formaction(WEB_Action_Name action, List((String,String)) extra_ops)   = attr("formaction", format_web_action_name(action, extra_ops)).
+public define CoreAttrs formaction(WEB_Action_Name action, (String,String) extra_op)          = attr("formaction", format_web_action_name(action, extra_op)).
+public define CoreAttrs formaction(WEB_Action_Name action)                                    = attr("formaction", format_web_action_name(action)).
+public define CoreAttrs formmethod(FormMethod method) = attr("formmethod", if method is { get then "get", post then "post"}). 
 
    
    'HTML_Off_Form' defines all the elements you may put outside any form. 
@@ -1357,6 +1357,7 @@ public define HTML_Off_Form button(List(CoreAttrs) attrs, HTML_Off_Form content)
 public define HTML_Off_Form button(CoreAttrs attr, List(HTML_Off_Form) content)         = html_tag("button", [attr],  content).
 public define HTML_Off_Form button(CoreAttrs attr, HTML_Off_Form content)               = html_tag("button", [attr],  [content]).
 public define HTML_Off_Form button(List(CoreAttrs) attrs)                               = html_tag("button", attrs,   []).
+public define HTML_Off_Form button(List(CoreAttrs) attrs, String string)                = html_tag("button", attrs,   [text(string)]).
 public define HTML_Off_Form button(List(HTML_Off_Form) content)                         = html_tag("button", [],      content).
 public define HTML_Off_Form button(HTML_Off_Form content)                               = html_tag("button", [],      [content]).
 
@@ -1444,6 +1445,8 @@ public define HTML_Off_Form form(CoreAttrs attr, List(HTML_Off_Form) content)   
 public define HTML_Off_Form form(CoreAttrs attr, HTML_Off_Form content)                 = html_tag("form", [attr], [content]).
 public define HTML_Off_Form form(List(CoreAttrs) attrs)                                 = html_tag("form", attrs, []).
 public define HTML_Off_Form form(CoreAttrs attr)                                        = html_tag("form", [attr], []).
+public define HTML_Off_Form form(List(HTML_Off_Form) content)                           = html_tag("form", [],    content).
+public define HTML_Off_Form form(HTML_Off_Form content)                                 = html_tag("form", [],    [content]).
 
   // <header>
 public define HTML_Off_Form header(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("header", attrs, content).
@@ -1490,9 +1493,9 @@ public define HTML_Off_Form hr(CoreAttrs attr)                                  
 
   // <iframe>
 public define HTML_Off_Form iframe(CoreAttrs _attr, String src, Int width, Int height) =
-  html_tag("iframe", [_attr, attr("src",src), attr("width",to_String(width)+"px"), attr("height",to_String(height)+"px")], []).
+  html_tag("iframe", [_attr, attr("src",src), width_px(width), height_px(height)], []).
 public define HTML_Off_Form iframe(String src, Int width, Int height) =
-  html_tag("iframe", [attr("src",src), attr("width",to_String(width)+"px"), attr("height",to_String(height)+"px")], []).
+  html_tag("iframe", [attr("src",src), width_px(width), height_px(height)], []).
 public define HTML_Off_Form iframe(String src)                                      = html_tag("iframe", [attr("src",src)], []).
 
   // <input>
@@ -1525,10 +1528,12 @@ public define HTML_Off_Form img(CoreAttrs attr, String src)                     
 public define HTML_Off_Form img(String src, Int width, Int height)                  = img([attr("width",to_String(width)+"px"), attr("height",to_String(height)+"px")], src, src).
 public define HTML_Off_Form img(String src, String alt, Int width, Int height) =
   html_void_tag("img", [attr("src",src), attr("alt",alt), attr("width",to_String(width)+"px"), attr("height",to_String(height)+"px")]).
+
 public define HTML_Off_Form img(List(CoreAttrs) attrs, String src, String alt, Int width, Int height) =
   html_void_tag("img", attrs + [attr("src",src), attr("alt",alt), attr("width",to_String(width)+"px"), attr("height",to_String(height)+"px")]).
+
 public define HTML_Off_Form img(CoreAttrs _attr, String src, String alt, Int width, Int height) =
-  html_void_tag("img", [_attr, attr("src",src), attr("alt",alt), attr("width",to_String(width)+"px"), attr("height",to_String(height)+"px")]).
+  html_void_tag("img", [_attr, attr("src",src), attr("alt",alt), width_px(width), height_px(height)]).
 
   // <label>
 public define HTML_Off_Form label(List(CoreAttrs) attrs, List(HTML_Off_Form) content)   = html_tag("label", attrs,  content).
@@ -1549,6 +1554,14 @@ public define HTML_Off_Form li(String string)                                   
 public define HTML_Off_Form li(CoreAttrs attr, String string)                        = html_tag("li", [attr], [text(string)]).
 public define HTML_Off_Form li(List(CoreAttrs) attrs, String string)                 = html_tag("li", attrs,  [text(string)]).
 
+  // <main>
+public define HTML_Off_Form main(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("main", attrs, content).
+public define HTML_Off_Form main(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("main", attrs, [content]).
+public define HTML_Off_Form main(CoreAttrs attr, List(HTML_Off_Form) content)         = html_tag("main", [attr], content).
+public define HTML_Off_Form main(CoreAttrs attr, HTML_Off_Form content)               = html_tag("main", [attr], [content]).
+public define HTML_Off_Form main(List(HTML_Off_Form) content)                         = html_tag("main", [],    content).
+public define HTML_Off_Form main(HTML_Off_Form content)                               = html_tag("main", [],    [content]).
+
   // <nav>
 public define HTML_Off_Form nav(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("nav", attrs, content).
 public define HTML_Off_Form nav(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("nav", attrs, [content]).
diff --git a/web/types/making_a_web_site.anubis b/web/types/making_a_web_site.anubis
index 4540c64..e8d9408 100644
--- a/web/types/making_a_web_site.anubis
+++ b/web/types/making_a_web_site.anubis
@@ -571,8 +571,19 @@ public type CoreAttrs:
   spellcheck(Bool)                      //Specifies whether the element represents an element whose contents are subject to spell checking and grammar checking.
 .
 
-public define CoreAttrs colspan(Int value)= attr("colspan", to_String(value)).
-public define CoreAttrs rowspan(Int value)= attr("rowspan", to_String(value)).
+public define CoreAttrs colspan(Int value)    = attr("colspan", to_String(value)).
+public define CoreAttrs rowspan(Int value)    = attr("rowspan", to_String(value)).
+public define CoreAttrs width(Int value)      = attr("width",   to_String(value)).
+public define CoreAttrs height(Int value)     = attr("height",  to_String(value)).
+public define CoreAttrs width_px(Int value)   = attr("width",   to_String(value)+"px").
+public define CoreAttrs height_px(Int value)  = attr("height",  to_String(value)+"px").
+public define CoreAttrs alt(String value)     = attr("alt",     value).
+
+public define CoreAttrs for(String value)     = attr("for",     value).
+public define CoreAttrs type(String value)    = attr("type",    value).
+public define CoreAttrs placeholder(String value)    = attr("placeholder",    value).
+public define CoreAttrs name(String value)    = attr("name",    value).
+public define CoreAttrs role(String value)    = attr("role",    value).
 
 public define CoreAttrs
   boolean
--
libgit2 0.21.4