Little API changes on ActionerAspect.img_link alternative

Cédric RICARD
1 parent 69e1e2bb
Showing 1 changed file with 6 additions and 44 deletions Show diff stats
calexium_lib/web/CXM_making_a_web_site.anubis
@@ -916,8 +916,8 @@ public type Actioner_Target:
    other(String window_name, List(Other_Window_Option)). 
  
 public type Actioner_Aspect:
-   link                (List(Text_Option), String url, Maybe(String) name),// hypertext link
-   img_link            (String url, String img_url),
+   link                (List(Text_Option), String text, Maybe(String) name),// hypertext link
+   img_link            (String img_url, String alt_text),
    push_button         (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
@@ -3180,10 +3180,10 @@ define Printable_tree
                           text,
                           "</a>"
                         ], 
-       img_link(_, img)       then
+       img_link(img,alt_text)       then
                         [
                           "<a href=\"", url ,"\"><img src=\"", img,
-                          "\" border=\"0\"></a>"
+                          "\" alt=\"" + alt_text + "\" border=\"0\"></a>"
                         ],
        push_button(options, text) then 
             ["<a href=\"",url,"\"", format_attrs(options), ">",
@@ -3232,10 +3232,10 @@ define Printable_tree
                           text,
                           "</a>"
                         ], 
-       img_link(url1, img)       then
+       img_link(img, alt_text)       then
                         [
                           "<a href=\"", url ,"\"><img src=\"", img,
-                          "\" border=\"0\"></a>"
+                          "\" alt=\"" + alt_text + "\" border=\"0\"></a>"
                         ],
        push_button(options, text) then 
          [
@@ -3314,45 +3314,7 @@ define Printable_tree
      }. 
  
  
-define Printable_tree
-   format_local_popup_button
-     (
-       CommonInfo      cinfo, 
-       Actioner_Aspect aspect, 
-       Int32           n,
-     ) =
-   if cinfo is info(common_name,http_port,https_port,site_dir,secret) then 
-   [ "<script type=\"text/javascript\" language=\"JavaScript\">",
-     "  var lpust_",n," = new Array(); ", 
-     "  lpust_",n,"[0] = 0; ",
-     "</script>\n",
-     "<a href=\"javascript:show_local_popup('lpu_",n,"','lpust_",n,"');\">",
-     if aspect is 
-       {
-         link(opt,text,name)     then [text], 
-         img_link(url, img_url)   then [url],
-         push_button(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,"'\">",             
-           ],
-         submit(opt, text)       then [text],  
-         immediate_selector(options,name,size,choices) then alert,
-         immediate_selector(options,name,size,choices,selected) then alert,
  
-       },
-     "</a>"]. 
-   
-