Commit 89d1649f66641db42e9d3db881aca8877a6cd4e5

Authored by David RENÉ
1 parent 109beea1

merge conflict resolved

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 @@ -10,12 +10,13 @@ transmit tools/basis.anubis
10 transmit xlib/web/making_a_web_site.anubis 10 transmit xlib/web/making_a_web_site.anubis
11 read xlib/web/jQuery/jq_animate.anubis 11 read xlib/web/jQuery/jq_animate.anubis
12 read xlib/web/jquery.anubis 12 read xlib/web/jquery.anubis
  13 +read xlib/web/web_action.anubis
13 14
14 public type FisheyeEntry: 15 public type FisheyeEntry:
15 fisheye_entry( 16 fisheye_entry(
16 String id, //html id 17 String id, //html id
17 String icon_path, //path of the icon to shown with this entry 18 String icon_path, //path of the icon to shown with this entry
18 - String action, //action to do when click on that icon 19 + WEB_Action_Name action, //action (url to apply when click on that icon
19 String help_text //Help text to show 20 String help_text //Help text to show
20 ). 21 ).
21 22
@@ -35,7 +36,7 @@ define List(HTML_Off_Form) @@ -35,7 +36,7 @@ define List(HTML_Off_Form)
35 [ 36 [
36 id(h.id), 37 id(h.id),
37 class("menu_item"+if h.id = selected_space then " menu_selected" else ""), 38 class("menu_item"+if h.id = selected_space then " menu_selected" else ""),
38 - event(onclick,"location.href='?a="+h.action+"';"), 39 + event(onclick,"location.href='"+format_web_action_name(h.action)+"';"),
39 attr("widgetid",h.id), 40 attr("widgetid",h.id),
40 attr("title",_T(h.help_text)) 41 attr("title",_T(h.help_text))
41 ], 42 ],