Index: openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-master.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-master.tcl 2 Aug 2018 09:13:17 -0000 1.3 +++ openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-master.tcl 9 Feb 2020 15:45:31 -0000 1.3.2.1 @@ -46,8 +46,8 @@ if {![info exists context_bar]} { set context_bar [ad_context_bar] } # clean out title and context bar for index page. -if {[ad_conn url] eq "/" || [string match /index* [ad_conn url]] || [ad_conn url] eq "/community/"} { - set context_bar {} +if {[ad_conn url] eq "/" || [string match /index* [ad_conn url]] || [ad_conn url] eq "/community/"} { + set context_bar {} set notitle 1 } @@ -86,3 +86,9 @@ security::csp::require font-src 'self' security::csp::require font-src maxcdn.bootstrapcdn.com + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-streaming-head.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-streaming-head.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-streaming-head.tcl 2 Aug 2018 09:13:17 -0000 1.2 +++ openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-streaming-head.tcl 9 Feb 2020 15:45:31 -0000 1.2.2.1 @@ -1,4 +1,3 @@ - set streaming_head 1 if {![info exists subsite_link]} { @@ -11,3 +10,9 @@ set subsite_url [subsite::get_element -element url] set subsite_name [lang::util::localize [subsite::get_element -element instance_name]] + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-master-turquois.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-master-turquois.tcl,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-master-turquois.tcl 8 Jul 2016 16:13:35 -0000 1.1 +++ openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-master-turquois.tcl 9 Feb 2020 15:45:31 -0000 1.1.4.1 @@ -4,8 +4,14 @@ -show_applications_p [parameter::get -package_id [ad_conn subsite_id] -parameter ShowApplications -default 1] \ -no_tab_application_list [parameter::get -package_id [ad_conn subsite_id] -parameter NoTabApplicationList -default ""] \ -initial_pageflow [parameter::get -package_id [ad_conn subsite_id] -parameter UserNavbarTabsList -default ""] - + set subsite_logo "/resources/openacs-bootstrap3-theme/images/logo_dotlrn_xs.png" set subsite_id [ad_conn subsite_id] set subsite_link [subsite::get_element -subsite_id $subsite_id -element url] + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-master.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-master.tcl 2 Aug 2018 09:13:17 -0000 1.2 +++ openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-master.tcl 9 Feb 2020 15:45:31 -0000 1.2.2.1 @@ -4,7 +4,13 @@ -show_applications_p [parameter::get -package_id [ad_conn subsite_id] -parameter ShowApplications -default 1] \ -no_tab_application_list [parameter::get -package_id [ad_conn subsite_id] -parameter NoTabApplicationList -default ""] \ -initial_pageflow [parameter::get -package_id [ad_conn subsite_id] -parameter UserNavbarTabsList -default ""] - + #set subsite_logo "/resources/openacs-bootstrap3-theme/images/openacs2_xs.png" set subsite_logo "" + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-streaming-head-turquois.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-streaming-head-turquois.tcl,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-streaming-head-turquois.tcl 8 Jul 2016 16:13:35 -0000 1.1 +++ openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-streaming-head-turquois.tcl 9 Feb 2020 15:45:31 -0000 1.1.4.1 @@ -4,7 +4,7 @@ -show_applications_p [parameter::get -package_id [ad_conn subsite_id] -parameter ShowApplications -default 1] \ -no_tab_application_list [parameter::get -package_id [ad_conn subsite_id] -parameter NoTabApplicationList -default ""] \ -initial_pageflow [parameter::get -package_id [ad_conn subsite_id] -parameter UserNavbarTabsList -default ""] - + set subsite_logo "/resources/openacs-bootstrap3-theme/images/logo_dotlrn_xs.png" set streaming_head 1 @@ -15,3 +15,9 @@ set doc(title) $title ad_context_bar_multirow -- $context + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-streaming-head.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-streaming-head.tcl,v diff -u -r1.1.4.1 -r1.1.4.2 --- openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-streaming-head.tcl 4 Aug 2019 17:57:54 -0000 1.1.4.1 +++ openacs-4/packages/openacs-bootstrap3-theme/resources/masters/tabbed-streaming-head.tcl 9 Feb 2020 15:45:31 -0000 1.1.4.2 @@ -4,7 +4,7 @@ -show_applications_p [parameter::get -package_id [ad_conn subsite_id] -parameter ShowApplications -default 1] \ -no_tab_application_list [parameter::get -package_id [ad_conn subsite_id] -parameter NoTabApplicationList -default ""] \ -initial_pageflow [parameter::get -package_id [ad_conn subsite_id] -parameter UserNavbarTabsList -default ""] - + #set subsite_logo "/resources/openacs-bootstrap3-theme/images/openacs2_xs.png" set subsite_logo "" @@ -17,3 +17,9 @@ set doc(title) $title ad_context_bar_multirow -- $context + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/forums/lib/search/search-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/forums/lib/search/search-form.tcl,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/forums/lib/search/search-form.tcl 8 Jul 2016 16:13:35 -0000 1.1 +++ openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/forums/lib/search/search-form.tcl 9 Feb 2020 15:45:31 -0000 1.1.4.1 @@ -12,3 +12,9 @@ if { [form is_request search] && [info exists forum_id] } { element set_properties search forum_id -value $forum_id } + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/xowiki/www/edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/xowiki/www/edit.tcl,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/xowiki/www/edit.tcl 8 Jul 2016 16:13:35 -0000 1.1 +++ openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/xowiki/www/edit.tcl 9 Feb 2020 15:45:31 -0000 1.1.4.1 @@ -1 +1,6 @@ + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: 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.7 -r1.7.2.1 --- openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/login.tcl 28 Jun 2018 08:40:09 -0000 1.7 +++ openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/login.tcl 9 Feb 2020 15:45:31 -0000 1.7.2.1 @@ -39,3 +39,9 @@ set name [person::get_person_info -person_id $user_id -element first_names] } + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/navigation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/navigation.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/navigation.tcl 2 Aug 2018 09:13:17 -0000 1.5 +++ openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/navigation.tcl 9 Feb 2020 15:45:31 -0000 1.5.2.1 @@ -36,17 +36,23 @@ } set nav_parent $navigation(parent) if {$nav_parent ne ""} { - if {[info exists submenus($nav_parent)]} { - set submenus($nav_parent) "$submenus($nav_parent) $item_html" - } else { - set submenus($nav_parent) "" - } + if {[info exists submenus($nav_parent)]} { + set submenus($nav_parent) "$submenus($nav_parent) $item_html" + } else { + set submenus($nav_parent) "" + } } } template::multirow extend navigation submenu template::multirow foreach navigation { if {[info exists submenus($name)]} { - set submenu $submenus($name) + set submenu $submenus($name) } } + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/openacs-bootstrap3-theme/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/tcl/apm-callback-procs.tcl,v diff -u -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/openacs-bootstrap3-theme/tcl/apm-callback-procs.tcl 22 Apr 2019 10:21:39 -0000 1.6.2.1 +++ openacs-4/packages/openacs-bootstrap3-theme/tcl/apm-callback-procs.tcl 9 Feb 2020 15:45:31 -0000 1.6.2.2 @@ -8,62 +8,68 @@ # Insert this package's themes db_transaction { - subsite::new_subsite_theme \ - -create_or_replace \ - -key openacs_bootstrap3 \ - -name #openacs-bootstrap3-theme.tabbed# \ - -template tabbed-master \ - -css { - {-href /resources/acs-subsite/site-master.css -media all -order 0} - {-href urn:ad:css:bootstrap3 -media all -order 1} - {-href /resources/openacs-bootstrap3-theme/css/main.css -media all -order 2} - {-href /resources/openacs-bootstrap3-theme/css/color/grey.css -media all -order 3} - {-href /resources/acs-templating/forms.css -media all -order 4} - {-href /resources/acs-templating/lists.css -media all -order 5} - } \ - -js { - {-src urn:ad:js:jquery -order 1} - {-src urn:ad:js:bootstrap3 -order 2} - } \ - -form_template standard \ - -list_template table \ - -list_filter_template filters \ - -dimensional_template dimensional \ - -resource_dir /packages/openacs-bootstrap3-theme/resources \ - -streaming_head tabbed-streaming-head + subsite::new_subsite_theme \ + -create_or_replace \ + -key openacs_bootstrap3 \ + -name #openacs-bootstrap3-theme.tabbed# \ + -template tabbed-master \ + -css { + {-href /resources/acs-subsite/site-master.css -media all -order 0} + {-href urn:ad:css:bootstrap3 -media all -order 1} + {-href /resources/openacs-bootstrap3-theme/css/main.css -media all -order 2} + {-href /resources/openacs-bootstrap3-theme/css/color/grey.css -media all -order 3} + {-href /resources/acs-templating/forms.css -media all -order 4} + {-href /resources/acs-templating/lists.css -media all -order 5} + } \ + -js { + {-src urn:ad:js:jquery -order 1} + {-src urn:ad:js:bootstrap3 -order 2} + } \ + -form_template standard \ + -list_template table \ + -list_filter_template filters \ + -dimensional_template dimensional \ + -resource_dir /packages/openacs-bootstrap3-theme/resources \ + -streaming_head tabbed-streaming-head - subsite::new_subsite_theme \ - -create_or_replace \ - -key openacs_bootstrap3_turquois \ - -name #openacs-bootstrap3-theme.tabbed-turquois# \ - -template tabbed-master-turquois \ - -css { - {-href /resources/acs-subsite/site-master.css -media all -order 0} - {-href urn:ad:css:bootstrap3 -media all -order 1} - {-href /resources/openacs-bootstrap3-theme/css/main.css -media all -order 2} - {-href /resources/openacs-bootstrap3-theme/css/color/turquois.css -media all -order 3} - {-href /resources/acs-templating/forms.css -media all -order 4} - {-href /resources/acs-templating/lists.css -media all -order 5} - } \ - -js { - {-src urn:ad:js:jquery -order 1} - {-src urn:ad:js:bootstrap3 -order 2} - } \ - -form_template standard \ - -list_template table \ - -list_filter_template filters \ - -dimensional_template dimensional \ - -resource_dir /packages/openacs-bootstrap3-theme/resources \ - -streaming_head tabbed-streaming-head-turquois + subsite::new_subsite_theme \ + -create_or_replace \ + -key openacs_bootstrap3_turquois \ + -name #openacs-bootstrap3-theme.tabbed-turquois# \ + -template tabbed-master-turquois \ + -css { + {-href /resources/acs-subsite/site-master.css -media all -order 0} + {-href urn:ad:css:bootstrap3 -media all -order 1} + {-href /resources/openacs-bootstrap3-theme/css/main.css -media all -order 2} + {-href /resources/openacs-bootstrap3-theme/css/color/turquois.css -media all -order 3} + {-href /resources/acs-templating/forms.css -media all -order 4} + {-href /resources/acs-templating/lists.css -media all -order 5} + } \ + -js { + {-src urn:ad:js:jquery -order 1} + {-src urn:ad:js:bootstrap3 -order 2} + } \ + -form_template standard \ + -list_template table \ + -list_filter_template filters \ + -dimensional_template dimensional \ + -resource_dir /packages/openacs-bootstrap3-theme/resources \ + -streaming_head tabbed-streaming-head-turquois } } ad_proc -public openacs_bootstrap3_theme::apm::before_uninstall {} { Uninstall the package } { if {[subsite::get_theme] in {openacs_bootstrap3 openacs_bootstrap3_turquois}} { - subsite::set_theme -theme default_plain + subsite::set_theme -theme default_plain } subsite::delete_subsite_theme -key openacs_bootstrap3 subsite::delete_subsite_theme -key openacs_bootstrap3_turquois } + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl,v diff -u -r1.5.2.2 -r1.5.2.3 --- openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl 22 Apr 2019 10:21:39 -0000 1.5.2.2 +++ openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl 9 Feb 2020 15:45:31 -0000 1.5.2.3 @@ -49,3 +49,9 @@ return $result } } + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/openacs-bootstrap3-theme/tcl/resource-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/tcl/resource-init.tcl,v diff -u -r1.3.2.2 -r1.3.2.3 --- openacs-4/packages/openacs-bootstrap3-theme/tcl/resource-init.tcl 20 Nov 2019 08:45:51 -0000 1.3.2.2 +++ openacs-4/packages/openacs-bootstrap3-theme/tcl/resource-init.tcl 9 Feb 2020 15:45:31 -0000 1.3.2.3 @@ -13,10 +13,16 @@ foreach URN [dict keys [dict get $resource_info urnMap]] { template::register_urn \ - -urn $URN \ - -resource $prefix/[dict get $resource_info urnMap $URN] + -urn $URN \ + -resource $prefix/[dict get $resource_info urnMap $URN] } template::register_urn \ -urn urn:ad:js:jquery \ -resource /resources/openacs-bootstrap3-theme/js/jquery-3.4.1.min.js + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/download.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/download.tcl,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/download.tcl 2 Aug 2018 09:13:17 -0000 1.1 +++ openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/download.tcl 9 Feb 2020 15:45:31 -0000 1.1.2.1 @@ -14,3 +14,9 @@ -resource_info [::openacs_bootstrap3_theme::resource_info] ad_returnredirect . + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl 3 Aug 2018 09:50:08 -0000 1.3 +++ openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl 9 Feb 2020 15:45:31 -0000 1.3.2.1 @@ -11,3 +11,9 @@ set title "[dict get $resource_info resourceName] - Sitewide Admin" set context [list $title] + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: