Merge branch 'release/6.4.0'

.github/workflows/test-and-deploy.yaml

@@ -108,6 +108,7 @@ jobs:
       || github.event_name == 'release'
     runs-on: ubuntu-20.04
     needs: [
+      test-django-system-check,
       test-content,
       test-general,
       test-resources,
@@ -149,6 +150,7 @@ jobs:
       || github.event_name == 'release'
     runs-on: ubuntu-20.04
     needs: [
+      test-django-system-check,
       test-content,
       test-general,
       test-resources,
@@ -207,6 +209,7 @@ jobs:
         ]
       fail-fast: true
     needs: [
+      test-django-system-check,
       test-content,
       test-general,
       test-resources,

csunplugged/config/__init__.py

@@ -1,3 +1,3 @@
 """Module for Django system configuration."""
 
-__version__ = "6.3.0"
+__version__ = "6.4.0"

csunplugged/config/settings/base.py

@@ -62,6 +62,7 @@
     "search.apps.SearchConfig",
     "classic.apps.ClassicConfig",
     "at_home.apps.AtHomeConfig",
+    "moocs.apps.MoocsConfig",
 ]
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps

csunplugged/config/urls.py

@@ -18,6 +18,7 @@
     path('resources/', include('resources.urls', namespace='resources')),
     path('at-home/', include('at_home.urls', namespace='at_home')),
     path('plugging-it-in/', include('plugging_it_in.urls', namespace='plugging_it_in')),
+    path('moocs/', include('moocs.urls', namespace='moocs')),
 )
 
 urlpatterns += [

csunplugged/gulpfile.js

@@ -50,6 +50,7 @@ function pathsConfig(appName) {
         scss_source: `${staticSourceRoot}/scss`,
         js_source: `${staticSourceRoot}/js`,
         images_source: `${staticSourceRoot}/img`,
+        files_source: `${staticSourceRoot}/files`,
         vendor_js_source: [
             `${vendorsRoot}/jquery/dist/jquery.js`,
             `${vendorsRoot}/popper.js/dist/umd/popper.js`,
@@ -63,6 +64,7 @@ function pathsConfig(appName) {
         fonts_output: `${staticOutputRoot}/fonts`,
         images_output: `${staticOutputRoot}/img`,
         js_output: `${staticOutputRoot}/js`,
+        files_output: `${staticOutputRoot}/files`,
     }
 }
 
@@ -167,6 +169,12 @@ function img() {
         .pipe(dest(paths.images_output))
 }
 
+// Downloadable files
+function files() {
+    return src(`${paths.files_source}/**/*`)
+        .pipe(dest(paths.files_output))
+}
+
 // Browser sync server for live reload
 // TODO: Not yet working
 // function initBrowserSync() {
@@ -202,7 +210,8 @@ const generateAssets = parallel(
     scss,
     js,
     vendorJs,
-    img
+    img,
+    files
 )
 
 // Set up dev environment

csunplugged/moocs/__init__.py

@@ -0,0 +1 @@
+"""Module for the MOOCs application."""

csunplugged/moocs/apps.py

@@ -0,0 +1,9 @@
+"""Application configuration for the MOOCs application."""
+
+from django.apps import AppConfig
+
+
+class MoocsConfig(AppConfig):
+    """Configuration object for the MOOCs application."""
+
+    name = "moocs"

csunplugged/moocs/urls.py

@@ -0,0 +1,14 @@
+"""URL routing for the moocs application."""
+
+from django.urls import path
+
+from . import views
+
+app_name = 'moocs'
+urlpatterns = [
+    path(
+        '',
+        views.MoocsIndexView.as_view(),
+        name="index"
+    ),
+]

csunplugged/moocs/views.py

@@ -0,0 +1,9 @@
+"""Views for the MOOCs application."""
+
+from django.views.generic import TemplateView
+
+
+class MoocsIndexView(TemplateView):
+    """View for the MOOCs homepage that renders from a template."""
+
+    template_name = "moocs/index.html"

csunplugged/package.json

@@ -5,12 +5,12 @@
     "dependencies": {},
     "devDependencies": {
         "ansi-colors": "4.1.1",
-        "autoprefixer": "10.3.6",
+        "autoprefixer": "10.3.7",
         "bootstrap": "4.6.0",
         "browser-sync": "2.27.5",
         "browserify": "17.0.0",
         "child_process": "1.0.2",
-        "codemirror": "5.63.1",
+        "codemirror": "5.63.3",
         "cssnano": "5.0.8",
         "details-element-polyfill": "2.4.0",
         "fancy-log": "1.3.3",
@@ -30,9 +30,9 @@
         "multiple-select": "1.5.2",
         "pixrem": "5.0.0",
         "popper.js": "1.16.1",
-        "postcss": "8.3.8",
+        "postcss": "8.3.9",
         "postcss-flexbugs-fixes": "5.0.2",
-        "sass": "1.42.1",
+        "sass": "1.43.2",
         "scratchblocks": "uccser/scratchblocks#master",
         "vinyl-buffer": "1.0.1",
         "yargs": "17.2.1"

csunplugged/static/img/moocs/edx-logo.svg-LICENSE

@@ -0,0 +1,2 @@
+edX logo is a registered trademarks of edX Inc. All Rights Reserved.
+Used with permission from https://www.edx.org/media-kit

csunplugged/static/scss/website.scss

@@ -442,7 +442,7 @@ body {
 }
 
 ol, ul {
-    margin-bottom: 1rem !important;
+    margin-bottom: 1rem;
 }
 
 .large-text {
@@ -485,6 +485,12 @@ ol, ul {
         background-color: mix($educator-colour, $white, 10%);
       }
     }
+    &-educator-4 {
+      border-top-color: mix($educator-colour, $white, 40%);
+      &:hover {
+        background-color: mix($educator-colour, $white, 10%);
+      }
+    }
     &-at-home-1 {
       border-top-color: $at-home-colour;
       &:hover {
@@ -902,3 +908,15 @@ button:hover .icon-search {
     height: 2.5rem;
     width: auto;
 }
+
+#classic-cs-unplugged-logo {
+    height: 5rem;
+}
+
+
+// MOOCs
+
+.edx-logo {
+    height: 3rem;
+    margin-left: 0.5rem;
+}

csunplugged/templates/general/index.html

@@ -20,16 +20,16 @@ <h1 class="text-center text-white text-shadow">
             </h1>
             <div class="row justify-content-center">
                 <div class="col-12 col-md-10 col-lg-8 text-center">
-                    {% if LANGUAGE_CODE == "en" %}
-                        <a class="btn btn-warning text-wrap mb-3" role="button" href="{% url 'at_home:index' %}">
-                            <strong>COVID-19</strong>: Click here to see how to use CS Unplugged at home
-                        </a>
-                    {% endif %}
                     <p class="lead text-light text-wrap text-shadow">
                         {% blocktrans trimmed %}
                             CS Unplugged is a collection of free teaching material that teaches Computer Science through engaging games and puzzles that use cards, string, crayons and lots of running around.
                         {% endblocktrans %}
                     </p>
+                    {% if LANGUAGE_CODE == "en" %}
+                        <a class="btn btn-info text-wrap mb-4" role="button" href="{% url 'moocs:index' %}">
+                            <strong>New online course for educators available</strong> - Click here to learn more
+                        </a>
+                    {% endif %}
                 </div>
             </div>
         </div>
@@ -76,6 +76,11 @@ <h3 class="mb-0">
                         {% trans "Curriculum Integrations" %}
                     </h3>
                 </a>
+                <a class="link-item link-item-top link-item-top-educator-4 no-text-decoration d-block mb-3" href="{% url 'moocs:index' %}">
+                    <h3 class="mb-0">
+                        {% trans "Online Courses" %}
+                    </h3>
+                </a>
             </div>
             <div class="col-12 col-md-4 mb-4">
                 <h2 class="at-home-colour">At home</h2>
@@ -102,10 +107,8 @@ <h3 class="mb-0">
         </div>
         <div class="text-center my-5">
             <p class="lead mb-2">The original activities are still available at</p>
-            <a class="link-item link-item-top link-item-top-orange no-text-decoration d-inline-block" href="https://classic.csunplugged.org/">
-                <h3 class="mb-0">
-                    {% trans "Classic CS Unplugged" %}
-                </h3>
+            <a class="no-text-decoration d-inline-block" href="https://classic.csunplugged.org/">
+                <img class="img-fluid" id="classic-cs-unplugged-logo" src="{% static 'img/cs-unplugged-classic-logo.svg' %}" alt="{% trans "Classic CS Unplugged" %}">
             </a>
         </div>
     </div>

csunplugged/templates/generic/classic-unplugged-button.html

@@ -18,7 +18,7 @@ <h2>{% trans "Translations for some activities available at the Classic CS Unplu
       <div class="col-12 col-md-7 text-center text-md-{{LANGUAGE_START}}">
       </div>
       <div class="d-none col-md-5 d-md-flex justify-content-end align-items-end">
-        <img class="img-fluid" src="{% static 'img/classic-cs-unplugged-logo.png' %}">
+        <img class="img-fluid" src="{% static 'img/cs-unplugged-classic-logo.svg' %}" alt="{% trans "Classic CS Unplugged" %}">
       </div>
     </div>
   </a>