Index: openacs-4/packages/theme-zen/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/tcl/apm-callback-procs.tcl,v diff -u -N -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/theme-zen/tcl/apm-callback-procs.tcl 20 Aug 2020 13:38:52 -0000 1.3.2.1 +++ openacs-4/packages/theme-zen/tcl/apm-callback-procs.tcl 20 Aug 2020 13:40:58 -0000 1.3.2.2 @@ -118,7 +118,7 @@ [list region 3] ] package_exec_plsql -var_list $var_list portal_layout add_region - + set var_list [list \ [list name "#theme-zen.Zen_Theme#"] \ [list description "#theme-zen.Zen_Theme#"] \ @@ -138,24 +138,24 @@ -name #theme-zen.Zen_Theme# \ -template /packages/theme-zen/lib/lrn-master \ -css { - {-href /resources/acs-templating/forms.css -media all} - {-href /resources/acs-templating/lists.css -media all} - {-href "/resources/acs-subsite/default-master.css" -media "screen" -order 1} - {-href "/resources/theme-zen/css/main.css" -media "screen" -order 2} - {-href "/resources/theme-zen/css/print.css" -media "print" -order 3} - {-href "/resources/theme-zen/css/handheld.css" -media "handheld" -order 4} - {-alternate -href "/resources/theme-zen/css/highContrast.css" -title "highContrast"} - {-alternate -href "/resources/theme-zen/css/508.css" -title "508"} - } \ - -js { - {-src "/resources/theme-zen/js/styleswitcher.js"} - } \ + {-href /resources/acs-templating/forms.css -media all} + {-href /resources/acs-templating/lists.css -media all} + {-href "/resources/acs-subsite/default-master.css" -media "screen" -order 1} + {-href "/resources/theme-zen/css/main.css" -media "screen" -order 2} + {-href "/resources/theme-zen/css/print.css" -media "print" -order 3} + {-href "/resources/theme-zen/css/handheld.css" -media "handheld" -order 4} + {-alternate -href "/resources/theme-zen/css/highContrast.css" -title "highContrast"} + {-alternate -href "/resources/theme-zen/css/508.css" -title "508"} + } \ + -js { + {-src "/resources/theme-zen/js/styleswitcher.js"} + } \ -form_template "" \ -list_template "" \ -list_filter_template "" \ - -dimensional_template "" + -dimensional_template "" } - + subsite::set_theme -theme dotlrn_zen } @@ -182,35 +182,35 @@ } { if {[apm_version_names_compare $from_version_name "2.9.0d4"] == -1 && [apm_version_names_compare $to_version_name "2.9.0d4"] > -1} { - ns_log notice "-- upgrading to 2.9.0d4" + ns_log notice "-- upgrading to 2.9.0d4" - # - # Register the theme if not already there - # - set themes [db_list get_themes {select key from subsite_themes}] - if {"dotlrn_zen" ni $themes} { - subsite::new_subsite_theme \ - -key dotlrn_zen \ - -name #theme-zen.Zen_Theme# \ - -template /packages/theme-zen/lib/lrn-master \ - -css { - {-href /resources/acs-templating/forms.css -media all} - {-href /resources/acs-templating/lists.css -media all} - {-href "/resources/acs-subsite/default-master.css" -media "screen" -order 1} - {-href "/resources/theme-zen/css/main.css" -media "screen" -order 2} - {-href "/resources/theme-zen/css/print.css" -media "print" -order 3} - {-href "/resources/theme-zen/css/handheld.css" -media "handheld" -order 4} - {-alternate -href "/resources/theme-zen/css/highContrast.css" -title "highContrast"} - {-alternate -href "/resources/theme-zen/css/508.css" -title "508"} - } \ - -js { - {-src "/resources/theme-zen/js/styleswitcher.js"} - } \ - -form_template "" \ - -list_template "" \ - -list_filter_template "" \ - -dimensional_template "" - } + # + # Register the theme if not already there + # + set themes [db_list get_themes {select key from subsite_themes}] + if {"dotlrn_zen" ni $themes} { + subsite::new_subsite_theme \ + -key dotlrn_zen \ + -name #theme-zen.Zen_Theme# \ + -template /packages/theme-zen/lib/lrn-master \ + -css { + {-href /resources/acs-templating/forms.css -media all} + {-href /resources/acs-templating/lists.css -media all} + {-href "/resources/acs-subsite/default-master.css" -media "screen" -order 1} + {-href "/resources/theme-zen/css/main.css" -media "screen" -order 2} + {-href "/resources/theme-zen/css/print.css" -media "print" -order 3} + {-href "/resources/theme-zen/css/handheld.css" -media "handheld" -order 4} + {-alternate -href "/resources/theme-zen/css/highContrast.css" -title "highContrast"} + {-alternate -href "/resources/theme-zen/css/508.css" -title "508"} + } \ + -js { + {-src "/resources/theme-zen/js/styleswitcher.js"} + } \ + -form_template "" \ + -list_template "" \ + -list_filter_template "" \ + -dimensional_template "" + } } }