Merge branch 'master' of /home/git/git/icp

dev/run-container.sh

@@ -1,7 +1,11 @@
 #!/bin/bash
 
 # Priviledged mode for running docker inside docker.
-docker run -p 8080:80 -h hps -d --rm --privileged -v $PWD/../:/data/ -v /etc/letsencrypt/archive/oer.hps.vi4io.org/:/data/ssl kunkel/oer # -d
+if [[ $HOSTNAME == "kunkel-ThinkPad-X1-Carbon-5th" ]] ; then
+docker run -p 8080:80 -h hps -it --rm --privileged -v $PWD/../:/data/ kunkel/oer # -d
+else # SSL mode
+docker run -p 8080:80 -h hps -it --rm --privileged -v $PWD/../:/data/ -v /etc/letsencrypt/archive/oer.hps.vi4io.org/:/data/ssl kunkel/oer # -d
+fi
 
 # local mode:
 # docker run -p 127.0.0.1:8080:80 -h hps -it --rm --privileged -v $PWD/../:/data/ kunkel/oer # -d

src/courses/templates/courses/course.html

@@ -31,7 +31,7 @@
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
 
-	
+
 	<!-- code editor syntax highligh -->
 	<link rel="stylesheet" href="{% static 'lib/codemirror' %}/lib/codemirror.css">
 	<script src="{% static 'lib/codemirror' %}/lib/codemirror.js"></script>
@@ -55,7 +55,7 @@
 <!-- -->
 <div id="head-container" style="position: relative; top: -2em;">
     <div id="dummy" style="margin-top: 8px;"></div>
-    <div id="element" style="background-image: url({% static 'frontend/drawing_nocredit.png' %}); background-size: 50% auto; background-repeat: repeat-x;">&nbsp;</div>
+    <div id="element" style="background-color:#d61926;">&nbsp;</div>
 </div>
 <!-- -->
 
@@ -154,7 +154,7 @@ slide_data: {{ slide_data }}</br>
 	<input type="submit" class="btn btn-default btn-lg"  value="Continue &raquo;" id="continue" {% if slide.grading %}disabled{% else %}{% endif %} />
 </form>
 {% endif %}
-			
+
 
 {% if slide.grading %}
 {% block exercise_buttons %}
@@ -227,19 +227,19 @@ window.data = {
 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
 <script src="{% static 'lib/bootstrap/assets/js/ie10-viewport-bug-workaround.js' %}"></script>
 
-<!-- addition libraries -->	
+<!-- addition libraries -->
 <script src="{% static 'lib/json2.js' %}"></script>
 
 <!-- custom javascript for courseware -->
 <script src="{% static 'misc/jquery-django-csrf-fix.js' %}"></script>
 <script src="{% static 'courses/offcanvas.js' %}"></script>
 <script src="{% static 'courses/eventstream.js' %}"></script>
-<script src="{% static 'misc/youtube_api.js' %}"></script>
+<!-- <script src="{% static 'misc/youtube_api.js' %}"></script> -->
 
 {% block exercise_script %}
 <script type="text/javascript" src="{% static 'generated_exercises' %}/{{ slide.slide_type }}/script.js"></script>
 {% endblock %}
 
-	
+
 </body>
 </html>

src/frontend/static/frontend/index/theme.css

@@ -1,6 +1,6 @@
 /*! Generated by Live LESS Theme Customizer */
 
-@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic");
+/*@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic");*/
 /*!
  * Bootstrap v3.3.5 (https://getbootstrap.com)
  * Copyright 2011-2015 Twitter, Inc.

src/frontend/static/frontend/index/theme_lighter-component active.css

@@ -1,6 +1,6 @@
 /*! Generated by Live LESS Theme Customizer */
 
-@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic");
+/* @import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic"); */
 /*!
  * Bootstrap v3.3.5 (http://getbootstrap.com)
  * Copyright 2011-2015 Twitter, Inc.