add narrow_small in predefined Width input size which correspond to 20 characters

add html_tooltip_ext without class suffix when we intend to use awesome font

add narrow_small in predefined Width input size which correspond to 20 characters
add html_tooltip_ext without class suffix when we intend to use awesome font
totoro
1 parent 56c44e4d
Showing 2 changed files with 45 additions and 12 deletions Show diff stats
web/CXM_form.anubis
web/CXM_making_a_web_site.anubis
@@ -22,9 +22,10 @@ public type Mandatory:         // used to mark fields as mandatory.
    non_mandatory.
 public type Width:
-   small,
-   narrow,
-   wide,
+   small,           //10  char
+   narrow_small,    //20  char
+   narrow,          //50  char
+   wide,            //70  char
    custom(Int). 
 public type FormFieldWidth:
@@ -421,10 +422,11 @@ public define HTML_In_Form
        pixels = (Width width) |-> 
                      if width is
                       {
-                        small     then 10,
-                        narrow    then 50, 
-                        wide      then 70,
-                        custom(n) then n
+                        small         then 10,
+                        narrow_small  then 20,
+                        narrow        then 50, 
+                        wide          then 70,
+                        custom(n)     then n
                       },
@@ -434,7 +436,7 @@ public define HTML_In_Form
       empty,
     title(t) then
-      literal("<h2>" + t + "</h2>"),
+      literal("<h3>" + t + "</h3>"),
     message(t) then
       literal(t),
@@ -962,8 +962,6 @@ public type Actioner_Aspect:
    button              (String url_off, String url_on),                    // rollover button
    button              (String url_off, String url_on, Int w, Int h),  // idem with size
    submit              (List(CoreAttrs),String text),
-//   immediate_selector  (List(CoreAttrs),WebArgName name, Int size, List((List(CoreAttrs),WebArgValue,String)) choices),
-//   immediate_selector  (List(CoreAttrs),WebArgName name, Int size, List((List(CoreAttrs),WebArgValue,String)) choices, InitialValue selected),
    immediate_selector  (List(CoreAttrs),WebArgName name, Int size, List((List(CoreAttrs),WebArgValue,String)) choices, Maybe(InitialValue) selected, String onchange_fn),
    html                (HTML_Off_Form).
@@ -1135,6 +1133,12 @@ public type HTML_tooltip:
     String  extend_type,
     String  class_suffix,
     List((String, String)) ext_args
+  ),
+  html_tooltip_ext  //same without class suffix. This means we use awesome font
+  (
+    String  title,
+    String  extend_type,
+    List((String, String)) ext_args
   ).
 public define HTML_tooltip
@@ -1161,7 +1165,15 @@ public type HTML_Help:
   no_help,                  //no help text available
   tooltip(HTML_tooltip,
           HTML_Help_Position).
-          
+
+public define HTML_Help
+  tooltip
+  (
+    HTML_tooltip  h_tooltip
+  )=
+  tooltip(h_tooltip, left)
+.
+
 public type HTML_Label:
   no_label,
   label(
@@ -4280,6 +4292,21 @@ define Printable_tree
   //    *** [5.8] Formating 'in form' elements. 
+//public define Printable_tree
+//  format
+//  (
+//    HTML_tooltip  tooltip
+//  )=
+//  if tooltip is
+//  {
+//    html_tooltip(title, keyword, width)                           then
+//      ["<a id=\"help_",keyword,"\" class=\"jTipu jTip_help\" name=\"",title,"\" href=\"/?a=ajax_show_tooltip&amp;tooltip_id=",keyword,(if width > 0 then ["&width=",width,"\""] else ["\""]), "></a>"],
+//
+//    html_tooltip_ext(title, extend_type, class_suffix, ext_args)  then
+//      with extra_args = format_extra_operands(ext_args),
+//      ["<a id=\"jTip\" class=\"jTipu jTip_",class_suffix,"\" name=\"",title,"\" href=\"/?a=ajax_show_tooltip&amp;tooltip_ext=",extend_type+extra_args,"\"></a>"]
+//  }.
+
 public define Printable_tree
   format
   (
@@ -4288,11 +4315,15 @@ public define Printable_tree
   if tooltip is
   {
     html_tooltip(title, keyword, width)                           then
-      ["<a id=\"help_",keyword,"\" class=\"jTipu jTip_help\" name=\"",title,"\" href=\"/?a=ajax_show_tooltip&amp;tooltip_id=",keyword,(if width > 0 then ["&width=",width,"\""] else ["\""]), "></a>"],
+      ["<a id=\"help_",keyword,"\" class=\"jTipu \" name=\"",title,"\" href=\"/?a=ajax_show_tooltip&amp;tooltip_id=",keyword,(if width > 0 then ["&width=",width,"\""] else ["\""]), "><i class=\"fa fa-info\" aria-hidden=\"true\" style=\"color:#2e6da4\"></i></a>"],
     html_tooltip_ext(title, extend_type, class_suffix, ext_args)  then
       with extra_args = format_extra_operands(ext_args),
       ["<a id=\"jTip\" class=\"jTipu jTip_",class_suffix,"\" name=\"",title,"\" href=\"/?a=ajax_show_tooltip&amp;tooltip_ext=",extend_type+extra_args,"\"></a>"]
+      
+    html_tooltip_ext(title, extend_type, ext_args)  then
+      with extra_args = format_extra_operands(ext_args),
+      ["<a id=\"jTip\" class=\"jTipu \" name=\"",title,"\" href=\"/?a=ajax_show_tooltip&amp;tooltip_ext=",extend_type+extra_args,"\"><i class=\"fa fa-info\" aria-hidden=\"true\" style=\"color:#2e6da4\"></i></a>"]
   }.
 public define HTML_Off_Form