Index: openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl,v diff -u -N -r1.29 -r1.30 --- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl 9 Jun 2015 07:10:32 -0000 1.29 +++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl 13 Jun 2015 20:05:56 -0000 1.30 @@ -262,7 +262,7 @@ lappend urlvars "root_id=$root_id" - set expand_url "[join $urlvars "&"]" + set expand_url [join $urlvars "&"] } else { set expand_url "" } @@ -300,17 +300,39 @@ } -set new_app_form_part_1 [subst {
[export_vars -form {expand:multiple}]}] +set new_app_form_part_1 [subst { + +
+ + + [export_vars -form {expand:multiple}] + +
+}] -set new_app_form_part_2 "[apm_application_new_checkbox]" -set new_app_form_part_3 "
" - multirow append nodes -99999 "" "" "" $new_app_form_part_1 "" "" "" $new_app_form_part_2 "" "" "" "" "" "" "" "" "" "" $new_app_form_part_3 +set new_app_form_part_2
[apm_application_new_checkbox]
+set new_app_form_part_3 { +
+ +} +append new_app_form $new_app_form_part_1 $new_app_form_part_2 $new_app_form_part_3 + +#multirow append nodes -99999 \ + "" "" "" $new_app_form_part_1 \ + "" "" "" $new_app_form_part_2 \ + "" "" "" "" "" "" "" "" "" "" $new_app_form_part_3 + +multirow append nodes -99999 \ + "" "" "" "Mount an additional package at: $new_app_form" + + set services "" db_foreach services_select {} { if {$parameter_count > 0} { - append services "
  • $instance_name" + set href [export_vars -base /shared/parameters { package_id { return_url {[ad_return_url]} } }] + append services "
  • [ns_quotehtml $instance_name]" } } if_no_rows { append services "
  • (none)\n" Index: openacs-4/packages/acs-subsite/www/permissions/one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.adp,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/acs-subsite/www/permissions/one.adp 27 Oct 2014 16:39:59 -0000 1.10 +++ openacs-4/packages/acs-subsite/www/permissions/one.adp 13 Jun 2015 20:05:56 -0000 1.11 @@ -18,20 +18,21 @@
    @export_form_vars;noquote@ - @acl.grantee_name@, @acl.privilege@ #acs-subsite.perm_cannot_be_removed#
    + +
    @acl.grantee_name@, @acl.privilege@ #acs-subsite.perm_cannot_be_removed#
    +

    -

    #acs-subsite.none#

    - +
    @controls;noquote@ Index: openacs-4/packages/acs-subsite/www/permissions/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.tcl,v diff -u -N -r1.14 -r1.15 --- openacs-4/packages/acs-subsite/www/permissions/one.tcl 27 Oct 2014 16:39:59 -0000 1.14 +++ openacs-4/packages/acs-subsite/www/permissions/one.tcl 13 Jun 2015 20:05:56 -0000 1.15 @@ -37,15 +37,16 @@ } set controls [list] +set controlsUrl [export_vars -base grant {application_url object_id}] +lappend controls "[ns_quotehtml [_ acs-subsite.Grant_Permission]]" -lappend controls "[_ acs-subsite.Grant_Permission]" - db_1row context { *SQL* } +set toggleUrl [export_vars -base toggle-inherit {application_url object_id}] if { $security_inherit_p == "t" && $context_id ne "" } { - lappend controls "Don't Inherit Permissions from [ad_quotehtml $context_name]" + lappend controls "Don't Inherit Permissions from [ad_quotehtml $context_name]" } else { - lappend controls "Inherit Permissions from [ad_quotehtml $context_name]" + lappend controls "Inherit Permissions from [ns_quotehtml $context_name]" } set controls "\[ [join $controls " | "] \]"