From dbf49dedb72c107c351a5dcc39566e44fce60ac2 Mon Sep 17 00:00:00 2001
From: Cedric RICARD <cedric.ricard@calexium.com>
Date: Fri, 9 Nov 2007 23:36:13 +0000
Subject: [PATCH] Removing javascript on 'link' actioner. Minor other changes.

---
 calexium_lib/web/CXM_making_a_web_site.anubis | 115 +++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------
 1 file changed, 39 insertions(+), 76 deletions(-)

diff --git a/calexium_lib/web/CXM_making_a_web_site.anubis b/calexium_lib/web/CXM_making_a_web_site.anubis
index 2fe639a..e1b1da9 100644
--- a/calexium_lib/web/CXM_making_a_web_site.anubis
+++ b/calexium_lib/web/CXM_making_a_web_site.anubis
@@ -646,7 +646,9 @@ public type Text_Option:
    line_through,
    nowrap,
    class(String),         //CSS class 
-   id(String).
+   id(String),
+//   name(String),
+   tooltip(String).
    
    A list of 'Text_Option' must be given with each text you want to put in your page.
 
@@ -910,11 +912,9 @@ public type Actioner_Target:
    other(String window_name, List(Other_Window_Option)). 
 
 public type Actioner_Aspect:
-   link                (List(Text_Option),String text),                    // hypertext link
+   link                (List(Text_Option),String text, Maybe(String) name),                    // hypertext link
    push_button         (List(CoreAttrs),String text),
    submit              (List(CoreAttrs),String text),
-   button              (String url_off, String url_on),                    // rollover button
-   button              (String url_off, String url_on, Int32 w, Int32 h),  // idem with size
    immediate_selector  (WebArgName name, Int32 size, List((WebArgValue,String)) choices),
    immediate_selector  (WebArgName name, Int32 size, List((WebArgValue,String)) choices, InitialValue selected).
    
@@ -927,9 +927,17 @@ public type Actioner_Local_Action:
 public define Actioner_Aspect
    link
      (
+       List(Text_Option) options,
+       String text
+     ) =
+   link(options, text, failure). 
+
+public define Actioner_Aspect
+   link
+     (
        String text
      ) =
-   link([],text). 
+   link([], text, failure). 
    
    
 public define Actioner_Aspect
@@ -938,22 +946,15 @@ public define Actioner_Aspect
        List(Text_Option) options,
        Int32              i
      ) =
-   link(options,integer_to_string(i)). 
+   link(options,integer_to_string(i), failure). 
    
 public define Actioner_Aspect
    link
      (
        Int32 i
      ) =
-   link([],i).
-   
-public define Actioner_Aspect
-   button
-     (
-       String  url_img
-     ) =
-   button(url_img,url_img).
-   
+   link([], i).
+      
    
    
    Actioners are explained in details below.    
@@ -2837,6 +2838,10 @@ define List(Text_Option)
         get_text_options(t)
       else if h is id(_) then
         get_text_options(t)
+//      else if h is name(_) then
+//        get_text_options(t)
+      else if h is tooltip(_) then
+        get_text_options(t)
       else
       [  h .  get_text_options(t) ]
    
@@ -2861,6 +2866,10 @@ define List(CoreAttrs)
        [ class(name) .  get_css_class(t) ]
       else if h is id(name) then
        [ id(name) .  get_css_class(t) ]
+//      else if h is name(the_name) then
+//       [ name(the_name) .  get_css_class(t) ]
+      else if h is tooltip(name) then
+       [ tooltip(name) .  get_css_class(t) ]
       else
         get_css_class(t)
   }
@@ -3052,13 +3061,11 @@ define Maybe(String)
   ) =
   if aspect is
   {
-    link(_,_)                  then failure,
-    push_button(opts,_)        then extract_id(opts),
-    submit(opts,_)            then extract_id(opts),
-    button(_,_)                then failure,
-    button(_,_,_,_)            then failure,
-    immediate_selector(_,_,_)  then failure,
-    immediate_selector(_,_,_,_)  then failure,
+    link(_,_,_)                 then failure,
+    push_button(opts,_)         then extract_id(opts),
+    submit(opts,_)              then extract_id(opts),
+    immediate_selector(_,_,_)   then failure,
+    immediate_selector(_,_,_,_) then failure,
   }.
   
 define Printable_tree
