David RENÉ · David RENÉ · David RENÉ · David RENÉ
Showing 2 changed files Show diff stats
web/frameworks/adminlte4/sidebar.anubis
web/making_a_web_site.anubis
@@ -45,7 +45,7 @@ define List(HTML)
                    event(onclick, load_content(_target_id, _action, _extra, _replace, _overlay))],text(_T(_text)))),
           title(_title_id, subtitle, _classes, _text)  then
-            p([class(if subtitle then "menu_subtitle" else "menu_title"), class((if _title_id=selected then " active" else "")+ " "+join(" ", _classes))], text([],_T(_text)))
+            li([class(if subtitle then "menu_subtitle" else "nav-header"), class((if _title_id=selected then " active" else "")+ " "+join(" ", _classes))], text([],_T(_text)))
 //            p([class("menu_title"), class("item "+_title_id+"_icon"+if _title_id=selected then " selected" else ""+ " "+join(" ", _classes))], text([],_T(_text)))
         },
       make_sidebar(_T, t, selected, [ entry . so_far])
@@ -1195,6 +1195,7 @@ public define CoreAttrs action(WEB_Action_Name action, List((String,String)) ext
 public define CoreAttrs formmethod(String value)      = attr("formmethod", value).
 public define CoreAttrs form(String value)            = attr("form", value).
 public define CoreAttrs for(String value)             = attr("for", value).
+public define CoreAttrs role(String value)            = attr("role", value).
 /**********/
 public define HTML format_label(HTML_Label  _label, HTML_Id     _id).
@@ -1409,17 +1410,23 @@ public define HTML h1(List(CoreAttrs) attrs, HTML content)        = html_tag(&quot;h1
 public define HTML h1(CoreAttrs attr, HTML content)               = html_tag("h1", [attr], [content]).
 public define HTML h1(List(HTML) content)                         = html_tag("h1",     content).
 public define HTML h1(HTML content)                               = html_tag("h1",     [content]).
+
   // <h2>
 public define HTML h2(List(CoreAttrs) attrs, List(HTML) content)  = html_tag("h2", attrs, content).
+public define HTML h2(CoreAttrs attr, List(HTML) content)         = html_tag("h2", [attr], content).
 public define HTML h2(List(CoreAttrs) attrs, HTML content)        = html_tag("h2", attrs, [content]).
+public define HTML h2(CoreAttrs attr, HTML content)               = html_tag("h2", [attr], [content]).
 public define HTML h2(List(HTML) content)                         = html_tag("h2",     content).
 public define HTML h2(HTML content)                               = html_tag("h2",     [content]).
+
   // <h3>
 public define HTML h3(List(CoreAttrs) attrs, List(HTML) content)  = html_tag("h3", attrs, content).
+public define HTML h3(CoreAttrs attr, List(HTML) content)         = html_tag("h3", [attr], content).
 public define HTML h3(List(CoreAttrs) attrs, HTML content)        = html_tag("h3", attrs, [content]).
-public define HTML h3(List(HTML) content)                         = html_tag("h3",     content).
-public define HTML h3(HTML content)                               = html_tag("h3",     [content]).
-public define HTML h3(String content)                                      = html_tag("h3",     [text(content)]).
+public define HTML h3(CoreAttrs attr, HTML content)               = html_tag("h3", [attr], [content]).
+public define HTML h3(List(HTML) content)                         = html_tag("h3", [],     content).
+public define HTML h3(HTML content)                               = html_tag("h3", [],    [content]).
+public define HTML h3(String content)                              = html_tag("h3",     [text(content)]).
   // <h4>
 public define HTML h4(List(CoreAttrs) attrs, List(HTML) content)  = html_tag("h4", attrs, content).
@@ -1446,14 +1453,15 @@ public define HTML hr(CoreAttrs attr)                                      = htm
   // <i>
 public define HTML i(List(CoreAttrs) attrs, List(HTML) content)   = html_tag("i", attrs,   content).
 public define HTML i(List(CoreAttrs) attrs, HTML content)         = html_tag("i", attrs,   [content]).
-public define HTML i(List(CoreAttrs) attrs)                                = html_tag("i", attrs).
+public define HTML i(List(CoreAttrs) attrs)                       = html_tag("i", attrs, []).
+public define HTML i(CoreAttrs attr)                              = html_tag("i", [attr], []).
 public define HTML i(CoreAttrs attr, List(HTML) content)          = html_tag("i", [attr],  content).
 public define HTML i(CoreAttrs attr, HTML content)                = html_tag("i", [attr],  [content]).
-public define HTML i(List(HTML) content)                          = html_tag("i",       content).
-public define HTML i(HTML content)                                = html_tag("i",       [content]).
-public define HTML i(String string)                                        = html_tag("i",       [text(string)]).
-public define HTML i(CoreAttrs attr, String string)                        = html_tag("i", [attr],  [text(string)]).
-public define HTML i(List(CoreAttrs) attrs, String string)                 = html_tag("i", attrs,   [text(string)]).
+public define HTML i(List(HTML) content)                          = html_tag("i", [],      content).
+public define HTML i(HTML content)                                = html_tag("i", [],      [content]).
+public define HTML i(String string)                               = html_tag("i", [],      [text(string)]).
+public define HTML i(CoreAttrs attr, String string)               = html_tag("i", [attr],  [text(string)]).
+public define HTML i(List(CoreAttrs) attrs, String string)        = html_tag("i", attrs,   [text(string)]).
   // <iframe>
 public define HTML iframe(CoreAttrs _attr, String src, Int width, Int height) =
@@ -4608,11 +4616,11 @@ define Printable_tree
   }
 .
-define Printable_tree // c'est le nôtre et c'est meilleur
-   format
-     (
-       HTML_Meta         m,
-     ) =
+ define Printable_tree // c'est le nôtre et c'est meilleur
+  format
+  (
+    HTML_Meta         m,
+  ) =
    if m is 
      {
        keywords(l)        then ["<meta name=\"keywords\" content=\"",format_keywords(l),"\" />\n"],
@@ -4662,6 +4670,8 @@ define Printable_tree
 define Printable_tree
   _format_html_head
   (
+    CommonInfo                  cinfo,
+    Bool                        is_https,
     List(HTML_Head_Tag)         lwf,
     Printable_tree              so_far,
     Dictionary(String, Word32)  js_dict
@@ -4675,35 +4685,35 @@ define Printable_tree
         if h is
         {
           meta(meta)        then
-            [format(meta) . _format_html_head(t, so_far, js_dict)],
+            [format(cinfo, meta, is_https) . _format_html_head(cinfo, is_https, t, so_far, js_dict)],
           title(title)      then
-            ["<title>"+title+"</title>\n" . _format_html_head(t, so_far, js_dict)],
+            ["<title>"+title+"</title>\n" . _format_html_head(cinfo, is_https, t, so_far, js_dict)],
           js(jsf)           then
             since jsf is js_file(filename, _),
             if js_dict.get(filename) is
             {
               failure then
                 forget(js_dict.insert(filename, 0));
-                [add_js_files([jsf]) . _format_html_head(t, so_far, js_dict)],
+                [add_js_files([jsf]) . _format_html_head(cinfo, is_https, t, so_far, js_dict)],
               success(_) then
-                _format_html_head(t, so_far, js_dict),
+                _format_html_head(cinfo, is_https, t, so_far, js_dict),
             }
           js_inline(jsi)    then
             if jsi is
             {
                 script(type, _) then
-                  ["<script type=\"" + type + "\">"+content(jsi)+"</script>\n" . _format_html_head(t, so_far, js_dict)],
+                  ["<script type=\"" + type + "\">"+content(jsi)+"</script>\n" . _format_html_head(cinfo, is_https, t, so_far, js_dict)],
             }
           css(cssf)         then
             since cssf is css_file(file_name, media),          
-            ["<link rel=\"stylesheet\" type=\"text/css\" href=\""+file_name+"\" media=\""+to_String(media)+"\" />\n" . _format_html_head(t, so_far, js_dict)],
+            ["<link rel=\"stylesheet\" type=\"text/css\" href=\""+file_name+"\" media=\""+to_String(media)+"\" />\n" . _format_html_head(cinfo, is_https, t, so_far, js_dict)],
           css_inline(cssi)  then
-            ["<style>"+cssi+"</style>\n" . _format_html_head(t, so_far, js_dict)]
+            ["<style>"+cssi+"</style>\n" . _format_html_head(cinfo, is_https, t, so_far, js_dict)]
           link(link_attrs)  then
-            ["<link " + to_String(link_attrs) + " />\n" . _format_html_head(t, so_far, js_dict)]
+            ["<link " + to_String(link_attrs) + " />\n" . _format_html_head(cinfo, is_https, t, so_far, js_dict)]
         }
     }
 .
@@ -4711,19 +4721,23 @@ define Printable_tree
 public define Printable_tree
   format_html_head
   (
+    CommonInfo          cinfo,
+    Bool                is_https,
     List(HTML_Head_Tag) lwf,
     String              charset
   )
   =
-  _format_html_head((List(HTML_Head_Tag))[ meta(http_equiv("content-type", "text/html; charset="+charset)) . lwf], [], make_dictionary((Word32)0, dictionaryComparerString)).
+  _format_html_head(cinfo, is_https, (List(HTML_Head_Tag))[ meta(http_equiv("content-type", "text/html; charset="+charset)) . lwf], [], make_dictionary((Word32)0, dictionaryComparerString)).
 public define Printable_tree
   format_html_head
   (
+    CommonInfo          cinfo,
+    Bool                is_https,
     List(HTML_Head_Tag) lwf
   )
   =
-  _format_html_head(lwf, [], make_dictionary((Word32)0, dictionaryComparerString)).
+  _format_html_head(cinfo, is_https, lwf, [], make_dictionary((Word32)0, dictionaryComparerString)).
 public type HTML_ajax_content:
@@ -4846,7 +4860,7 @@ public define AWP_Handler_Answer //Printable_tree
             [doctype_w3c_header,
              // html_header,
-              "<head>\n", format_html_head(head_tags + *p_content_head_tags, charset),"</head>\n",
+              "<head>\n", format_html_head(cinfo, is_https, head_tags + *p_content_head_tags, charset),"</head>\n",
             ],
           printable_tree([ 
             "HTTP/1.1 " + status_string, crlf,
@@ -4865,7 +4879,7 @@ public define AWP_Handler_Answer //Printable_tree
           with
             answer_body_body = (Printable_tree)
             [  "<body ", format_attrs(options), ">",                       // format body options
-              format(cinfo,ic_v,element,is_https, var(0), p_content_head_tags), 
+              format(cinfo, ic_v, element, is_https, var(0), p_content_head_tags), 
               "</body>\n",
               "</html>"
             ],
@@ -4878,20 +4892,8 @@ public define AWP_Handler_Answer //Printable_tree
               add_js_files(js_files),
               add_script(script),
               "<link rel=\"shortcut icon\" href=\"favicon.ico\" />\n", 
-              "<script type = \"text/javascript\" language=\"JavaScript\">",
-              "  function show_local_popup(divname,stvname) {",
-              "  if (document.layers) { var d = eval(document.divname); } else\n",
-              "  if (document.getElementById) { var d = eval(\"document.getElementById(divname)\"); } else\n",
-              "  if (document.all) { var d = eval(document.all.divname.style)};\n",
-              // " alert(typeof(eval(stvname))); ", 
-              " var s = eval(stvname); ", 
-              "  if (s[0]==0) ",
-              "   { s[0]=1; d.style.visibility = 'visible'; d.zIndex = 100; } else\n",
-              "   { s[0]=0; d.style.visibility = 'hidden'; }; }", 
-              "</script>\n",
               "<title>",title,"</title>\n",              // put title
-              //format(cinfo,metas,is_https,charset),      // format the metas
-              format_html_head(head_tags + *p_content_head_tags, charset),
+              format_html_head(cinfo, is_https, head_tags + *p_content_head_tags, charset),
               "</head>\n"
            ],
         printable_tree([