rename head_tags alternative of type HTML to "partial_content". It's more compre…

…hensive about behavior of this altenative

rename head_tags alternative of type HTML to "partial_content". It's more compre…
…hensive about behavior of this altenative
David RENÉ
1 parent 07574089
Showing 16 changed files with 96 additions and 102 deletions Show diff stats
web/dropzone.anubis
web/frameworks/adminlte4/sidebar.anubis
web/jQuery/jq_animate.anubis
web/jQuery/jq_button.anubis
web/jQuery/jq_datatable.anubis
web/jQuery/jq_dialog.anubis
web/jQuery/jq_radio.anubis
web/load_content.anubis
web/making_a_web_site.anubis
web/types/making_a_web_site.anubis
web/widgets/button.anubis
web/widgets/css_helper.anubis
web/widgets/left_menu_html.anubis
web/widgets/menu.anubis
web/widgets/pager.anubis
web_controllers/language/language_management.anubis
@@ -23,7 +23,7 @@ public define HTML
     List((String,String))     extra_ops,
   ) =
   with dropzone_form_id = to_lower(dropzone_form_name+"_"+generate_random_string(15)),
-  head_tags(
+  partial_content(
     [ js(js_file("xlib/js/dropzone.js")), 
       css(css_file("xlib/css/dropzone.css")),
       js_script("
@@ -61,7 +61,7 @@ public define HTML
   {
     no_left_menu                  then empty,
     left_menu(entries, selected)  then
-      head_tags([css(css_file("/css/left_menu.css"))],
+      partial_content([css(css_file("/css/left_menu.css"))],
         make_sidebar(_T, entries, selected, [])
       )
   }
@@ -343,7 +343,7 @@ define List(JsonValue)
         }.
 public define List(HTML_Head_Tag)
-    generate_head_tags
+    generate_partial_content
     (
         JQuerySelector  jq_selector,
         List(JQueryAnimation) anims
@@ -376,7 +376,7 @@ public define List(HTML_Head_Tag)
         JQuerySelector  jq_selector,
         List(JQueryAnimation) anims
     ) =
-        generate_head_tags(jq_selector, anims).
+        generate_partial_content(jq_selector, anims).
 public define HTML
     jquery_animate
@@ -384,7 +384,7 @@ public define HTML
         JQuerySelector  jq_selector,
         List(JQueryAnimation) anims
     ) =
-        partial_content(generate_head_tags(jq_selector, anims), literal("")).
+        partial_content(generate_partial_content(jq_selector, anims), literal("")).
 public define List(HTML_Head_Tag)
     jquery_animate
@@ -392,7 +392,7 @@ public define List(HTML_Head_Tag)
         JQuerySelector  jq_selector,
         JQueryAnimation anim_type
     ) =
-        generate_head_tags(jq_selector, [ anim_type ]).
+        generate_partial_content(jq_selector, [ anim_type ]).
 public define HTML
     jquery_animate
@@ -400,5 +400,5 @@ public define HTML
         JQuerySelector  jq_selector,
         JQueryAnimation anim_type
     ) =
-       partial_content(generate_head_tags(jq_selector, [ anim_type ]), literal("")).
+       partial_content(generate_partial_content(jq_selector, [ anim_type ]), literal("")).
@@ -79,7 +79,7 @@ define HTML
     if buttons is
     {
       [ ]       then
-        head_tags(
+        partial_content(
           reverse(html_tags),
           sequence(reverse(html_buttons))
         ),
@@ -165,7 +165,7 @@ public define HTML
     List(JQuery_button) buttons
   )
   =
-      head_tags(
+      partial_content(
         [ js_inline(jquery_ready("$('#"+buttons_container_id+"').buttonset();")) ],
           div(id(buttons_container_id), _jquery_buttons(buttons, [], []))
 //        sequence([
@@ -188,7 +188,7 @@ public define HTML
            btn_seq = (HTML)sequence([literal("<button class=\"cxm_button\" type=\""+to_String(bt_type)+"\" id=\""+id+"\" name=\""+name+"\">"+label+"</button>")]),
       if jquery_icon_to_string(primary) = "" then
         if jquery_icon_to_string(secondary) = "" then
-          head_tags(
+          partial_content(
             [
               js_inline(jquery_ready("$('#"+id+"').button();")),
               onclick_action
@@ -198,7 +198,7 @@ public define HTML
             //literal("<button type=\""+to_String(bt_type)+"\" id=\""+id+"\" name=\""+name+"\">"+label+"</button>")
           )
         else
-          head_tags(
+          partial_content(
             [
               js_inline(jquery_ready("$('#"+id+"').button({icons:{secondary:'"+jquery_icon_to_string(secondary)+"'}});")),
               onclick_action
@@ -208,7 +208,7 @@ public define HTML
           )
       else
         if jquery_icon_to_string(secondary) = "" then
-          head_tags(
+          partial_content(
             [
               js_inline(jquery_ready("$('#"+id+"').button({icons:{primary:'"+jquery_icon_to_string(primary)+"'}});")),
               onclick_action
@@ -217,7 +217,7 @@ public define HTML
             //literal("<button type=\""+to_String(bt_type)+"\" id=\""+id+"\">"+label+"</button>")
           )
         else
-          head_tags(
+          partial_content(
             [
               js_inline(jquery_ready("$('#"+id+"').button({icons:{primary:'"+jquery_icon_to_string(primary)+"',secondary:'"+jquery_icon_to_string(secondary)+"'}});")),
               onclick_action
@@ -264,7 +264,7 @@ public define HTML
                           generate_random_string(10)
                        else
                           button_id,
-  head_tags(
+  partial_content(
     [
       jquery_button_get_onclick_action(button_id_str, actioner),
       css(css_file("xlib/css/button.css")),
@@ -296,7 +296,7 @@ public define HTML
        button_name  = uid,
        _actioner    = jQuery_actioner(same, jqscript("Xlib.make_confirm_dialog(this, " /*+ to_js_string("/?a=" + url + format_extra_operands(extra_ops))+*/ + to_JS_String(jquery_button_get_onclick_action(actioner)) + ");")),
-  head_tags([
+  partial_content([
       js(js_file("xlib/js/xlib.js")),
       css(css_file("xlib/css/button.css")),
       js_inline(jquery_ready(js_data))
@@ -330,7 +330,7 @@ public define HTML
        _button_name  = uid,
        _actioner     = jQuery_actioner(same, jqscript("Xlib.make_confirm_dialog(this, " + to_JS_String(jquery_button_get_onclick_action(actioner)) +");")),
-  head_tags([
+  partial_content([
       js(js_file("xlib/js/xlib.js")), 
       js_inline(jquery_ready(js_data))
     ],
@@ -66,7 +66,7 @@ public define HTML
     HTML table
   )
   =
-    head_tags(jquery_datatables_1_10_init +
+    partial_content(jquery_datatables_1_10_init +
       [ js_inline(jquery_ready("$('#"+table_id+"').DataTable();")) ],
       table
     )
@@ -81,7 +81,7 @@ public define HTML
   )
   =
     if enable_jqueryui then
-      head_tags( jquery_datatables_1_10_init +
+      partial_content( jquery_datatables_1_10_init +
         [ js_inline(jquery_ready("$('#"+table_id+"').DataTable({\"jQueryUI\":true});")) ],
         table
       )
@@ -108,7 +108,7 @@ public define HTML
     String                            web_dir
   )
   =
-    head_tags( jquery_datatables_1_10_init +
+    partial_content( jquery_datatables_1_10_init +
                       [ 
                         js_inline(jquery_ready("
                         $.fn.dataTable.ext.legacy.ajax = true;
@@ -88,18 +88,18 @@ $( \&quot;#&quot;+dlg_id+&quot;\&quot; ).dialog({
   if content is
   {
     empty           then
-      head_tags([js], div([id(dlg_id)], empty)),
+      partial_content([js], div([id(dlg_id)], empty)),
     p_content(pc)   then
-      if pc is head_tags(tags, html) then
-        head_tags( [js . tags ], div(id(dlg_id), html))  //html code of the dialog
+      if pc is partial_content(tags, html) then
+        partial_content( [js . tags ], div(id(dlg_id), html))  //html code of the dialog
       else
         pc,
     off_form(html)  then
-        head_tags(js, div(id(dlg_id), html)),          //html code of the dialog
+        partial_content(js, div(id(dlg_id), html)),          //html code of the dialog
     ajax(_url)      then
       with url = format_web_action_name(_url),
       //println("jq_dialog_create : \njs_str ->"+js_str+"\nurl ->"+url);
-        head_tags( [js], div([id(dlg_id), attr("ajax_url",url)]))
+        partial_content( [js], div([id(dlg_id), attr("ajax_url",url)]))
   }.
 public define HTML
@@ -92,7 +92,7 @@ public define HTML
     String              on_script,
     Icon_orientation    orientation
   ) =
-    head_tags(
+    partial_content(
       [
         js_inline(jquery_ready(radio_init_script(radio_id, radio_group, initial_state)))
       ],
@@ -131,7 +131,7 @@ public define HTML
     Bool                  replace,
     Bool                  overlay
   )=
-  head_tags([
+  partial_content([
     js(js_file("xlib/js/xlib.js")),
     js_inline(script("text/javascript","$(document).ready(function(){"+load_content(target, web_action, extra_args, replace, overlay)+"});"))
   ])
@@ -2120,13 +2120,13 @@ public define HTML
 //  partial_content([], sequence(content)).
 //  
 public define HTML
-  add_head_tags
+  add_partial_content
   (
     List(HTML_Head_Tag)  tags,
     HTML           p_content
   )=
-  if p_content is head_tags(_head_tags, html) then
-    head_tags(tags + _head_tags, html)
+  if p_content is partial_content(_partial_content, html) then
+    partial_content(tags + _partial_content, html)
   else
     p_content
 .
@@ -2140,10 +2140,10 @@ define HTML
   )=
   if l_content is
   {
-    []      then  head_tags(so_far_tags, reverse(so_far_html)),
+    []      then  partial_content(so_far_tags, reverse(so_far_html)),
     [h . t] then 
       //extract resurgent type and symbols of h
-      if h is head_tags(tags, html) then
+      if h is partial_content(tags, html) then
         list_to_pcontent(t, so_far_tags + tags, html + so_far_html)
       else 
         list_to_pcontent(t, so_far_tags, [h . so_far_html])
@@ -2206,10 +2206,10 @@ public define HTTP_Answer
   html_page
   (
     String               title, 
-    List(HTML_Head_Tag)  head_tags,
+    List(HTML_Head_Tag)  partial_content,
     HTML_Body            body
   )=
-  html_page(http_ok, title, head_tags,[],[],[],body).
+  html_page(http_ok, title, partial_content,[],[],[],body).
 public define HTTP_Answer   
   web_controller_error_page
@@ -2441,7 +2441,7 @@ define Printable_tree
        HTML            element,
        Bool                     is_https,
        Var(Int)                 action_count,
-       Var(List(HTML_Head_Tag)) head_tags
+       Var(List(HTML_Head_Tag)) partial_content
      ).  
 public define String
@@ -3855,7 +3855,7 @@ define Printable_tree
 //       String                         state_name, 
        Var(Int)                       action_count,
        Var(Int)                       ic_v,             // 'idnum' counter variable
-       Var(List(HTML_Head_Tag))       head_tags
+       Var(List(HTML_Head_Tag))       partial_content
    ) =
    //if cinfo is info(common_name,http_port,https_port,site_dir,secret) then 
    with full_url = make_foreign_link_url(target,url), 
@@ -3895,7 +3895,7 @@ define Printable_tree
        html(options, html)  then
          [
           "<a href=\"", full_url,"\"", format_attrs(options), ">",
-             format(cinfo, ic_v, html, is_https, action_count, head_tags),
+             format(cinfo, ic_v, html, is_https, action_count, partial_content),
           "</a>"
          ]
      }. 
@@ -3914,7 +3914,7 @@ define Printable_tree
        Bool                           is_https,
        Var(Int)                       action_count,
        Var(Int)                       ic_v,            // 'idnum' counter variable
-       Var(List(HTML_Head_Tag))       head_tags
+       Var(List(HTML_Head_Tag))       partial_content
      ) =
@@ -4047,7 +4047,7 @@ define Printable_tree
        html(options, html)  then
        [
         "<a href=\"", url,"\"", format_attrs(options), ">",
-           format(cinfo, ic_v, html, is_https, action_count, head_tags),
+           format(cinfo, ic_v, html, is_https, action_count, partial_content),
         "</a>"
        ]
      }. 
@@ -4215,14 +4215,14 @@ define Printable_tree
     $T -> Printable_tree       format_element,  // able to format a datum of type $T
     Bool                       is_https,
     Var(Int)                   action_count,
-    Var(List(HTML_Head_Tag))   head_tags
+    Var(List(HTML_Head_Tag))   partial_content
   ) =
   if cinfo is info(common_name,http_port,https_port,site_directory,secret) then 
   if element is 
   {
     any_foreign_link_new(target, aspect, url)    then
-     format_foreign_link(target, aspect, url, is_https, cinfo, action_count, ic_v, head_tags),
+     format_foreign_link(target, aspect, url, is_https, cinfo, action_count, ic_v, partial_content),
     any_foreign_link(options,url)    then
      ["<a href=\"",url,"\" ", format_attrs(options), "></a>"],  // IE7 doesn't support the form <a href="..." />
@@ -4465,7 +4465,7 @@ define Printable_tree
     List(HTML)      elements,
     Bool                     is_https,
     Var(Int)                 action_count,
-    Var(List(HTML_Head_Tag)) head_tags
+    Var(List(HTML_Head_Tag)) partial_content
   ).
 define Printable_tree
@@ -4476,10 +4476,10 @@ define Printable_tree
     HTML            element,
     Bool                     is_https,
     Var(Int)                 action_count,
-    Var(List(HTML_Head_Tag)) global_head_tags
+    Var(List(HTML_Head_Tag)) global_partial_content
   ) =
    if cinfo is info(common_name,http_port,https_port,site_directory,secret) then 
-   with format_element = (HTML e) |-> format(cinfo, ic_v, e, is_https, action_count, global_head_tags), 
+   with format_element = (HTML e) |-> format(cinfo, ic_v, e, is_https, action_count, global_partial_content), 
   if element is 
   {
     a(opts, _href, _target, l)      then ["<a ", format_attrs(opts), format_href(_href), format_target(_target), ">",flat(map(format_element,l)),"</a>\n"],
@@ -4495,38 +4495,38 @@ define Printable_tree
         },
        actioner(c,t,a,an,eo,ja)     then 
          //format(cinfo,ic_v,
-            format_actioner(cinfo,c,t,a,an,eo,ja,failure,is_https, action_count, ic_v, global_head_tags),
-         //   is_https, action_count, head_tags),
+            format_actioner(cinfo,c,t,a,an,eo,ja,failure,is_https, action_count, ic_v, global_partial_content),
+         //   is_https, action_count, partial_content),
        actioner(c,t,a,an,eo,ja,fn)  then 
          //format(cinfo,ic_v,
-            format_actioner(cinfo,c,t,a,an,eo,ja,success(fn),is_https, action_count, ic_v, global_head_tags),
-         //   format_element,is_https, action_count, head_tags),
+            format_actioner(cinfo,c,t,a,an,eo,ja,success(fn),is_https, action_count, ic_v, global_partial_content),
+         //   format_element,is_https, action_count, partial_content),
        foreign_link_new(target, aspect, url)  then
          //format(cinfo,ic_v,
-         format_foreign_link(target, aspect, url, is_https, cinfo, action_count, ic_v, global_head_tags),
-         //format_element,is_https, action_count, head_tags),
+         format_foreign_link(target, aspect, url, is_https, cinfo, action_count, ic_v, global_partial_content),
+         //format_element,is_https, action_count, partial_content),
 //       foreign_link(options,url,name)       then
-//         format(cinfo,ic_v,any_foreign_link(options,url,name),format_element,is_https, action_count, head_tags), 
+//         format(cinfo,ic_v,any_foreign_link(options,url,name),format_element,is_https, action_count, partial_content), 
        private_download(url, name, extra, action)     then 
          //format(cinfo,ic_v,
          format_private_download(cinfo, url, name, extra, action),
-         //format_element,is_https, action_count, head_tags),
+         //format_element,is_https, action_count, partial_content),
 //       div(options, p_content)      then
 //        with html_elements = map((HTML pc) |-> 
 //                                 since pc is partial_content(tags, html_elem),
-//                                 head_tags <- *head_tags + tags; //accumulate the tags
+//                                 partial_content <- *partial_content + tags; //accumulate the tags
 //                                 html_elem,                      //return the HTML element     
 //                                p_content),
 //            
 //          //format(cinfo, ic_v, 
 //          [format_div_option(options), flat(map((HTML e) |-> format_element(e), html_elements)),"</div>\n"], 
-          //format_element, is_https, action_count, head_tags),
+          //format_element, is_https, action_count, partial_content),
 //       iframe(options, css_styles, css_files, js_files, body) then
 //          println("formating iframe");
 //          if body is body(body_options,elem) then
@@ -4540,17 +4540,17 @@ define Printable_tree
 //            add_js_files(js_files),
 //            "</head>\n",
 //            "<body ", format_attrs(body_options), ">\n",                       // format body options
-//            format(cinfo,ic_v, elem ,is_https, action_count, head_tags), 
+//            format(cinfo,ic_v, elem ,is_https, action_count, partial_content), 
 //            "</body>\n",
 //            "</html>\n",])),
 //            
 //            "\"></iframe>\n",
 //          ],
-       head_tags(_head_tags, html_elements)    then
-          global_head_tags <- *global_head_tags + _head_tags; //accumulate the tags
+       partial_content(_partial_content, html_elements)    then
+          global_partial_content <- *global_partial_content + _partial_content; //accumulate the tags
 //        if p_content is partial_content(tags, html_elements) then
-//          head_tags <- *head_tags + tags;          
-//          format(cinfo, ic_v, html_elements, is_https, action_count, head_tags),
+//          partial_content <- *partial_content + tags;          
+//          format(cinfo, ic_v, html_elements, is_https, action_count, partial_content),
           flat(map(format_element, html_elements))
@@ -4567,11 +4567,11 @@ define Printable_tree
     List(HTML)      elements,
     Bool                     is_https,
     Var(Int)                 action_count,
-    Var(List(HTML_Head_Tag)) head_tags
+    Var(List(HTML_Head_Tag)) partial_content
   ) =
    if cinfo is info(common_name,http_port,https_port,site_directory,secret) then 
    flat(map((HTML element) |->
-    format(cinfo, ic_v, element, is_https, action_count, head_tags),
+    format(cinfo, ic_v, element, is_https, action_count, partial_content),
     elements))
 .   
@@ -4655,7 +4655,7 @@ define Printable_tree
      }.
  define List(HTML_Head_Tag)
-  rebuild_html_head_tags
+  rebuild_html_partial_content
   (
     List(HTML_Head_Tag) lwf,
     List(HTML_Head_Tag) so_far
@@ -4664,7 +4664,7 @@ define Printable_tree
   {
     [] then so_far,
     [h . t] then
-      rebuild_html_head_tags(t, append_once(so_far, h))
+      rebuild_html_partial_content(t, append_once(so_far, h))
   }.
 define Printable_tree
@@ -4677,7 +4677,7 @@ define Printable_tree
     Dictionary(String, Word32)  js_dict
   )
   =
-    //with lwf_ = rebuild_html_head_tags(lwf, []),
+    //with lwf_ = rebuild_html_partial_content(lwf, []),
     if lwf is
     {
       []        then reverse(so_far),
@@ -4774,9 +4774,9 @@ public define HTML_ajax_content
     CommonInfo    cinfo
   )=
   //println("to_html_ajax_content(content_HTML, cinfo)");  
-  with p_content_head_tags = var((List(HTML_Head_Tag))[]),
-  with content = format(cinfo, var((Int)0), content_HTML, false, var(0), p_content_head_tags),
-  if sort_head_tag(*p_content_head_tags, "", [], []) is html_ajax_content(_, script, js_file, css_file) then
+  with p_content_partial_content = var((List(HTML_Head_Tag))[]),
+  with content = format(cinfo, var((Int)0), content_HTML, false, var(0), p_content_partial_content),
+  if sort_head_tag(*p_content_partial_content, "", [], []) is html_ajax_content(_, script, js_file, css_file) then
     html_ajax_content(to_String(content), script, js_file, css_file).
 public define String
@@ -4786,8 +4786,8 @@ public define String
     CommonInfo    cinfo
   )=
   //println("to_html_ajax_content(content_HTML, cinfo)");  
-  with p_content_head_tags = var((List(HTML_Head_Tag))[]),
-  with content = format(cinfo, var((Int)0), content_HTML, false, var(0), p_content_head_tags),
+  with p_content_partial_content = var((List(HTML_Head_Tag))[]),
+  with content = format(cinfo, var((Int)0), content_HTML, false, var(0), p_content_partial_content),
   to_String(content)
 .
@@ -4843,16 +4843,16 @@ public define AWP_Handler_Answer //Printable_tree
   )=
   if cinfo is info(common_name,http_port,https_port,site_directory,secret) then 
     with ic_v = var((Int)0), 
-      p_content_head_tags = var((List(HTML_Head_Tag))[]), //list of heat_tags extracted from partial_content during format of body content
+      p_content_partial_content = var((List(HTML_Head_Tag))[]), //list of heat_tags extracted from partial_content during format of body content
     if page is 
     {
-       html_page(status, head_tags, body) then
+       html_page(status, partial_content, body) then
          if body is body(options,element) then
          if format(status) is (status_string, status_headers) then
           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_partial_content), 
               "</body>\n",
               "</html>"],
@@ -4860,7 +4860,7 @@ public define AWP_Handler_Answer //Printable_tree
             [doctype_w3c_header,
              // html_header,
-              "<head>\n", format_html_head(cinfo, is_https, head_tags + *p_content_head_tags, charset),"</head>\n",
+              "<head>\n", format_html_head(cinfo, is_https, partial_content + *p_content_partial_content, charset),"</head>\n",
             ],
           printable_tree([ 
             "HTTP/1.1 " + status_string, crlf,
@@ -4873,13 +4873,13 @@ public define AWP_Handler_Answer //Printable_tree
              answer_body_body
            ]),
-       html_page(status, title, head_tags, /*css_styles,*/ css_files, js_files, script, body) then 
+       html_page(status, title, partial_content, /*css_styles,*/ css_files, js_files, script, body) then 
          if body is body(options,element) then
          if format(status) is (status_string, status_headers) then
           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_partial_content), 
               "</body>\n",
               "</html>"
             ],
@@ -4893,7 +4893,7 @@ public define AWP_Handler_Answer //Printable_tree
               add_script(script),
               "<link rel=\"shortcut icon\" href=\"favicon.ico\" />\n", 
               "<title>",title,"</title>\n",              // put title
-              format_html_head(cinfo, is_https, head_tags + *p_content_head_tags, charset),
+              format_html_head(cinfo, is_https, partial_content + *p_content_partial_content, charset),
               "</head>\n"
            ],
         printable_tree([
@@ -4979,7 +4979,7 @@ public define AWP_Handler_Answer //Printable_tree
        html_content(HTTP_Status status, HTML content_HTML) then
           if format(status) is (status_string, status_headers) then
-          with content = format(cinfo, ic_v, content_HTML, is_https, var(0), p_content_head_tags),
+          with content = format(cinfo, ic_v, content_HTML, is_https, var(0), p_content_partial_content),
         printable_tree([
            "HTTP/1.1 " + status_string, crlf,
             format_headers(standard_headers),
@@ -4992,17 +4992,17 @@ public define AWP_Handler_Answer //Printable_tree
        //HMTL content with some header   
 //      HTML(HTTP_Status status, HTML p_content) then
 //       
-//        since p_content      is partial_content(head_tags, html_content),
+//        since p_content      is partial_content(partial_content, html_content),
 //        since format(status) is (status_string, status_headers),
 //          with
 //            answer_body = (Printable_tree)
 //            [  
-//              format(cinfo, ic_v, html_content, is_https, var(0), p_content_head_tags), 
+//              format(cinfo, ic_v, html_content, is_https, var(0), p_content_partial_content), 
 //            ],
 //            answer_header = (Printable_tree)
 //            [
 //             // html_header,
-//             format_html_head(head_tags + *p_content_head_tags),
+//             format_html_head(partial_content + *p_content_partial_content),
 //            ],
 //        printable_tree([
 //          "HTTP/1.1 " + status_string, crlf,
@@ -450,16 +450,16 @@ public type HTML:
    //foreign_link         (List(CoreAttrs), String url, String name), 
    private_download     (String abs_path, String name, String extra_ext,
                             Maybe((String,List((String,String)))) action),    
-  head_tags              (List(HTML_Head_Tag) heads, List(HTML) content),
+  partial_content       (List(HTML_Head_Tag) heads, List(HTML) content),
   html_tag              (String tag_name, List(CoreAttrs), List(HTML) content),
   html_void_tag         (String tag_name, List(CoreAttrs))
 .
-public define HTML head_tags(List(HTML_Head_Tag) heads, HTML content) = head_tags(heads, [content]).
-public define HTML head_tags(HTML_Head_Tag head, List(HTML) contents) = head_tags([head], contents).
-public define HTML head_tags(HTML_Head_Tag head, HTML content) = head_tags([head], [content]).
-public define HTML head_tags(List(HTML_Head_Tag) heads) = head_tags(heads, []).
-public define HTML head_tags(HTML_Head_Tag head) = head_tags([head], []).
+public define HTML partial_content(List(HTML_Head_Tag) heads, HTML content) = partial_content(heads, [content]).
+public define HTML partial_content(HTML_Head_Tag head, List(HTML) contents) = partial_content([head], contents).
+public define HTML partial_content(HTML_Head_Tag head, HTML content)        = partial_content([head], [content]).
+public define HTML partial_content(List(HTML_Head_Tag) heads)               = partial_content(heads, []).
+public define HTML partial_content(HTML_Head_Tag head)                      = partial_content([head], []).
 public type Rel_attr:
@@ -572,13 +572,7 @@ public type HTML_Head_Tag:
   link(List(Link_attr) link_attrs)
 .
-//public type HTML:
-//  partial_content
-//  (
-//    List(HTML_Head_Tag),
-//    HTML
-//  )
-//.
+
 public type HTML_Body:  
    body(List(CoreAttrs) attrs, List(HTML) content).
@@ -276,7 +276,7 @@ public define HTML
   )=
   with uid = generate_random_string(20),
-  head_tags([js(js_file("xlib/js/xlib.js")), js_inline(jquery_ready(img_button_confirm_js(uid, dlg_title, dlg_text, dlg_ok, dlg_cancel)))],
+  partial_content([js(js_file("xlib/js/xlib.js")), js_inline(jquery_ready(img_button_confirm_js(uid, dlg_title, dlg_text, dlg_ok, dlg_cancel)))],
               img(img_button_confirm_image_attrs(core_attrs, uid, actioner), img_path)).
 public define HTML
@@ -352,7 +352,7 @@ public define HTML
   with uid = generate_random_string(20),
   //with event_click = (CoreAttrs)event(onclick, "Xlib.jq_query("+format_web_action_name_to_js(web_action, extra_ops)+")"),
-  head_tags([js(js_file("xlib/js/xlib.js")), js_inline(jquery_ready(img_button_confirm_js(uid, dlg_title, dlg_text, dlg_ok, dlg_cancel)))],
+  partial_content([js(js_file("xlib/js/xlib.js")), js_inline(jquery_ready(img_button_confirm_js(uid, dlg_title, dlg_text, dlg_ok, dlg_cancel)))],
     img(img_button_confirm_image_attrs(core_attrs, uid, web_action, extra_ops, load_content_target, call_back), img_path))
 .
@@ -165,7 +165,7 @@ public define HTML
   (
     List(ChangeListItem) items
   )=
-  head_tags([css(css_file("xlib/css/changelists.css"))],
+  partial_content([css(css_file("xlib/css/changelists.css"))],
   div(class("changelist"),
     table([/*class("module"), */ attr("cellspacing","0")], make_changelist_rows(items, [], 1))))
   .
@@ -58,7 +58,7 @@ public define HTML
   {
     no_left_menu                  then empty,
     left_menu(entries, selected)  then
-      head_tags([css(css_file("/css/left_menu.css"))],
+      partial_content([css(css_file("/css/left_menu.css"))],
         make_left_menu(_T, entries, selected, []))
   }.
@@ -223,7 +223,7 @@ public define HTML
   {
     no_menu     then empty,
     menu(items) then
-      head_tags([css(css_file("xlib/css/menu.css"))],
+      partial_content([css(css_file("xlib/css/menu.css"))],
       //partial_content([css(css_file("/css/admin_theme.css"))],
         make_menu(_T, items, _direction))
   }
@@ -20,7 +20,7 @@ public define HTML
     String  next
   )
   =
-  head_tags([js(js_file("xlib/js/pager.js"))],
+  partial_content([js(js_file("xlib/js/pager.js"))],
   div(id(pager_id), [
     text(class("o_pager_current_page"), current_page),
     text("/"),
@@ -191,7 +191,7 @@ public define HTML
                     else
                       language_line(lang_code, self_name(lang_info)),
-    head_tags([
+    partial_content([
       css(css_file("/xlib/css/flags_menu.css")),
       js(js_file("/xlib/js/xlib.js"))
       ], 
@@ -255,7 +255,7 @@ public define HTML
                     else
                       language_line_bs(lang_code, self_name(lang_info)),
-    head_tags([
+    partial_content([
       css(css_file("/xlib/css/flags_menu.css")),
       //js(js_file("/xlib/js/xlib.js"))
       ], 
@@ -317,7 +317,7 @@ public define HTML
                     else
                       language_line(lang_code, self_name(lang_info), action),
-   head_tags([
+   partial_content([
       css(css_file("/xlib/css/flags_menu.css")),
       js(js_file("/xlib/js/xlib.js"))
     ],
@@ -412,7 +412,7 @@ public define HTML
                     else
                       dd_language_line(lang_code, self_name(lang_info), action),
-   head_tags([
+   partial_content([
       css(css_file("/xlib/css/flags_menu.css")),
       js(js_file("/xlib/js/xlib.js"))
     ],