@@ -3082,18 +3089,13 @@ define Printable_tree
    if aspect is 
      {
    
-       link(opt, text) then [
-                        if action is 
-                          {
-                            url(u)          then 
-                            ["<a href=\"",u,"\"", format_text_options(opt), ">"],
-//                          ["<a href=\"",u,"\" style=\"",format(reverse(opt)),"\">"],
-                            javascript(s,h) then 
-                              [s,"<a href=\"javascript: ",h,"\">"]
-                          },
+       link(opt, text, mb_name) then 
+                        with name_tag = if mb_name is success(n) then " name=\" " + n + "\"" else "",
+                        [
+                          "<a href=\"", url, "\"", format_text_options(opt), name_tag, ">",
                           text,
-                        "</a>"
-                       ], 
+                          "</a>"
+                        ], 
                        
        push_button(options, text) then 
          [
@@ -3122,32 +3124,6 @@ define Printable_tree
            }
          ], 
    
-       button(url_off,url_on) then 
-         [ if action is 
-             {
-               url(u)           then ["<a href=\"",u],
-               javascript(s,h)  then [s,"<a onmousedown=\"",h]
-             },
-             "\" style=\"text-decoration:none\">",
-             "<img alt=\"",url_off,"\" src=\"",url_off,"\" border=\"0\"",
-               " onmouseover=\"this.src='",url_on,"'\" ",
-                " onmouseout=\"this.src='",url_off,"'\">",
-           "</a>"
-         ],
-   
-       button(url_off,url_on,w,h) then 
-         [ if action is 
-             {
-               url(u)           then ["<a href=\"",u],
-               javascript(s,h)  then [s,"<a onmousedown=\"",h]
-             },
-             "\" style=\"text-decoration:none\">",
-             "<img width=\"",w,"\" height=\"",h,"\" alt=\"",url_off,"\" src=\"",url_off,"\" border=\"0\"",
-               " onmouseover=\"this.src='",url_on,"'\" ",
-                " onmouseout=\"this.src='",url_off,"'\">",
-           "</a>"
-         ],
-   
        immediate_selector(name,size,choices) then          
          [ if action is 
              {
@@ -3184,23 +3160,9 @@ define Printable_tree
      "<a href=\"javascript:show_local_popup('lpu_",n,"','lpust_",n,"');\">",
      if aspect is 
        {
-         link(opt,text)          then [text], 
+         link(opt,text,name)     then [text], 
          push_button(opt, text)  then [text],  
          submit(opt, text)       then [text],  
-         button(url_off,url_on)  then 
-           [
-             "<img alt=\"",url_off,"\" src=\"",url_off,"\" border=0",
-               " onMouseOver=\"this.src='",url_on,"'\" ",
-                " onMouseOut=\"this.src='",url_off,"'\">",             
-           ],
-   
-         button(url_off,url_on,w,h)  then 
-           [
-             "<img width=",w," height=",h," alt=\"",url_off,"\" src=\"",url_off,"\" border=0",
-               " onMouseOver=\"this.src='",url_on,"'\" ",
-                " onMouseOut=\"this.src='",url_off,"'\">",             
-           ],
-
          immediate_selector(name,size,choices) then alert,
          immediate_selector(name,size,choices,selected) then alert,
 
@@ -3474,8 +3436,9 @@ define String
            justified        then "text-align:justify",
            line_through     then "text-decoration:line-through",
            nowrap           then "white-space:nowrap",
-           class(class_name)then " class=\"" +class_name +"\"",
-           id(id_name)      then " id=\"" +id_name +"\""
+           class(class_name)then " class=\"" + class_name +"\"",
+           id(id_name)      then " id=\"" + id_name +"\""
+           tooltip(title)   then " title=\"" + title +"\""
          } + if t is [ ] then "" else ("; "+format(t))
      }.
    
--
libgit2 0.21.4