Index: openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl 28 Jun 2015 11:58:50 -0000 1.9 +++ openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl 7 Aug 2017 23:48:09 -0000 1.10 @@ -20,7 +20,7 @@ # Instructions: # # 1. Put this file and it's .adp file into the server's /www directory. -# That's the one with the "default-master" tcl and adp files. You don't +# That's the one with the "default-master" Tcl and adp files. You don't # have to edit or remove the "default-master" files, since they will be # ignored by the next step. # @@ -34,7 +34,7 @@ # at the top of the page, the title of the pages, the fonts of the portlets, etc. # # WARNING: All current portlet themes (table, deco, nada, etc) depend on some -# of the CSS defined below. Be carefull when you edit the CSS below, +# of the CSS defined below. Be careful when you edit the CSS below, # and check how themes use it. # # @@ -65,8 +65,8 @@ set header_img_file "[acs_root_dir]/packages/dotlrn/www/resources/logo" set header_img_alt_text "Header Logo" -set extra_spaces "" -set td_align "align=\"center\" valign=\"top\"" +set extra_spaces {} +set td_align {align="center" valign="top"} if {$community_id ne ""} { @@ -79,7 +79,7 @@ # navbar vars set show_navbar_p 1 -if {([info exists no_navbar_p] && $no_navbar_p ne "") && $no_navbar_p} { +if {[info exists no_navbar_p] && $no_navbar_p ne "" && $no_navbar_p} { set show_navbar_p 0 } @@ -114,8 +114,8 @@ set link [dotlrn_community::get_community_url $community_id] set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id -community_id $community_id] - if { $show_navbar_p } { - set make_navbar_p 1 + if { $show_navbar_p } { + set make_navbar_p 1 } else { set make_navbar_p 0 @@ -128,9 +128,9 @@ set link [dotlrn::get_url] # in a community type set text \ - [dotlrn_community::get_community_type_name [dotlrn_community::get_community_type]] + [dotlrn_community::get_community_type_name [dotlrn_community::get_community_type]] - if {$show_navbar_p} { + if {$show_navbar_p} { set make_navbar_p 1 } else { set make_navbar_p 0 @@ -145,7 +145,7 @@ set make_navbar_p 1 if {$show_navbar_p} { } else { - set make_navbar_p 0 + set make_navbar_p 0 } } @@ -178,17 +178,18 @@ if {[dotlrn_community::subcommunity_p -community_id $community_id]} { #The colors for a subgroup are set by the parent group with a few overwritten. - set comm_type [dotlrn_community::get_community_type_from_community_id [dotlrn_community::get_parent_id -community_id $community_id]] + set comm_type [dotlrn_community::get_community_type_from_community_id \ + [dotlrn_community::get_parent_id -community_id $community_id]] } if {$comm_type eq "dotlrn_club"} { - #community colors - set scope_name "comm" - set scope_main_color "#" - set scope_header_color "#" - set scope_z_dark "#" - set scope_z_light "#" - set scope_light_border "#" + #community colors + set scope_name "comm" + set scope_main_color "#" + set scope_header_color "#" + set scope_z_dark "#" + set scope_z_light "#" + set scope_light_border "#" if {[dotlrn_community::subcommunity_p -community_id $community_id]} { set scope_z_dark "#" set scope_z_light "#" @@ -205,56 +206,56 @@ set scope_z_light "#ECF3F0" } } - + # DRB: default logo for dotlrn is a JPEG provided by Collaboraid. This can - # be replaced by custom gifs if prefered (as is done by SloanSpace) + # be replaced by custom gifs if preferred (as is done by SloanSpace) if { [file exists "$header_img_file-$scope_name.jpg"] } { set header_img_url "$header_img_url-$scope_name.jpg" } elseif { [file exists "$header_img_file-$scope_name.gif"] } { set header_img_url "$header_img_url-$scope_name.gif" } - - # set header_img_url "$header_img_url-$scope_name.gif" + + # set header_img_url "$header_img_url-$scope_name.gif" - # font hack - set community_header_font [dotlrn_community::get_attribute \ - -community_id $community_id \ - -attribute_name header_font - ] + # font hack + set community_header_font [dotlrn_community::get_attribute \ + -community_id $community_id \ + -attribute_name header_font + ] if {$community_header_font ne ""} { set header_font "$community_header_font,$header_font" } set header_font_size [dotlrn_community::get_attribute \ - -community_id $community_id \ - -attribute_name header_font_size - ] + -community_id $community_id \ + -attribute_name header_font_size + ] set header_font_color [dotlrn_community::get_attribute \ - -community_id $community_id \ - -attribute_name header_font_color - ] + -community_id $community_id \ + -attribute_name header_font_color + ] # logo hack set header_logo_item_id [dotlrn_community::get_attribute \ - -community_id $community_id \ - -attribute_name header_logo_item_id - ] + -community_id $community_id \ + -attribute_name header_logo_item_id + ] if {$header_logo_item_id ne ""} { # Need filename set item_id [content::revision::item_id -revision_id $header_logo_item_id] set header_img_url "[subsite::get_url]image/$item_id" } - - + + set header_logo_alt_text [dotlrn_community::get_attribute \ - -community_id $community_id \ - -attribute_name header_logo_alt_text - ] + -community_id $community_id \ + -attribute_name header_logo_alt_text + ] if {$header_logo_alt_text ne ""} { set header_img_alt_text $header_logo_alt_text @@ -269,12 +270,12 @@ } elseif {[parameter::get -parameter community_type_level_p] == 1} { # in a community type (subject) set text \ - [dotlrn_community::get_community_type_name [dotlrn_community::get_community_type]] + [dotlrn_community::get_community_type_name [dotlrn_community::get_community_type]] } else { # under /dotlrn # DRB: default logo for dotlrn is a JPEG provided by Collaboraid. This can - # be replaced by custom gifs if prefered (as is done by SloanSpace) + # be replaced by custom gifs if preferred (as is done by SloanSpace) if { [file exists "$header_img_file-$scope_name.jpg"] } { set header_img_url "$header_img_url-$scope_name.jpg" @@ -291,15 +292,13 @@ } else { set link_control_panel 0 } - set extra_spaces [subst {] set navbar [dotlrn::portal_navbar \ - -user_id $user_id \ - -link_control_panel $link_control_panel \ - -control_panel_text $control_panel_text \ - -pre_html $extra_spaces \ - -post_html $extra_spaces \ - -link_all $link_all - ] + -user_id $user_id \ + -link_control_panel $link_control_panel \ + -control_panel_text $control_panel_text \ + -pre_html $extra_spaces \ + -post_html $extra_spaces \ + -link_all $link_all] } else { set navbar "
" } @@ -313,10 +312,10 @@ # Developer-support support set ds_enabled_p [parameter::get_from_package_key \ - -package_key acs-developer-support \ - -parameter EnabledOnStartupP \ - -default 0 -] + -package_key acs-developer-support \ + -parameter EnabledOnStartupP \ + -default 0 + ] if {$ds_enabled_p} { set ds_link [ds_link] @@ -336,9 +335,9 @@ set acs_lang_url [apm_package_url_from_key "acs-lang"] set lang_admin_p [permission::permission_p \ - -object_id [site_node::get_element -url $acs_lang_url -element object_id] \ - -privilege admin \ - -party_id [ad_conn untrusted_user_id]] + -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] } }] # Curriculum bar @@ -349,162 +348,162 @@ ################################# set recolor_css_template { -/* $scope_name substitutions: C8D8BE -> ${color1} */ + /* $scope_name substitutions: C8D8BE -> ${color1} */ -#page-body { - border-top: 1px solid #${color1}; - border-bottom: 1px solid #${color1}; - } + #page-body { + border-top: 1px solid #${color1}; + border-bottom: 1px solid #${color1}; +} #system-name { - color: #${color1}; - } + color: #${color1}; +} #main-container { - background: #${color1}; - } + background: #${color1}; +} #footer li { - color: #${color1}; - } + color: #${color1}; +} #locale li { - color: #${color1}; - } + color: #${color1}; +} /* $scope_name substitutions: 95BC7E -> ${color2} */ /* This messes up the tabs in IE6 -- see dotlrn-master.css for more info. a:hover { - border-bottom: 1px solid #${color2}; - color: #${color2}; - } + border-bottom: 1px solid #${color2}; + color: #${color2}; +} */ #main-container { - border-top: 5px solid #${color2}; - border-bottom: 1px solid #${color2}; + border-top: 5px solid #${color2}; + border-bottom: 1px solid #${color2}; } .portlet h2 { - background-color: #${color2}; + background-color: #${color2}; } .portlet ul li { - color: #${color2}; + color: #${color2}; } .actions a:hover { - border-bottom: 1px solid #${color2}; - color: #${color2}; + border-bottom: 1px solid #${color2}; + color: #${color2}; } #admin-portlet { background-color: white; border: 1px solid #${color2}; padding: .5em; - } +} /* $scope_name substitutions: 035156 -> ${color3} */ a:link, a:visited { - border-bottom: 1px solid #${color3}; - color: #${color3}; - text-decoration: none; - } + border-bottom: 1px solid #${color3}; + color: #${color3}; + text-decoration: none; +} a:visited { - border-bottom: 1px solid #${color3}; - /* Mangler visited color */ - color: #${color3}; - } + border-bottom: 1px solid #${color3}; + /* Mangler visited color */ + color: #${color3}; +} a:active { - border-bottom: 1px solid #${color3}; - color: #${color3}; - } + border-bottom: 1px solid #${color3}; + color: #${color3}; +} h1 { - color: #${color3}; - } + color: #${color3}; +} #breadcrumbs li { - color: #${color3}; - } + color: #${color3}; +} #breadcrumbs a { - color: #${color3}; - } + color: #${color3}; +} #login-status { - color: #${color3}; - } + color: #${color3}; +} #login-status a { - color: #${color3}; - } + color: #${color3}; +} #main-navigation a:hover { - color: #${color3}; - } + color: #${color3}; +} #main-navigation li.current a { - color: #${color3}; - } + color: #${color3}; +} #locale .current { - color: #${color3}; - } + color: #${color3}; +} .portlet h2 { - color: #${color3}; - border-top: 1px solid #${color3}; - border-bottom: 1px solid #${color3}; - } + color: #${color3}; + border-top: 1px solid #${color3}; + border-bottom: 1px solid #${color3}; +} .portlet ul ul li { - color: #${color3}; - } + color: #${color3}; +} /* $scope_name substitutions: E8F0E3 -> ${color4} */ #page-body { - background-color: #${color4}; - } + background-color: #${color4}; +} .calendar-week-summary .odd { - background-color: #${color4}; - } + background-color: #${color4}; +} /* $scope_name substitutions: E35203 -> ${color5} */ #message-bar { - background-color: #${color5}; - } + background-color: #${color5}; +} /* $scope_name substitutions: tabs */ #main-navigation li { - background: url("/resources/dotlrn/01_tab_pass_des.png") no-repeat right top; - } + background: url("/resources/dotlrn/01_tab_pass_des.png") no-repeat right top; +} #main-navigation a { - background: url("/resources/dotlrn/01_tab_pass_sin.png") no-repeat left top; - } + background: url("/resources/dotlrn/01_tab_pass_sin.png") no-repeat left top; +} #main-navigation li.current { - background-image: url("/resources/dotlrn/01_tab_act_des.png"); - } + background-image: url("/resources/dotlrn/01_tab_act_des.png"); +} #main-navigation li.current a { - background-image: url("/resources/dotlrn/01_tab_act_sin.png"); - } + background-image: url("/resources/dotlrn/01_tab_act_sin.png"); +} #admin-portlet h1 { font-size: 1.5em; - } +} } @@ -531,7 +530,7 @@ set recolor_css "" } } - + template::head::add_style -style " $recolor_css @@ -541,3 +540,9 @@ FONT-FAMILY: $header_font; } " + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: