merge conflict resolved

David RENÉ
1 parent 109beea1
Showing 1 changed file with 3 additions and 2 deletions Show diff stats
web/widgets/fisheye_menu.anubis
@@ -10,12 +10,13 @@ transmit tools/basis.anubis
 transmit xlib/web/making_a_web_site.anubis
 read xlib/web/jQuery/jq_animate.anubis
 read xlib/web/jquery.anubis
+read xlib/web/web_action.anubis
  
 public type FisheyeEntry:
   fisheye_entry(
     String  id,             //html id 
     String  icon_path,      //path of the icon to shown with this entry
-    String  action,         //action to do when click on that icon
+    WEB_Action_Name action, //action (url to apply when click on that icon
     String  help_text       //Help text to show
     ).
  
@@ -35,7 +36,7 @@ define List(HTML_Off_Form)
                           [
                             id(h.id),
                             class("menu_item"+if h.id = selected_space then " menu_selected" else ""),
-                            event(onclick,"location.href='?a="+h.action+"';"),
+                            event(onclick,"location.href='"+format_web_action_name(h.action)+"';"),
                             attr("widgetid",h.id),
                             attr("title",_T(h.help_text))
                           ],