Index: openacs-4/packages/dotlrn-bootstrap3-theme/dotlrn-bootstrap3-theme.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bootstrap3-theme/dotlrn-bootstrap3-theme.info,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/dotlrn-bootstrap3-theme/dotlrn-bootstrap3-theme.info	20 Feb 2017 10:30:02 -0000	1.1.2.1
+++ openacs-4/packages/dotlrn-bootstrap3-theme/dotlrn-bootstrap3-theme.info	22 Feb 2017 12:58:34 -0000	1.1.2.2
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="2.9.1b1" url="http://openacs.org/repository/download/apm/dotlrn-bootstrap3-theme-2.9.1b1.apm">
+    <version name="2.9.1b2" url="http://openacs.org/repository/download/apm/dotlrn-bootstrap3-theme-2.9.1b2.apm">
        <owner url="mailto:manderga@wu.ac.at">manderga</owner>
         <release-date>2017-02-20</release-date>
         <vendor url="http://wu.ac.at">WU Vienna</vendor>
         <summary>Provides a Theme for DotLRN based on Twitter Bootstrap</summary>
         <maturity>0</maturity>
 
-        <provides url="dotlrn-bootstrap3-theme" version="2.9.1b1"/>
+        <provides url="dotlrn-bootstrap3-theme" version="2.9.1b2"/>
         <requires url="dotlrn" version="2.9.1b1"/>
         <requires url="openacs-bootstrap3-theme" version="5.9.1b1"/>
 
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.1 -r1.1.2.1
--- openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-streaming-head.tcl	20 Feb 2017 09:49:14 -0000	1.1
+++ openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-streaming-head.tcl	22 Feb 2017 12:58:34 -0000	1.1.2.1
@@ -1,16 +1,19 @@
 
 set streaming_head 1
+set subsite_logo "/resources/openacs-bootstrap3-theme/images/logo_dotlrn_xs.png"
 
 if {![info exists subsite_link]} {
     set subsite_link "/"
 }
 
-if {![info exists title]}     { set title     [ad_system_name]   }
-if {![info exists doc(title)]}     { set doc(title)     $title   }
-if {[info exists context]}      { set context_bar [ad_context_bar {*}$context]}
+if {![info exists doc(title)]} {
+    set doc(title) [ad_system_name]
+}
+if {[info exists context]} {
+    set context_bar [ad_context_bar {*}$context]
+}
 
 
-
 ###########################
 # dotLRN stuff            #
 ###########################
@@ -49,7 +52,8 @@
 set control_panel_text [_ acs-subsite.Admin]
 
 # Set dotlrn navbar
-if { !([info exists no_navbar_p] && $no_navbar_p ne "" && $no_navbar_p) && [info exists portal_id] && $portal_id ne "" } {
+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 {
@@ -59,12 +63,12 @@
     set extra_spaces "<img src=\"/resources/dotlrn/spacer.gif\" alt=\"\" border='0' width='15'>"    
     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 ""
@@ -106,13 +110,20 @@
 
 if { [info exists prefer_text_only_p]
      && $prefer_text_only_p == "f"
-     && [ad_graphics_site_available_p] } {
-  template::multirow append attribute background \
-    [parameter::get -package_id $pkg_id -parameter background -default "/graphics/bg.gif"]
+     && [ad_graphics_site_available_p]
+ } {
+    template::multirow append attribute background \
+	[parameter::get -package_id $pkg_id -parameter background -default "/graphics/bg.gif"]
 }
 
 # User messages
 util_get_user_messages -multirow user_messages
 
+#
+# Security setup
+#
 set csrf [security::csrf::new]
 
+security::csp::require style-src maxcdn.bootstrapcdn.com
+security::csp::require script-src maxcdn.bootstrapcdn.com
+security::csp::require font-src maxcdn.bootstrapcdn.com