Index: openacs-4/packages/acs-admin/www/auth/authority.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/authority.adp,v diff -u -N -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/acs-admin/www/auth/authority.adp 9 Jun 2016 08:52:50 -0000 1.10.2.1 +++ openacs-4/packages/acs-admin/www/auth/authority.adp 1 Oct 2016 11:04:31 -0000 1.10.2.2 @@ -26,7 +26,7 @@

- » Run new batch job now + » Run new batch job now

Index: openacs-4/packages/acs-admin/www/auth/authority.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/authority.tcl,v diff -u -N -r1.22.2.1 -r1.22.2.2 --- openacs-4/packages/acs-admin/www/auth/authority.tcl 10 Sep 2015 08:21:06 -0000 1.22.2.1 +++ openacs-4/packages/acs-admin/www/auth/authority.tcl 1 Oct 2016 11:04:31 -0000 1.22.2.2 @@ -9,7 +9,7 @@ } set page_title "" -if { ([info exists authority_id] && $authority_id ne "") } { +if { [info exists authority_id] && $authority_id ne "" } { # Initial request in display or edit mode or a submit of the form set authority_exists_p [db_string authority_exists_p { select count(*) @@ -273,7 +273,6 @@ set end_time_pretty [lc_time_fmt $end_time_ansi "%x %X"] set interactive_pretty [ad_decode $interactive_p "t" "Yes" "No"] - set short_message [string_truncate -len 30 -- $message] set actions_per_minute {} @@ -282,8 +281,12 @@ } set run_time [util::interval_pretty -seconds $run_time_seconds] } - if { ([info exists get_doc_impl_id] && $get_doc_impl_id ne "") && ([info exists process_doc_impl_id] && $process_doc_impl_id ne "") } { + if { ([info exists get_doc_impl_id] && $get_doc_impl_id ne "") + && ([info exists process_doc_impl_id] && $process_doc_impl_id ne "") } { set batch_sync_run_url [export_vars -base batch-job-run { authority_id }] + template::add_acs_confirm_handler \ + -id batch-sync-run \ + -message "Are you sure you want to run a batch job to sync the user database now?" } else { # If there's neither a driver, nor any log history to display, hide any mention of batch jobs if { ${batch_jobs:rowcount} == 0 } { @@ -294,8 +297,10 @@ set context [list [list "." "Authentication"] $page_title] -if { ([info exists authority_id] && $authority_id ne "") } { - set num_users [lc_numeric [db_string num_users_in_auhtority { select count(*) from users where authority_id = :authority_id }]] +if { [info exists authority_id] && $authority_id ne "" } { + set num_users [lc_numeric [db_string num_users_in_auhtority { + select count(*) from users where authority_id = :authority_id + }]] } else { set num_users 0 } Index: openacs-4/packages/acs-admin/www/auth/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/index.tcl,v diff -u -N -r1.11.2.1 -r1.11.2.2 --- openacs-4/packages/acs-admin/www/auth/index.tcl 10 Sep 2015 08:21:07 -0000 1.11.2.1 +++ openacs-4/packages/acs-admin/www/auth/index.tcl 1 Oct 2016 11:04:31 -0000 1.11.2.2 @@ -64,7 +64,7 @@ + id="@authorities.select_id;literal@"> unchecked @@ -89,7 +89,7 @@ + id="@authorities.delete_id;literal@"> \#acs-admin.Delete\# @@ -98,6 +98,7 @@ } } + # The authority currently selected for registering users set register_authority_id [auth::get_register_authority] @@ -108,6 +109,7 @@ delete_url registration_url registration_status + select_id delete_id } authorities authorities_select { select authority_id, short_name, @@ -127,18 +129,29 @@ set delete_url [export_vars -base authority-delete { authority_id }] set sort_order_url_up [export_vars -base authority-set-sort-order { authority_id {direction up} }] set sort_order_url_down [export_vars -base authority-set-sort-order { authority_id {direction down} }] - + set select_id select-authority-$authority_id + set delete_id delete-authority-$authority_id if {$authority_id eq $register_authority_id} { # The authority is selected as register authority set registration_status "selected" } elseif { $reg_impl ne "" } { # The authority can be selected as register authority set registration_status "can_select" set registration_url [export_vars -base authority-registration-select { authority_id }] + template::add_acs_confirm_handler \ + -id $select_id \ + -message [_ acs-admin.You_are_changing_all_user_registrations_to_be_in_authority_authorities_pretty_name \ + [list authorities.pretty_name $pretty_name]] } else { # This authority has no account creation driver set registration_status "cannot_select" - } + } + if {$short_name ne "local"} { + template::add_acs_confirm_handler \ + -id $delete_id \ + -message [_ acs-admin.Are_you_sure_you_want_to_delete_authority_authorities_pretty_name \ + [list authorities.pretty_name $pretty_name]] + } } set auth_package_id [apm_package_id_from_key "acs-authentication"] Index: openacs-4/packages/acs-automated-testing/www/server.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/server.adp,v diff -u -N -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/acs-automated-testing/www/server.adp 16 Jul 2016 17:32:12 -0000 1.6.2.1 +++ openacs-4/packages/acs-automated-testing/www/server.adp 1 Oct 2016 11:04:31 -0000 1.6.2.2 @@ -57,7 +57,7 @@
  • - Rebuild this server now + Rebuild this server now
  • Rebuild log Index: openacs-4/packages/acs-automated-testing/www/server.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/server.tcl,v diff -u -N -r1.3.24.1 -r1.3.24.2 --- openacs-4/packages/acs-automated-testing/www/server.tcl 10 Sep 2015 08:21:14 -0000 1.3.24.1 +++ openacs-4/packages/acs-automated-testing/www/server.tcl 1 Oct 2016 11:04:31 -0000 1.3.24.2 @@ -30,6 +30,11 @@ set rebuild_url [export_vars -base rebuild-server { { server $service(name) } }] set rebuild_log_url "/rebuild-$service(name).log" +template::add_acs_confirm_handler \ + -id "action-rebuild" \ + -message "Are you sure you want to wipe and rebuild this server?" + + # Local variables: # mode: tcl # tcl-indent-level: 4 Index: openacs-4/packages/acs-lang/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.adp,v diff -u -N -r1.20 -r1.20.2.1 --- openacs-4/packages/acs-lang/www/admin/index.adp 3 Jul 2015 10:25:42 -0000 1.20 +++ openacs-4/packages/acs-lang/www/admin/index.adp 1 Oct 2016 11:04:31 -0000 1.20.2.1 @@ -22,8 +22,8 @@
  • #acs-lang.Look_up_message#
    • -
  • #acs-lang.Import_all_messages#
    • -
  • #acs-lang.Export_all_messages#
    • +
  • #acs-lang.Import_all_messages#
    • +
  • #acs-lang.Export_all_messages#
    •  Index: openacs-4/packages/acs-lang/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.tcl,v diff -u -N -r1.12.2.1 -r1.12.2.2 --- openacs-4/packages/acs-lang/www/admin/index.tcl 10 Sep 2015 08:21:28 -0000 1.12.2.1 +++ openacs-4/packages/acs-lang/www/admin/index.tcl 1 Oct 2016 11:04:31 -0000 1.12.2.2 @@ -28,9 +28,17 @@ set import_url [export_vars -base import-messages] set export_url [export_vars -base export-messages] -set parameter_url [export_vars -base "/shared/parameters" { {package_id {[ad_conn package_id]} } { return_url {[ad_return_url]} } }] +template::add_acs_confirm_handler -id action-import \ + -message [_ acs-lang.Are_you_sure_you_want_to_import_all_I18N_messages_from_catalog_files] +template::add_acs_confirm_handler -id action-export \ + -message [_ acs-lang.Are_you_sure_you_want_to_export_all_I18N_messages_to_catalog_files] +set parameter_url [export_vars -base "/shared/parameters" { + {package_id {[ad_conn package_id]} } + { return_url {[ad_return_url]} } +}] + ##### # # Locales @@ -41,8 +49,7 @@ db_1row counts { select count(*) as num_messages from lang_messages - where locale = :default_locale - and deleted_p = 'f' + where locale = :default_locale and deleted_p = 'f' } db_multirow -extend { 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.30.2.7 -r1.30.2.8 --- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl 27 Sep 2016 08:50:47 -0000 1.30.2.7 +++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl 1 Oct 2016 11:04:31 -0000 1.30.2.8 @@ -187,7 +187,7 @@ [_ acs-subsite.rename] - [_ acs-subsite.delete] + [_ acs-subsite.delete] [_ acs-subsite.parameters] @@ -205,7 +205,7 @@ multirow create nodes \ node_id expand_mode expand_url tree_indent name name_url instance instance_url type \ action_type action_form_part add_folder_url new_app_url unmount_url mount_url \ - rename_url delete_url parameters_url permissions_url extra_form_part + rename_url delete_url parameters_url permissions_url extra_form_part delete_id set open_nodes [list] @@ -309,12 +309,16 @@ set action_type "new_folder" set action_form_part [export_vars -form {expand:multiple parent_id node_type root_id}] } - + set delete_id delete-$node_id + multirow append nodes \ $node_id $expand_mode $expand_url $indent $name $name_url $object_name $url $package_pretty_name \ $action_type $action_form_part $add_folder_url $new_app_url $unmount_url $mount_url \ - $rename_url $delete_url $parameters_url $permissions_url "" + $rename_url $delete_url $parameters_url $permissions_url "" $delete_id + template::add_acs_confirm_handler \ + -id $delete_id \ + -message "Are you sure you want to delete node $name and any package mounted there?" } set new_app_form_part_1 [subst { Index: openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.adp,v diff -u -N -r1.3 -r1.3.2.1 --- openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.adp 3 Jul 2015 10:25:48 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.adp 1 Oct 2016 11:04:31 -0000 1.3.2.1 @@ -7,7 +7,7 @@