diff --git a/web/CXM_jquery.anubis b/web/CXM_jquery.anubis index 3ec4e22..caa2d55 100644 --- a/web/CXM_jquery.anubis +++ b/web/CXM_jquery.anubis @@ -92,7 +92,7 @@ public define String if control_action is { no_action then "", - controller_action(ctrl, action) then "document.location='/?aws_controller="+ctrl+"&aws_action="+action+format_extra_operands(extra_ops)+"';", + controller_action(ctrl, action) then "document.location='/?aws_controller="+ctrl+"&aws_action="+action+format_extra_operands(extra_ops)+"';", action_name(action) then "document.location='/?aws_action="+action+"';", url(url) then "document.location='"+url+"';", } @@ -118,7 +118,7 @@ public define String if control_action is { no_action then "", - controller_action(ctrl, action) then "document.location='/?aws_controller="+ctrl+"&aws_action="+action+format_extra_operands(extra_ops)+"';", + controller_action(ctrl, action) then "document.location='/?aws_controller="+ctrl+"&aws_action="+action+format_extra_operands(extra_ops)+"';", action_name(action) then "document.location='/?aws_action="+action+format_extra_operands(extra_ops)+"';", url(url) then "document.location='"+url+"';", } @@ -145,7 +145,7 @@ public define String { no_action then "", controller_action(ctrl, action) then - "window.open('aws_controller="+ctrl+"&aws_action="+action+format_extra_operands(extra_ops)+"', '"+window_name+"', '"+jquery_button_get_onclick_action_window_options(window_options, "")+"');", + "window.open('aws_controller="+ctrl+"&aws_action="+action+format_extra_operands(extra_ops)+"', '"+window_name+"', '"+jquery_button_get_onclick_action_window_options(window_options, "")+"');", //"document.location='/?aws_controller="+ctrl+"&aws_action="+action+"';", action_name(action) then "window.open('"+action+format_extra_operands(extra_ops)+"', '"+window_name+"', '"+jquery_button_get_onclick_action_window_options(window_options, "")+"');", diff --git a/web/CXM_making_a_web_site.anubis b/web/CXM_making_a_web_site.anubis index 449f612..5a149f9 100644 --- a/web/CXM_making_a_web_site.anubis +++ b/web/CXM_making_a_web_site.anubis @@ -4873,7 +4873,7 @@ define Printable_tree { failure then [ ] success(a) then if a is (an,args) then - ["&a=",an,format_extra_operands(args)] + ["&a=",an,format_extra_operands(args)] }, "\">", name, @@ -5599,6 +5599,7 @@ define Printable_tree private_download(url,name,extra,action) then format(cinfo,ic_v,any_private_download(url,name,extra,action),format_element,is_https, action_count, head_tags), text_input(options, label_text, id, name, i, w) then + [ format_label(label_text, id), ""], text_input_ro(options, label_text, id, name,i,w) then diff --git a/web/CXM_web_action.anubis b/web/CXM_web_action.anubis index 5e1216f..755cbef 100644 --- a/web/CXM_web_action.anubis +++ b/web/CXM_web_action.anubis @@ -28,7 +28,10 @@ public define String ( List((String,String)) l_args ) = - join("&", map(((String, String) arg) |-> since arg is (name, value), name+"="+value, l_args)) + if length(l_args) = 0 then + "" + else + "&"+join("&", map(((String, String) arg) |-> since arg is (name, value), name+"="+value, l_args)) . public define String @@ -68,8 +71,5 @@ public define String )= format_web_action_name(action) + - if length(extra_ops) = 0 then - "" - else - "&"+format_extra_operands(extra_ops) + format_extra_operands(extra_ops) . -- libgit2 0.21.4