Index: openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-streaming-head.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-streaming-head.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-streaming-head.tcl 7 Aug 2017 23:48:09 -0000 1.2
+++ openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-streaming-head.tcl 9 Feb 2020 15:34:41 -0000 1.2.2.1
@@ -1,4 +1,3 @@
-
set streaming_head 1
set subsite_logo "/resources/openacs-bootstrap3-theme/images/logo_dotlrn_xs.png"
@@ -18,9 +17,7 @@
# dotLRN stuff #
###########################
-# $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]
@@ -42,7 +39,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
@@ -60,15 +57,15 @@
set youarehere "[_ theme-zen.MySpace]"
}
- set extra_spaces ""
+ set extra_spaces ""
set dotlrn_navbar [zen::portal_navbar]
set dotlrn_subnavbar [zen::portal_subnavbar \
- -user_id $user_id \
- -control_panel_text $control_panel_text \
- -pre_html "$extra_spaces" \
- -post_html $extra_spaces \
- -link_all $link_all
- ]
+ -user_id $user_id \
+ -control_panel_text $control_panel_text \
+ -pre_html "$extra_spaces" \
+ -post_html $extra_spaces \
+ -link_all $link_all
+ ]
} else {
set dotlrn_navbar ""
set dotlrn_subnavbar ""
@@ -91,8 +88,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
}
@@ -113,7 +110,7 @@
&& [ad_graphics_site_available_p]
} {
template::multirow append attribute background \
- [parameter::get -package_id $pkg_id -parameter background -default "/graphics/bg.gif"]
+ [parameter::get -package_id $pkg_id -parameter background -default "/graphics/bg.gif"]
}
# User messages
@@ -127,3 +124,9 @@
security::csp::require style-src maxcdn.bootstrapcdn.com
security::csp::require script-src maxcdn.bootstrapcdn.com
security::csp::require font-src maxcdn.bootstrapcdn.com
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End: