Index: openacs-4/packages/acs-subsite/www/group-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.tcl,v diff -u -r1.19 -r1.20 --- openacs-4/packages/acs-subsite/www/group-master.tcl 19 Jun 2018 13:35:52 -0000 1.19 +++ openacs-4/packages/acs-subsite/www/group-master.tcl 19 Jun 2018 13:45:23 -0000 1.20 @@ -73,7 +73,7 @@ # util_get_user_messages -multirow user_messages -# +# # Set acs-lang urls # set acs_lang_url [apm_package_url_from_key "acs-lang"] @@ -139,7 +139,7 @@ # # Curriculum specific bar -# TODO: remove this and add a more systematic / package independent way +# TODO: remove this and add a more systematic / package independent way # TODO of getting this content here # set curriculum_bar_p [expr { Index: openacs-4/packages/ajaxhelper/www/doc/default-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/doc/default-master.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ajaxhelper/www/doc/default-master.tcl 19 Jun 2018 13:35:53 -0000 1.3 +++ openacs-4/packages/ajaxhelper/www/doc/default-master.tcl 19 Jun 2018 13:45:23 -0000 1.4 @@ -45,7 +45,7 @@ accesskey \ class \ id \ - tabindex + tabindex } for {set i 1} {$i <= [template::multirow size navigation]} {incr i} { template::multirow get navigation $i @@ -65,7 +65,7 @@ en \ "all" -# +# # User information and top level navigation links # set user_id [ad_conn user_id] @@ -108,7 +108,7 @@ # util_get_user_messages -multirow user_messages -# +# # Set acs-lang urls # set acs_lang_url [apm_package_url_from_key "acs-lang"] @@ -161,7 +161,7 @@ # # Curriculum specific bar -# TODO: remove this and add a more systematic / package independent way +# TODO: remove this and add a more systematic / package independent way # TODO of getting this content here # set curriculum_bar_p [expr { Index: openacs-4/packages/general-comments/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/index.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/general-comments/www/index.tcl 19 Jun 2018 13:35:53 -0000 1.12 +++ openacs-4/packages/general-comments/www/index.tcl 19 Jun 2018 13:45:23 -0000 1.13 @@ -2,12 +2,12 @@ ad_page_contract { General comments main page - + @author Phong Nguyen (phong@arsdigita.com) @author Pascal Scheffers (pascal@scheffers.net) @creation-date 2000-10-12 @cvs-id $Id$ -} -query { +} -query { {orderby:token,optional} {approval "any"} {modified "any"} @@ -51,34 +51,34 @@ -no_data "#general-comments.lt_No_comments_available#" \ -html {style "margin: 0 auto"} \ -elements { - counter { - label "#general-comments.Num#" + counter { + label "#general-comments.Num#" display_template {@comments.rownum;literal@} - } + } comment_id { - label "#general-comments.ID#" - display_template {@comments.comment_id@} - orderby {comment_id} - } - title { - label "#general-comments.Title_1#" - orderby {title} - } - approved_p { - label "#general-comments.Approved#" - html {align center} - orderby {approved_p} - } - live_version_p { - label "#general-comments.Has_live_version#" - html {align center} - orderby {approved_p} - } - pretty_date { - label "#general-comments.Last_Modified#" - orderby {creation_date} - } - } -filters {approval {} modified {}} + label "#general-comments.ID#" + display_template {@comments.comment_id@} + orderby {comment_id} + } + title { + label "#general-comments.Title_1#" + orderby {title} + } + approved_p { + label "#general-comments.Approved#" + html {align center} + orderby {approved_p} + } + live_version_p { + label "#general-comments.Has_live_version#" + html {align center} + orderby {approved_p} + } + pretty_date { + label "#general-comments.Last_Modified#" + orderby {creation_date} + } +} -filters {approval {} modified {}} set yes [_ acs-kernel.common_Yes] set no [_ acs-kernel.common_No] Index: openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.tcl 19 Jun 2018 13:35:53 -0000 1.7 +++ openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.tcl 19 Jun 2018 13:45:23 -0000 1.8 @@ -30,7 +30,7 @@ set pvt_home_url [ad_pvt_home] set pvt_home_name [ad_pvt_home_name] if {$pvt_home_name eq ""} { - set pvt_home_name [_ acs-subsite.Your_Account] + set pvt_home_name [_ acs-subsite.Your_Account] } set logout_url [ad_get_logout_url] @@ -53,7 +53,7 @@ set admin_url "[subsite::get_element -element url]admin/" } } -} +} if { $untrusted_user_id == 0 } { set login_url [ad_get_login_url -return] Index: openacs-4/packages/notifications/www/manage.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/manage.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/notifications/www/manage.tcl 19 Jun 2018 13:35:53 -0000 1.12 +++ openacs-4/packages/notifications/www/manage.tcl 19 Jun 2018 13:45:23 -0000 1.13 @@ -40,7 +40,7 @@ interval { label {[_ notifications.Frequency]} display_template { - @notifications.interval@ + @notifications.interval@ (\#notifications.Change\#) } } Index: openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/login.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/login.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/login.tcl 19 Jun 2018 13:35:53 -0000 1.4 +++ openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/login.tcl 19 Jun 2018 13:45:23 -0000 1.5 @@ -13,10 +13,10 @@ if {$portrait_id == 0} { set email [party::email -party_id $user_id] if {[info commands ns_md5] ne ""} { - set md5 [string tolower [ns_md5 $email]] + set md5 [string tolower [ns_md5 $email]] } else { - package require md5 - set md5 [string tolower [md5::Hex [md5::md5 -- $email]]] + package require md5 + set md5 [string tolower [md5::Hex [md5::md5 -- $email]]] } set src //www.gravatar.com/avatar/$md5?size=35&d=mm security::csp::require img-src www.gravatar.com Index: openacs-4/packages/openacs-default-theme/lib/plain-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-default-theme/lib/plain-master.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/openacs-default-theme/lib/plain-master.tcl 19 Jun 2018 13:35:53 -0000 1.7 +++ openacs-4/packages/openacs-default-theme/lib/plain-master.tcl 19 Jun 2018 13:45:23 -0000 1.8 @@ -4,7 +4,7 @@ Properties allowed doc(title) HTML title head code to be entered into head of document - body + body focus HTML id of form element to focus skip_link href of link to skip to. Should be of format #skip_link main_content_p if true wrap in the main content divs (if false, provide your own @@ -53,7 +53,7 @@ } } -# +# # User information and top level navigation links # set user_id [ad_conn user_id] @@ -96,7 +96,7 @@ # util_get_user_messages -multirow user_messages -# +# # Set acs-lang urls # set acs_lang_url [apm_package_url_from_key "acs-lang"] @@ -153,7 +153,7 @@ # # Curriculum specific bar -# TODO: remove this and add a more systematic / package independent way +# TODO: remove this and add a more systematic / package independent way # TODO of getting this content here # set curriculum_bar_p [expr { Index: openacs-4/packages/theme-selva/tcl/selva-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/tcl/selva-procs.tcl,v diff -u -r1.16 -r1.17 --- openacs-4/packages/theme-selva/tcl/selva-procs.tcl 19 Jun 2018 13:35:53 -0000 1.16 +++ openacs-4/packages/theme-selva/tcl/selva-procs.tcl 19 Jun 2018 13:45:23 -0000 1.17 @@ -29,60 +29,60 @@ namespace eval selva { ad_proc -public portal_navbar { - + } { - A helper procedure that generates the Navbar, ie the tabs, - for dotlrn. It is called from the selva-master template. + A helper procedure that generates the Navbar, ie the tabs, + for dotlrn. It is called from the selva-master template. } { - set current_url [ad_conn url] + set current_url [ad_conn url] set dotlrn_url [dotlrn::get_url] - # Set up some basic stuff - set community_id [dotlrn_community::get_community_id] + # Set up some basic stuff + set community_id [dotlrn_community::get_community_id] - # Get user information - set sw_admin_p 0 - set user_id [ad_conn user_id] - set untrusted_user_id [ad_conn untrusted_user_id] - if { $untrusted_user_id != 0 } { - set user_name [acs_user::get_element -user_id $untrusted_user_id -element name] - set pvt_home_url [ad_pvt_home] - set pvt_home_name [_ acs-subsite.Your_Account] - set logout_url [ad_get_logout_url] - - # Site-wide admin link - set admin_url {} - - set sw_admin_p [acs_user::site_wide_admin_p -user_id $untrusted_user_id] - - if { $sw_admin_p } { - set admin_url "/acs-admin/" - set locale_admin_url "/acs-lang/admin" - set dotlrn_admin_url "${dotlrn_url}/admin/" - } else { - set subsite_admin_p [permission::permission_p \ - -object_id [subsite::get_element -element object_id] \ - -privilege admin \ - -party_id $untrusted_user_id] - - if { $subsite_admin_p } { - set admin_url "[subsite::get_element -element url]admin/" - } - } - } else { - set login_url [ad_get_login_url -return] - set user_name {} - } - - set navbar "" + } ad_proc -public portal_subnavbar { {-user_id:required} {-link_control_panel:required} {-control_panel_text:required} - {-link_all 0} + {-link_all 0} {-pre_html ""} {-post_html ""} } { A helper procedure that generates the portal subnavbar (the thing with the portal pages on it) for dotlrn. It is called from the dotlrn-master template } { - + set dotlrn_url [dotlrn::get_url] set community_id [dotlrn_community::get_community_id] set control_panel_name control-panel - set control_panel_url "$dotlrn_url/$control_panel_name" - + set control_panel_url "$dotlrn_url/$control_panel_name" + if { $community_id eq "" } { # We are not under a dotlrn community. However we could be # under /dotlrn (i.e. in the user's portal) or anywhere # else on the site set link "[dotlrn::get_url]/" - + if {[dotlrn::user_p -user_id $user_id] && - [ad_get_client_property dotlrn home_tab_selected_p] } { + [ad_get_client_property dotlrn home_tab_selected_p] } { # this user is a dotlrn user, we've selected the home tab, # show their personal portal subnavbar, including the control panel link set portal_id [dotlrn::get_portal_id -user_id $user_id] @@ -198,20 +198,20 @@ # # We are under a dotlrn community. Get the community's portal_id, etc. # - + # some defaults - set text [dotlrn_community::get_community_header_name $community_id] + set text [dotlrn_community::get_community_header_name $community_id] set control_panel_name one-community-admin - # link is important : it sets the options_set value, which will be used later to select the current page + # link is important : it sets the options_set value, which will be used later to select the current page set link [dotlrn_community::get_community_url $community_id] - set control_panel_url "$link/$control_panel_name" + set control_panel_url "$link/$control_panel_name" # figure out what this privs this user has on the community set admin_p [dotlrn::user_can_admin_community_p \ -user_id $user_id \ -community_id $community_id ] - + if {!$admin_p} { # the user can't admin this community, perhaps they are a # humble member instead? @@ -222,9 +222,9 @@ # explicitly turned off set show_control_panel 1 } - + if {$admin_p || $member_p} { - + set portal_id [dotlrn_community::get_portal_id \ -community_id $community_id ] @@ -236,38 +236,35 @@ } } - #AG: This code belongs in the portal package, near portal::subnavbar. For display reasons we need to do this - #as a ul instead of a table, which portal::subnavbar returns. Obviously we shouldn't be letting display-level - #stuff decide where we put our code, but first we'll need to mod the portal package accordingly. + #AG: This code belongs in the portal package, near portal::subnavbar. For display reasons we need to do this + #as a ul instead of a table, which portal::subnavbar returns. Obviously we shouldn't be letting display-level + #stuff decide where we put our code, but first we'll need to mod the portal package accordingly. - if { [catch {set page_num [ad_get_client_property dotlrn page_num]}] || $page_num eq "" || ![string is integer $page_num] } { - set page_num [ns_queryget page_num] - #Strip out extra anchors and other crud. - #page_num will be empty_string for special pages like - #My Space and Control Panel - regsub -all {[^0-9]} $page_num {} page_num - } - - set subnavbar "" } - } Index: openacs-4/packages/theme-selva/www/selva-site-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-site-master.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/theme-selva/www/selva-site-master.tcl 19 Jun 2018 13:35:53 -0000 1.10 +++ openacs-4/packages/theme-selva/www/selva-site-master.tcl 19 Jun 2018 13:45:23 -0000 1.11 @@ -43,7 +43,7 @@ set pvt_home_url [ad_pvt_home] set pvt_home_name [ad_pvt_home_name] if {$pvt_home_name eq ""} { - set pvt_home_name [_ acs-subsite.Your_Account] + set pvt_home_name [_ acs-subsite.Your_Account] } set logout_url [ad_get_logout_url] @@ -66,7 +66,7 @@ set admin_url "[subsite::get_element -element url]admin/" } } -} +} if { $untrusted_user_id == 0 } { set login_url [ad_get_login_url -return] Index: openacs-4/packages/theme-selva/www/doc/selva-site-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/doc/selva-site-master.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/theme-selva/www/doc/selva-site-master.tcl 19 Jun 2018 13:35:53 -0000 1.3 +++ openacs-4/packages/theme-selva/www/doc/selva-site-master.tcl 19 Jun 2018 13:45:23 -0000 1.4 @@ -35,7 +35,7 @@ set pvt_home_url [ad_pvt_home] set pvt_home_name [ad_pvt_home_name] if {$pvt_home_name eq ""} { - set pvt_home_name [_ acs-subsite.Your_Account] + set pvt_home_name [_ acs-subsite.Your_Account] } set logout_url [ad_get_logout_url] @@ -58,7 +58,7 @@ set admin_url "[subsite::get_element -element url]admin/" } } -} +} if { $untrusted_user_id == 0 } { set login_url [ad_get_login_url -return] Index: openacs-4/packages/theme-zen/lib/lrn-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/lrn-master.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/theme-zen/lib/lrn-master.tcl 19 Jun 2018 13:35:53 -0000 1.17 +++ openacs-4/packages/theme-zen/lib/lrn-master.tcl 19 Jun 2018 13:45:23 -0000 1.18 @@ -1,6 +1,6 @@ # $Id$ -set user_id [ad_conn user_id] +set user_id [ad_conn user_id] set untrusted_user_id [ad_conn untrusted_user_id] set community_id [dotlrn_community::get_community_id] set dotlrn_url [dotlrn::get_url] @@ -56,7 +56,7 @@ set admin_url "[subsite::get_element -element url]admin/" } } -} +} # Who's Online set num_users_online [lc_numeric [whos_online::num_users]] @@ -77,7 +77,7 @@ } if { [ad_conn package_key] ne [dotlrn::package_key] } { - # Peter M: We are in a package (an application) that may or may not be under a dotlrn instance + # Peter M: We are in a package (an application) that may or may not be under a dotlrn instance # (i.e. in a news instance of a class) # and we want all links in the navbar to be active so the user can return easily to the class homepage # or to the My Space page @@ -107,7 +107,7 @@ set comm_type [dotlrn_community::get_community_type_from_community_id [dotlrn_community::get_parent_id -community_id $community_id]] } - + ### Logo hack set comm_id_for_logo $community_id @@ -132,7 +132,7 @@ set header_logo_alt_text [dotlrn_community::get_attribute \ -community_id $comm_id_for_logo \ -attribute_name header_logo_alt_text] - + set img_attrib [subst {src="$header_logo_url" alt="$header_logo_alt_text"}] } @@ -164,14 +164,14 @@ if { !([info exists no_navbar_p] && $no_navbar_p ne ""&& $no_navbar_p) && [info exists portal_id] && $portal_id ne "" } { - + if { $community_id ne "" } { set youarehere "[dotlrn_community::get_community_name $community_id]" } else { set youarehere "[_ theme-zen.MySpace]" } - set extra_spaces "\"\"" + set extra_spaces "\"\"" set navbar [zen::portal_navbar] set subnavbar [zen::portal_subnavbar \ -user_id $user_id \ @@ -191,16 +191,16 @@ if { [string match "/dotlrn/clubs/*" [ad_conn url]] } { set css_url [parameter::get_from_package_key -package_key "theme-zen" \ - -parameter "communityCssUrl" \ - -default "/resources/theme-zen/css/color/purple.css"] + -parameter "communityCssUrl" \ + -default "/resources/theme-zen/css/color/purple.css"] } elseif { [string match "/dotlrn/classes/*" [ad_conn url]] } { set css_url [parameter::get_from_package_key -package_key "theme-zen" \ - -parameter "courseCssUrl" \ - -default "/resources/theme-zen/css/color/green.css"] + -parameter "courseCssUrl" \ + -default "/resources/theme-zen/css/color/green.css"] } else { set css_url [parameter::get_from_package_key -package_key "theme-zen" \ - -parameter "cssUrl" \ - -default "/resources/theme-zen/css/color/blue.css"] + -parameter "cssUrl" \ + -default "/resources/theme-zen/css/color/blue.css"] } template::head::add_meta -name "robots" -content "all" @@ -251,7 +251,7 @@ set context_tmp {} } -# Build breadcrumbs only from dotlrn root node +# Build breadcrumbs only from dotlrn root node # then replace the first element to be dotLRN always ad_context_bar_multirow -from_node [dotlrn::get_node_id] -- $context_tmp if { [template::multirow get context 1 url] ne "" } { @@ -264,8 +264,8 @@ -object_id [site_node::get_element -url $acs_lang_url -element object_id] \ -privilege admin \ -party_id [ad_conn untrusted_user_id]] -set toggle_translator_mode_url [export_vars -base "${acs_lang_url}admin/translator-mode-toggle" { - { return_url [ad_return_url] } +set toggle_translator_mode_url [export_vars -base "${acs_lang_url}admin/translator-mode-toggle" { + { return_url [ad_return_url] } }] # Index: openacs-4/packages/theme-zen/tcl/navigation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/tcl/navigation-procs.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/theme-zen/tcl/navigation-procs.tcl 19 Jun 2018 13:35:53 -0000 1.8 +++ openacs-4/packages/theme-zen/tcl/navigation-procs.tcl 19 Jun 2018 13:45:23 -0000 1.9 @@ -30,7 +30,7 @@ namespace eval zen { ad_proc -public portal_navbar { - + } { A helper procedure that generates the Navbar, ie the tabs, for dotlrn. It is called from the zen-master template. @@ -51,11 +51,11 @@ set pvt_home_url [ad_pvt_home] set pvt_home_name [_ acs-subsite.Your_Account] set logout_url [ad_get_logout_url] - + # Site-wide admin link set admin_url {} set dotlrn_admin_url "" - + set sw_admin_p [acs_user::site_wide_admin_p -user_id $untrusted_user_id] set dotlrn_admin_p [permission::permission_p \ -party_id $user_id \ @@ -64,7 +64,7 @@ if { $dotlrn_admin_p } { set dotlrn_admin_url [dotlrn::get_admin_url] } - + if { $sw_admin_p } { set admin_url "/acs-admin/" set locale_admin_url "/acs-lang/admin" @@ -73,7 +73,7 @@ -object_id [subsite::get_element -element object_id] \ -privilege admin \ -party_id $untrusted_user_id] - + if { $subsite_admin_p } { set admin_url "[subsite::get_element -element url]admin/" } @@ -82,7 +82,7 @@ set login_url [ad_get_login_url -return] set user_name {} } - + set navbar "" } @@ -188,18 +188,18 @@ with the portal pages on it) for dotlrn. It is called from the dotlrn-master template } { - + set dotlrn_url [dotlrn::get_url] set community_id [dotlrn_community::get_community_id] set control_panel_name control-panel set control_panel_url "$dotlrn_url/$control_panel_name" - + if { $community_id eq "" } { # We are not under a dotlrn community. However we could be # under /dotlrn (i.e. in the user's portal) or anywhere # else on the site set link "[dotlrn::get_url]/" - + if {[dotlrn::user_p -user_id $user_id] && [ad_get_client_property dotlrn home_tab_selected_p] } { # this user is a dotlrn user, we've selected the home tab, @@ -216,9 +216,9 @@ # # We are under a dotlrn community. Get the community's portal_id, etc. # - + # some defaults - set text [dotlrn_community::get_community_header_name $community_id] + set text [dotlrn_community::get_community_header_name $community_id] set control_panel_name one-community-admin # link is important : it sets the options_set value, which will be used later to select the current page set link [dotlrn_community::get_community_url $community_id] @@ -229,7 +229,7 @@ -user_id $user_id \ -community_id $community_id ] - + if {!$admin_p} { # the user can't admin this community, perhaps they are a # humble member instead? @@ -240,9 +240,9 @@ # explicitly turned off set show_control_panel 1 } - + if {$admin_p || $member_p} { - + set portal_id [dotlrn_community::get_portal_id \ -community_id $community_id ] @@ -254,7 +254,7 @@ } } - #AG: This code belongs in the portal package, near portal::subnavbar. For display reasons we need to do this + #AG: This code belongs in the portal package, near portal::subnavbar. For display reasons we need to do this #as a ul instead of a table, which portal::subnavbar returns. Obviously we shouldn't be letting display-level #stuff decide where we put our code, but first we'll need to mod the portal package accordingly. @@ -268,38 +268,38 @@ #My Space and Control Panel regsub -all {[^0-9]} $page_num {} page_num } - - + + set subnavbar "" db_foreach list_page_nums_select {} { if {$page_num eq $sort_key} { append subnavbar [subst { - - }] + + }] } else { append subnavbar [subst { -
  • - $pretty_name -
    • - }] +
  • + $pretty_name +
    • + }] } - } + } - if { $community_id ne "" && $admin_p } { + if { $community_id ne "" && $admin_p } { if {[string match "*/one-community-admin*" [ad_conn url]]} { append subnavbar [subst { - - }] + + }] } else { append subnavbar [subst { -
  • - [_ dotlrn.Admin] -
    • - }] +
  • + [_ dotlrn.Admin] +
    • + }] } }