From 9fae21ba2d7fce1ab93dbe79213687279c58b32d Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 25 Jul 2025 17:17:49 +0200
Subject: [PATCH 01/63] Add content elements from lernanta

---
 content/__init__.py                           |   0
 content/db.py                                 |  17 +
 content/forms.py                              |   9 +
 content/migrations/0001_initial.py            |  39 +
 content/migrations/__init__.py                |   0
 content/models.py                             | 106 +++
 content/templatetags/__init__.py              |   0
 content/templatetags/content_tags.py          |  27 +
 content/tests.py                              |  59 ++
 content/utils.py                              |  16 +
 courses/__init__.py                           |   0
 courses/admin.py                              |   6 +
 courses/badges_oembed.py                      |  39 +
 courses/db.py                                 |  77 ++
 courses/decorators.py                         |  20 +
 courses/export.py                             |  15 +
 courses/forms.py                              |  65 ++
 courses/models.py                             | 632 ++++++++++++++++
 courses/templates/courses/content.html        |  65 ++
 .../courses/content_form_buttons_snip.html    |  15 +
 .../templates/courses/content_form_snip.html  |  51 ++
 courses/templates/courses/course.html         |  24 +
 .../courses/course_admin_content.html         |  37 +
 .../courses/course_announcement.html          |  21 +
 courses/templates/courses/course_badges.html  |  58 ++
 courses/templates/courses/course_base.html    |  93 +++
 .../courses/course_comment_snip.html          |  41 +
 .../courses/course_delete_confirmation.html   |  22 +
 .../templates/courses/course_discussion.html  |  40 +
 courses/templates/courses/course_people.html  |  40 +
 .../templates/courses/course_settings.html    | 196 +++++
 courses/templates/courses/course_sidebar.html |  84 +++
 .../templates/courses/course_user_snip.html   |  24 +
 courses/templates/courses/create_content.html |  72 ++
 courses/templates/courses/create_course.html  |  72 ++
 courses/templates/courses/edit_content.html   |  68 ++
 .../courses/emails/course_announcement.txt    |   5 +
 .../emails/course_announcement_subject.txt    |   3 +
 .../templates/courses/emails/course_join.txt  |  10 +
 .../courses/emails/course_join_subject.txt    |   3 +
 .../courses/preview_content_snip.html         |   3 +
 courses/tests.py                              | 200 +++++
 courses/urls.py                               | 128 ++++
 courses/utils.py                              |  35 +
 courses/views.py                              | 706 ++++++++++++++++++
 learnwithpeople/settings.py                   |   3 +
 learnwithpeople/urls.py                       |   1 +
 media/__init__.py                             |   0
 media/db.py                                   |   7 +
 media/migrations/0001_initial.py              |  22 +
 media/migrations/__init__.py                  |   0
 media/models.py                               |  23 +
 52 files changed, 3299 insertions(+)
 create mode 100755 content/__init__.py
 create mode 100755 content/db.py
 create mode 100755 content/forms.py
 create mode 100644 content/migrations/0001_initial.py
 create mode 100644 content/migrations/__init__.py
 create mode 100755 content/models.py
 create mode 100755 content/templatetags/__init__.py
 create mode 100755 content/templatetags/content_tags.py
 create mode 100755 content/tests.py
 create mode 100755 content/utils.py
 create mode 100755 courses/__init__.py
 create mode 100644 courses/admin.py
 create mode 100755 courses/badges_oembed.py
 create mode 100755 courses/db.py
 create mode 100755 courses/decorators.py
 create mode 100755 courses/export.py
 create mode 100755 courses/forms.py
 create mode 100755 courses/models.py
 create mode 100755 courses/templates/courses/content.html
 create mode 100755 courses/templates/courses/content_form_buttons_snip.html
 create mode 100755 courses/templates/courses/content_form_snip.html
 create mode 100755 courses/templates/courses/course.html
 create mode 100755 courses/templates/courses/course_admin_content.html
 create mode 100755 courses/templates/courses/course_announcement.html
 create mode 100755 courses/templates/courses/course_badges.html
 create mode 100755 courses/templates/courses/course_base.html
 create mode 100755 courses/templates/courses/course_comment_snip.html
 create mode 100755 courses/templates/courses/course_delete_confirmation.html
 create mode 100755 courses/templates/courses/course_discussion.html
 create mode 100755 courses/templates/courses/course_people.html
 create mode 100755 courses/templates/courses/course_settings.html
 create mode 100755 courses/templates/courses/course_sidebar.html
 create mode 100755 courses/templates/courses/course_user_snip.html
 create mode 100755 courses/templates/courses/create_content.html
 create mode 100755 courses/templates/courses/create_course.html
 create mode 100755 courses/templates/courses/edit_content.html
 create mode 100755 courses/templates/courses/emails/course_announcement.txt
 create mode 100755 courses/templates/courses/emails/course_announcement_subject.txt
 create mode 100755 courses/templates/courses/emails/course_join.txt
 create mode 100755 courses/templates/courses/emails/course_join_subject.txt
 create mode 100755 courses/templates/courses/preview_content_snip.html
 create mode 100755 courses/tests.py
 create mode 100755 courses/urls.py
 create mode 100755 courses/utils.py
 create mode 100755 courses/views.py
 create mode 100755 media/__init__.py
 create mode 100755 media/db.py
 create mode 100644 media/migrations/0001_initial.py
 create mode 100644 media/migrations/__init__.py
 create mode 100755 media/models.py

diff --git a/content/__init__.py b/content/__init__.py
new file mode 100755
index 000000000..e69de29bb
diff --git a/content/db.py b/content/db.py
new file mode 100755
index 000000000..4bb9e9ea6
--- /dev/null
+++ b/content/db.py
@@ -0,0 +1,17 @@
+from django.db import models
+
+
+class Content(models.Model):
+
+    latest = models.ForeignKey('content.ContentVersion', models.CASCADE, related_name='+', null=True, blank=True)
+    based_on = models.ForeignKey('content.Content', models.SET_NULL, related_name='derived_content', null=True, blank=True)  #on_delete=SET_NULL might cause a problem here
+
+
+class ContentVersion(models.Model):
+
+    container = models.ForeignKey(Content, models.CASCADE, related_name='versions')
+    title = models.CharField(max_length = 100)
+    content = models.TextField()
+    date = models.DateTimeField(auto_now_add=True)
+    comment = models.CharField(max_length = 100)
+    author_uri = models.CharField(max_length=256)
diff --git a/content/forms.py b/content/forms.py
new file mode 100755
index 000000000..fab0a1067
--- /dev/null
+++ b/content/forms.py
@@ -0,0 +1,9 @@
+from django import forms
+from content import utils
+
+class ContentForm(forms.Form):
+    title = forms.CharField(max_length=80)
+    content = forms.CharField(widget=forms.Textarea, required=False)
+
+    def clean_content(self):
+        return utils.clean_user_content(self.cleaned_data['content'])
diff --git a/content/migrations/0001_initial.py b/content/migrations/0001_initial.py
new file mode 100644
index 000000000..3384df507
--- /dev/null
+++ b/content/migrations/0001_initial.py
@@ -0,0 +1,39 @@
+# Generated by Django 4.2.11 on 2025-07-24 07:26
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Content',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('based_on', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='derived_content', to='content.content')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ContentVersion',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=100)),
+                ('content', models.TextField()),
+                ('date', models.DateTimeField(auto_now_add=True)),
+                ('comment', models.CharField(max_length=100)),
+                ('author_uri', models.CharField(max_length=256)),
+                ('container', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='versions', to='content.content')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='content',
+            name='latest',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='content.contentversion'),
+        ),
+    ]
diff --git a/content/migrations/__init__.py b/content/migrations/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/content/models.py b/content/models.py
new file mode 100755
index 000000000..d07316291
--- /dev/null
+++ b/content/models.py
@@ -0,0 +1,106 @@
+import json
+
+from content import db
+from django.utils.text import slugify
+from django.utils.translation import gettext as _
+
+import logging
+log = logging.getLogger(__name__)
+
+
+def content_uri2id(content_uri):
+    return content_uri.strip('/').split('/')[-1]
+
+
+def get_content(content_uri, fields=[]):
+    content_id = content_uri2id(content_uri)
+    try:
+        wrapper_db = db.Content.objects.get(id=content_id)
+        latest_db = wrapper_db.latest
+    except Exception as e:
+        #TODO
+        log.debug(e)
+        return None
+    
+    content = {
+        "id": wrapper_db.id,
+        "uri": "/uri/content/{0}".format(wrapper_db.id),
+        "title": latest_db.title,
+        "content": latest_db.content,
+    }
+    if "history" in fields:
+        content["history"] = []
+        for version in wrapper_db.versions.sort_by("date"):
+            content['history'] += {
+                "date": version.date,
+                "author_uri": version.author_uri,
+                "title": version.title,
+                "comment": version.comment,
+            }
+
+    return content
+
+
+def create_content(title, content, author_uri):
+    #TODO check all required properties
+    container_db = db.Content()
+    container_db.save()
+    content_db = db.ContentVersion(
+        container=container_db,
+        title=title,
+        content=content,
+        author_uri = author_uri,
+    )
+    #TODO if "comment" in content:
+    #    content_db.comment = content["comment"]
+    content_db.save()
+    container_db.latest = content_db
+    container_db.save()
+    return get_content("/uri/content/{0}".format(container_db.id))
+
+
+def update_content( uri, title, content, author_uri ):
+    content_id = content_uri2id(uri)
+    try:
+        wrapper_db = db.Content.objects.get(id=content_id)
+    except Exception as e:
+        #TODO
+        log.debug(e)
+        return None
+
+    content_db = db.ContentVersion(
+        container=wrapper_db,
+        title=title,
+        content=content,
+        author_uri = author_uri,
+    )
+    #TODO if "comment" in content:
+    #    content_db.comment = content["comment"]
+    content_db.save()
+    wrapper_db.latest = content_db
+    wrapper_db.save()
+    return get_content("/uri/content/{0}".format(wrapper_db.id))
+
+
+def clone_content(uri):
+    content_id = content_uri2id(uri)
+    try:
+        original_db = db.Content.objects.get(id=content_id)
+    except Exception as e:
+        log.debug(e)
+        raise
+
+    container_db = db.Content(based_on=original_db)
+    container_db.save()
+
+    content_db = db.ContentVersion(
+        container=container_db,
+        title=original_db.latest.title,
+        content=original_db.latest.content,
+        author_uri=original_db.latest.author_uri,
+    )
+    content_db.save()
+    container_db.latest = content_db
+    container_db.save()
+
+    return get_content("/uri/content/{0}".format(container_db.id))
diff --git a/content/templatetags/__init__.py b/content/templatetags/__init__.py
new file mode 100755
index 000000000..e69de29bb
diff --git a/content/templatetags/content_tags.py b/content/templatetags/content_tags.py
new file mode 100755
index 000000000..fac61cf78
--- /dev/null
+++ b/content/templatetags/content_tags.py
@@ -0,0 +1,27 @@
+from django import template
+from django.template.defaultfilters import stringfilter
+
+import markdown
+import bleach
+#from html5lib.tokenizer import HTMLTokenizer
+import re
+
+register = template.Library()
+
+def add_target_blank(attrs, new=False):
+    attrs[(None, 'target')] = '_blank'
+    return attrs
+
+@register.filter
+@stringfilter
+def convert_content( markdown_text ):
+    html = markdown.markdown(markdown_text)#TODO , ['tables'])
+    html = bleach.linkify(html, 
+            callbacks=bleach.linkifier.DEFAULT_CALLBACKS + [add_target_blank]
+    ) #TODO, tokenizer=HTMLTokenizer)
+    regex = re.compile(r'<pre\>.*?</pre\>', re.IGNORECASE|re.DOTALL)
+    f = lambda m: re.sub(r'&amp;', '&', m.group(0))
+    html = regex.sub(f, html)
+    return html
+
+convert_content.is_safe = True
diff --git a/content/tests.py b/content/tests.py
new file mode 100755
index 000000000..a026597e1
--- /dev/null
+++ b/content/tests.py
@@ -0,0 +1,59 @@
+from django.test import Client
+from django.contrib.auth.models import User
+from users.models import create_profile
+
+from test_utils import TestCase
+
+from content import models as content_model
+from mock import patch
+
+
+class CourseTests(TestCase):
+
+    test_username = 'testuser'
+    test_email = 'test@mail.org'
+    test_password = 'testpass'
+
+    test_username2 = 'bob'
+    test_email2 = 'bob@mail.org'
+    test_password2 = '13245'
+
+    def setUp(self):
+        self.client = Client()
+        self.locale = 'en'
+
+        django_user = User(
+            username=self.test_username,
+            email=self.test_email,
+        )
+        self.user = create_profile(django_user)
+        self.user.set_password(self.test_password)
+        self.user.save()
+        
+        django_user2 = User(
+            username=self.test_username2,
+            email=self.test_email2,
+        )
+        self.user2 = create_profile(django_user2)
+        self.user2.set_password(self.test_password2)
+        self.user2.save()
+
+
+    def test_content_creation(self):
+        content = content_model.create_content('title', 'content', '/uri/users/bob')
+        content = content_model.get_content(content['uri'])
+        self.assertEquals(content, content)
+
+
+    def test_content_history(self):
+        content = content_model.create_content('title', 'content', '/uri/users/bob')
+        content_model.update_content(
+            content['uri'], 'New title', 'New content', '/uri/users/testuser'
+        )
+
+
+    def test_clone_content(self):
+        content = content_model.create_content('title', 'content', '/uri/users/bob')
+        clone = content_model.clone_content(content['uri'])
+        for key in ['title', 'content']:
+            self.assertTrue(content[key], clone[key])
diff --git a/content/utils.py b/content/utils.py
new file mode 100755
index 000000000..3dbdb0d73
--- /dev/null
+++ b/content/utils.py
@@ -0,0 +1,16 @@
+import bleach
+
+def clean_user_content(content):
+    config = {
+        'tags': ['table', 'tr', 'th', 'td', 'tbody', 'a', 'iframe'],
+        'attributes': {'a': ['href'], 'iframe': ['src', 'width', 'height'] },
+        'strip': True
+    }
+    content = bleach.clean(content, **config)
+    #TODO
+    return content
+
+def clean_trusted_user_content(content):
+    bleach.clean(content, strip=True)
+    #TODO
+    return content
diff --git a/courses/__init__.py b/courses/__init__.py
new file mode 100755
index 000000000..e69de29bb
diff --git a/courses/admin.py b/courses/admin.py
new file mode 100644
index 000000000..15b14b45a
--- /dev/null
+++ b/courses/admin.py
@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+from .db import Course
+
+admin.site.register(Course)
+
diff --git a/courses/badges_oembed.py b/courses/badges_oembed.py
new file mode 100755
index 000000000..805c9eb9a
--- /dev/null
+++ b/courses/badges_oembed.py
@@ -0,0 +1,39 @@
+import requests
+from django.conf import settings
+
+from content import models as content_model
+from courses import models as course_model
+
+
+class BadgeNotFoundException(Exception):
+    pass
+
+
+def request_oembedded_content(url):
+    """ Retrieves oembed json from API endpoint"""
+    endpoint_url = settings.BADGES_OEMBED_URL
+
+    try:
+        r = requests.get(endpoint_url, params={'url': url})
+    except (requests.exceptions.RequestException,
+            requests.exceptions.ConnectionError,
+            requests.exceptions.HTTPError) as e:
+        return e
+    return r
+
+
+def add_content_from_response(course_uri, url, user_uri):
+    content = None
+    response = request_oembedded_content(url)
+    if response.status_code == 200:
+        content = response.json
+        content_data = {
+            'title': content['title'],
+            'content': content['html'],
+            'author_uri': user_uri,
+        }
+        content = content_model.create_content(**content_data)
+        course_model.add_course_content(course_uri, content['uri'])
+    else:
+        raise BadgeNotFoundException
+    return content
diff --git a/courses/db.py b/courses/db.py
new file mode 100755
index 000000000..ae923129c
--- /dev/null
+++ b/courses/db.py
@@ -0,0 +1,77 @@
+from django.db import models
+
+class Course(models.Model):
+
+    title = models.CharField(max_length=255)
+    short_title = models.CharField(max_length=20)
+    description = models.CharField(max_length=1000)
+    language = models.CharField(max_length=32)
+    image_uri = models.CharField(max_length=256)
+    creation_date = models.DateTimeField(auto_now_add=True)
+    draft = models.BooleanField(default=True)
+    archived = models.BooleanField(default=False)
+    deleted = models.BooleanField(default=False)
+    creator_uri = models.CharField(max_length=256)
+    based_on = models.ForeignKey('courses.Course', models.SET_NULL, related_name='derived_courses', blank=True, null=True)
+
+
+class CourseContent(models.Model):
+
+    course = models.ForeignKey(Course, models.CASCADE, related_name='content')
+    content_uri = models.CharField(max_length=256) 
+    index = models.PositiveIntegerField()
+
+
+class CourseTags(models.Model):
+
+    course = models.ForeignKey(Course, models.CASCADE, related_name='tags')
+    tag = models.CharField(max_length=64)
+
+
+class Cohort(models.Model):
+
+    OPEN = "OPEN"
+    MODERATED = "MODERATED"
+    CLOSED = "CLOSED"
+    SIGNUP_MODELS = (
+        (OPEN, "Anyone can sign up"),
+        (MODERATED, "Signups are moderated"),
+        (CLOSED, "Signups are closed"),
+    )
+
+    ROLLING = "ROLLING"
+    FIXED = "FIXED"
+    TERM_CHOICES = (
+        (ROLLING, "Rolling"),
+        (FIXED, "Fixed"),
+    )
+
+    course = models.ForeignKey(Course, models.CASCADE, related_name="cohort_set")
+    term = models.CharField(max_length=32, choices=TERM_CHOICES)
+    start_date = models.DateTimeField(blank=True, null=True)
+    end_date = models.DateTimeField(blank=True, null=True)
+    signup = models.CharField(max_length=32, choices=SIGNUP_MODELS)
+
+
+class CohortSignup(models.Model):
+
+    LEARNER = "LEARNER"
+    ORGANIZER = "ORGANIZER"
+    SIGNUP_ROLE_CHOICES = (
+        (LEARNER, "Learner"),
+        (ORGANIZER, "Organizer"),
+    )
+
+    cohort = models.ForeignKey(Cohort, models.CASCADE, related_name="signup_set")
+    user_uri = models.CharField(max_length=256)
+    role = models.CharField(max_length=10, choices=SIGNUP_ROLE_CHOICES)
+    signup_date = models.DateTimeField(auto_now_add=True)
+    leave_date = models.DateTimeField(blank=True, null=True)
+
+
+class CohortComment(models.Model):
+
+    cohort = models.ForeignKey(Cohort, models.CASCADE, related_name="comment_set")
+    comment_uri = models.CharField(max_length=256)
+    reference_uri = models.CharField(max_length=256)
+
diff --git a/courses/decorators.py b/courses/decorators.py
new file mode 100755
index 000000000..a050fdce6
--- /dev/null
+++ b/courses/decorators.py
@@ -0,0 +1,20 @@
+from django import http
+from django.utils.translation import gettext as _
+
+from courses import models as course_model
+
+def require_organizer( function ):
+    def check_organizer( *args, **kwargs ):
+        request = args[0]
+        course_id = kwargs.get('course_id')
+        course_uri = course_model.course_id2uri(course_id)
+        user_uri = "/uri/user/{0}".format(request.user.username)
+        cohort = course_model.get_course_cohort(course_uri)
+        organizer = course_model.is_cohort_organizer(
+            user_uri, cohort['uri']
+        )
+        organizer |= request.user.is_superuser
+        if not organizer:
+            return http.HttpResponseForbidden(_("You need to be a course organizer."))
+        return function(*args, **kwargs)
+    return check_organizer
diff --git a/courses/export.py b/courses/export.py
new file mode 100755
index 000000000..3454e352f
--- /dev/null
+++ b/courses/export.py
@@ -0,0 +1,15 @@
+from apps.courses import db
+import unicodecsv
+
+def export_signup_csv(filename):
+    with open(filename, 'w') as fout:
+        writer = unicodecsv.writer(fout)
+        writer.writerow(['signup_date', 'leave_date', 'role', 'user', 'course'])
+        for signup in db.CohortSignup.objects.all():
+            writer.writerow([
+                signup.signup_date.isoformat(),
+                signup.leave_date.isoformat() if signup.leave_date else '',
+                signup.role,
+                signup.user_uri,
+                signup.cohort.course.id
+            ])
diff --git a/courses/forms.py b/courses/forms.py
new file mode 100755
index 000000000..7a8919122
--- /dev/null
+++ b/courses/forms.py
@@ -0,0 +1,65 @@
+from django import forms
+from django.conf import settings
+from django.utils.translation import gettext_lazy as _
+from django.forms.widgets import RadioSelect
+
+import re
+
+class HashtagField(forms.CharField):
+    def clean(self, value):
+        if not value:
+            return super(HashtagField, self).clean(value)
+        if not re.match('^[#]*[a-z,A-Z][a-z,A-Z,0-9,_,-]*$', value):
+            raise forms.ValidationError(_("The hashtag must start with letter and contain only letters, digits, _ and -"))
+        return super(HashtagField, self).clean(value.strip('#'))
+
+
+class CourseCreationForm(forms.Form):
+    title = forms.CharField()
+    hashtag = HashtagField(max_length=20)
+    description = forms.CharField(widget=forms.Textarea)
+    language = forms.ChoiceField(choices=settings.LANGUAGES)
+
+
+class CourseUpdateForm(forms.Form):
+    title = forms.CharField(required=False)
+    hashtag = HashtagField(required=False, max_length=20)
+    description = forms.CharField(widget=forms.Textarea, required=False)
+    language = forms.ChoiceField(choices=settings.LANGUAGES, required=False)
+
+
+class CourseImageForm(forms.Form):
+    image = forms.ImageField()
+
+
+class CourseTermForm(forms.Form):
+    start_date = forms.DateField()
+    end_date = forms.DateField()
+
+
+class CourseTagsForm(forms.Form):
+    tags = forms.CharField(max_length=256)
+
+
+class CourseEmbeddedUrlForm(forms.Form):
+    url = forms.URLField(max_length=300)
+
+
+class CourseStatusForm(forms.Form):
+    STATUS_CHOICES = [
+        ('draft', _('Draft'), ),
+        ('published', _('Published'), ),
+        ('archived', _('Archived'), ),
+    ]
+
+    status = forms.ChoiceField(choices=STATUS_CHOICES, widget=RadioSelect)
+
+
+SIGNUP_CHOICES = [
+    ("OPEN", _("Open"),), 
+    ("MODERATED", _("Moderated"),),
+    ("CLOSED", _("Closed"),)
+]
+
+class CohortSignupForm(forms.Form):
+    signup = forms.ChoiceField(choices=SIGNUP_CHOICES, widget=RadioSelect)
diff --git a/courses/models.py b/courses/models.py
new file mode 100755
index 000000000..5936aff4d
--- /dev/null
+++ b/courses/models.py
@@ -0,0 +1,632 @@
+import json
+import datetime
+
+from django.utils.translation import gettext as _
+from django.conf import settings
+
+from django.urls import reverse
+
+from django.utils.text import slugify
+from courses import db
+from content import models as content_model
+#from learn import models as learn_model
+from media import models as media_model
+#from notifications import models as notification_model
+
+from django.contrib.auth import get_user_model
+# from users.models import User #NOTE: don't like this dep
+
+User = get_user_model()
+
+
+import logging
+log = logging.getLogger(__name__)
+
+
+class ResourceNotFoundException(Exception):
+    pass
+
+
+class ResourceDeletedException(Exception):
+    pass
+
+
+class DataIntegrityException(Exception):
+    pass
+
+
+def course_uri2id(course_uri):
+    return course_uri.strip('/').split('/')[-1]
+
+
+def course_id2uri(course_id):
+    return '/uri/course/{0}/'.format(course_id)
+
+
+def _get_course_db(course_uri):
+    course_id = course_uri2id(course_uri)
+    try:
+        course_db = db.Course.objects.get(id=course_id)
+    except:
+        raise ResourceNotFoundException
+    if course_db.deleted:
+        raise ResourceDeletedException
+    return course_db
+
+
+def get_course(course_uri):
+    course_db = _get_course_db(course_uri)
+    course = {
+        "id": course_db.id,
+        "uri": "/uri/course/{0}".format(course_db.id),
+        "title": course_db.title,
+        "hashtag": course_db.short_title,
+        "slug": slugify(course_db.title),
+        "description": course_db.description,
+        "language": course_db.language,
+        "date_created": course_db.creation_date,
+        "author_uri": course_db.creator_uri,
+    }
+
+    if course_db.based_on:
+        course['based_on_uri'] = "/uri/course/{0}".format(course_db.based_on.id)
+
+    course["status"] = 'published'
+    if course_db.archived:
+        course["status"] = 'archived'
+    elif course_db.draft:
+        course["status"] = 'draft'
+
+    if len(course_db.image_uri) > 0:
+        course["image_uri"] = course_db.image_uri
+
+    content = get_course_content(course_uri)
+    if len(content) > 0:
+        course["about_uri"] = content[0]['uri']
+    else:
+        log.error("missing about content")
+        raise DataIntegrityException
+
+    course["content"] = content[1:]
+    return course
+
+
+def get_courses(title=None, hashtag=None, language=None, organizer_uri=None, draft=None, archived=None):
+    results = db.Course.objects
+    #NOTE: could also take **kwargs and do results.filter(**kwargs)
+    filters = { 'deleted': False }
+    if title:
+        filters['title'] = title
+    if hashtag:
+        filters['short_title'] = hashtag
+    if language:
+        filters['language'] = language
+    if organizer_uri:
+        filters['creator_uri'] = organizer_uri
+    if draft != None:
+        filters['draft'] = draft
+    if archived != None:
+        filters['archived'] = archived
+    results = results.filter(**filters)
+    return [ get_course(course_id2uri(course_db.id)) for course_db in results ]
+
+
+def get_user_courses(user_uri):
+    """ return courses organized or participated in by an user """
+    signups = db.CohortSignup.objects.filter(user_uri=user_uri, leave_date__isnull=True, cohort__course__archived=False)
+    courses = []
+    for signup in signups:
+        try:
+            course = get_course(course_id2uri(signup.cohort.course.id))
+        except ResourceDeletedException:
+            continue
+        course_data = {
+            "id": course['id'],
+            "title": course['title'],
+            "user_role": signup.role,
+            "url": reverse("courses_show", kwargs={"course_id": course["id"], "slug": course["slug"]}),
+        }
+        if "image_uri" in course:
+            course_data["image_url"] = media_model.get_image(course['image_uri'])['url']
+        courses += [course_data]
+    return courses
+
+
+def create_course(title, hashtag, description, language, organizer_uri, based_on_uri=None):
+    course_db = db.Course(
+        title=title,
+        short_title=hashtag,
+        description=description,
+        language=language,
+        creator_uri=organizer_uri
+    )
+
+    if based_on_uri:
+        based_on = _get_course_db(based_on_uri)
+        course_db.based_on = based_on
+
+    course_db.save()
+
+    about = content_model.create_content(
+       **{"title": _("About"), "content": "", "author_uri": organizer_uri}
+    )
+    add_course_content("/uri/course/{0}".format(course_db.id), about['uri'])
+    create_course_cohort("/uri/course/{0}".format(course_db.id), organizer_uri)
+    course = get_course("/uri/course/{0}".format(course_db.id))
+
+    #learn_api_data = get_course_learn_api_data(course['uri'])
+    #learn_model.add_course_listing(**learn_api_data)
+    #learn_model.add_course_to_list(learn_api_data['course_url'], "drafts")
+
+    # TODO notify admins
+    return course
+
+
+def clone_course(course_uri, organizer_uri):
+    original_course = get_course(course_uri)
+    new_course = create_course(
+        original_course['title'],
+        original_course['hashtag'],
+        original_course['description'],
+        original_course['language'],
+        organizer_uri,
+        course_uri
+    )
+
+    new_about = content_model.clone_content(original_course['about_uri'])
+    about_db = db.CourseContent.objects.get(content_uri=new_course['about_uri'])
+    about_db.content_uri = new_about['uri']
+    about_db.save()
+
+    for content in original_course['content']:
+        new_content = content_model.clone_content(content['uri'])
+        add_course_content(new_course['uri'], new_content['uri'])
+
+    return get_course(new_course['uri'])
+
+
+def update_course(course_uri, title=None, hashtag=None, description=None, language=None, image_uri=None):
+    # TODO
+    course_db = _get_course_db(course_uri)
+    if title:
+        course_db.title = title
+    if hashtag:
+        course_db.short_title = hashtag
+    if description:
+        course_db.description = description
+    if language:
+        course_db.language = language
+    if image_uri:
+        course_db.image_uri = image_uri
+
+    course_db.save()
+    #update_course_learn_api(course_uri)
+
+    return get_course(course_uri)
+
+
+#   def update_course_learn_api(course_uri):
+#       """ send updated course info to the learn API to update course listing """
+#       course_db = _get_course_db(course_uri)
+#       try:
+#           learn_model.update_course_listing(**get_course_learn_api_data(course_uri))
+#       except:
+#           log.error("Could not update learn index information!")
+
+
+def get_course_learn_api_data(course_uri):
+    """ return data used by the learn API to list courses """
+    course = get_course(course_uri)
+
+    course_url = reverse(
+        'courses_slug_redirect',
+        kwargs={'course_id': course["id"]}
+    )
+    data_url = reverse('courses_learn_api_data', kwargs={'course_id': course["id"]})
+
+    learn_api_data = {
+        "course_url": course_url,
+        "title": course['title'],
+        "description": course['description'],
+        "data_url": data_url,
+        "language": course['language'],
+        "thumbnail_url": "",
+        "tags": get_course_tags(course_uri)
+    }
+
+    if 'image_uri' in course:
+        learn_api_data["thumbnail_url"] = media_model.get_image(course['image_uri'])['url']
+
+    return learn_api_data
+
+
+def publish_course(course_uri):
+    """ publish the course - also add course to the 'listed' list in the learn index """
+
+    course_db = _get_course_db(course_uri)
+    if not (course_db.draft or course_db.archived):
+        return get_course(course_uri)
+
+    course_db.draft = False
+    course_db.archived = False
+    course_db.save()
+
+    course = get_course(course_uri)
+    course_url = reverse(
+        'courses_slug_redirect',
+        kwargs={'course_id': course["id"]}
+    )
+    #try:
+    #    learn_model.remove_course_from_list(course_url, "drafts")
+    #except:
+    #    try: 
+    #        learn_model.remove_course_from_list(course_url, "archived")
+    #    except:
+    #        pass
+    #
+    #learn_model.add_course_to_list(course_url, "listed")
+
+    # TODO: Notify interested people in new course
+    return course
+
+
+def archive_course(course_uri):
+    """ mark a course as archived - this will also disable editing of the course """
+    course_db = _get_course_db(course_uri)
+    if course_db.archived:
+        return get_course(course_uri)
+
+    course_db.archived = True
+    course_db.save()
+
+    course = get_course(course_uri)
+    course_url = reverse(
+        'courses_slug_redirect',
+        kwargs={'course_id': course["id"]}
+    )
+
+    #try:
+    #    learn_model.remove_course_from_list(course_url, "listed")
+    #except:
+    #    try: 
+    #        learn_model.remove_course_from_list(course_url, "drafts")
+    #    except:
+    #        log.error('Course not in any lists')
+    #
+    #learn_model.add_course_to_list(course_url, "archived")
+    return course
+
+
+def unpublish_course(course_uri):
+    course_db = _get_course_db(course_uri)
+
+    if course_db.draft and not course_db.archived:
+        return get_course(course_uri)
+
+    course_db.archived = False
+    course_db.draft = True
+    course_db.save()
+
+    course = get_course(course_uri)
+    course_url = reverse(
+        'courses_slug_redirect',
+        kwargs={'course_id': course["id"]}
+    )
+
+    #try:
+    #    learn_model.remove_course_from_list(course_url, 'listed')
+    #except:
+    #    try:
+    #        learn_model.remove_course_from_list(course_url, 'archived')
+    #    except:
+    #        log.error('Course not in any lists')
+    #
+    #learn_model.add_course_to_list(course_url, "drafts")
+
+    return course
+
+
+def delete_spam_course(course_uri):
+    """ Delete a course and remove listing from index """
+    # TODO - this doesn't do anything special for spam, maybe rename the function
+    course_id = course_uri2id(course_uri)
+    course_db = db.Course.objects.get(id=course_id)
+    course_db.deleted = True
+    course_db.save()
+
+    # remove the course listing
+    #course_url = reverse(
+    #    'courses_slug_redirect',
+    #    kwargs={'course_id': course_db.id}
+    #)
+    #try:
+    #    lists = learn_model.get_lists_for_course(course_url)
+    #    for course_list in lists:
+    #        learn_model.remove_course_from_list(course_url, course_list['name'])
+    #    learn_model.remove_course_listing(course_url)
+    #except:
+    #    pass
+    
+
+def get_course_content(course_uri):
+    content = []
+    course_id = course_uri2id(course_uri)
+    course_db = _get_course_db(course_uri)
+    for course_content_db in course_db.content.order_by('index'):
+        content_data = content_model.get_content(course_content_db.content_uri)
+        content += [{
+            "id": content_data["id"],
+            "uri": content_data["uri"],
+            "title": content_data["title"],
+            "index": course_content_db.index,
+        }]
+    return content
+
+
+def add_course_content(course_uri, content_uri):
+    course_id = course_uri2id(course_uri)
+    course_db = _get_course_db(course_uri)
+    next_index = 0
+    try:
+        next_index = db.CourseContent.objects.filter(course = course_db).order_by('-index')[0].index + 1
+    except:
+        # TODO
+        pass
+    course_content_db = db.CourseContent(
+        course=course_db,
+        content_uri=content_uri,
+        index=next_index
+    )
+    course_content_db.save()
+
+
+def remove_course_content(course_uri, content_uri):
+    course_id = course_uri2id(course_uri)
+    course_db = _get_course_db(course_uri)
+    course_content_db = course_db.content.get(content_uri=content_uri)
+    course_content_db.delete()
+    for content in course_db.content.filter(index__gt=course_content_db.index):
+        content.index = content.index - 1
+        content.save()
+
+
+def reorder_course_content(content_uri, direction):
+    course_content_db = None
+    try:
+        course_content_db = db.CourseContent.objects.get(content_uri=content_uri)
+    except:
+        raise ResourceNotFoundException
+    new_index = course_content_db.index + 1
+    if direction == "UP":
+        new_index = course_content_db.index - 1
+    if new_index < 1:
+        return
+
+    try:
+        swap_course_content_db = db.CourseContent.objects.get(
+            course=course_content_db.course, index=new_index
+        )
+    except:
+        #TODO
+        raise Exception("Internal error")
+
+    swap_course_content_db.index = course_content_db.index
+    course_content_db.index = new_index
+    swap_course_content_db.save()
+    course_content_db.save()
+
+
+def get_course_tags(course_uri):
+    course_db = _get_course_db(course_uri)
+    tags_db = db.CourseTags.objects.filter(course=course_db)
+    return tags_db.values_list('tag', flat=True)
+
+
+def add_course_tags(course_uri, tags):
+    course_db = _get_course_db(course_uri)
+
+    for tag in tags:
+        if not db.CourseTags.objects.filter(course=course_db, tag=tag).exists():
+            tag_db = db.CourseTags(course=course_db, tag=tag)
+            tag_db.save()
+    #update_course_learn_api(course_uri)
+
+
+def remove_course_tags(course_uri, tags):
+    course_db = _get_course_db(course_uri)
+
+    for tag_db in db.CourseTags.objects.filter(course=course_db, tag__in=tags):
+        tag_db.delete()
+    #update_course_learn_api(course_uri)
+
+
+def create_course_cohort(course_uri, organizer_uri):
+    course_db = _get_course_db(course_uri)
+
+    if course_db.cohort_set.count() != 0:
+        return None
+
+    cohort_db = db.Cohort(
+        course=course_db,
+        term=db.Cohort.ROLLING,
+        signup=db.Cohort.CLOSED
+    )
+    cohort_db.save()
+    try:
+        cohort = get_course_cohort(course_uri)
+    except:
+        log.error("Could not create new cohort!")
+        #TODO raise appropriate exception
+        raise
+    add_user_to_cohort(cohort["uri"], organizer_uri, db.CohortSignup.ORGANIZER)
+    return get_course_cohort(course_uri)
+
+
+def get_course_cohort_uri(course_uri):
+    course_db = _get_course_db(course_uri)
+    try:
+        cohort_db = db.Cohort.objects.get(course=course_db)
+    except:
+        raise DataIntegrityException
+    return "/uri/cohort/{0}".format(cohort_db.id)
+
+
+def get_course_cohort(course_uri):
+    return get_cohort(get_course_cohort_uri(course_uri))
+
+
+def _get_cohort_db(cohort_uri):
+    cohort_id = cohort_uri.strip('/').split('/')[-1]
+    try:
+        cohort_db = db.Cohort.objects.get(id=cohort_id)
+    except:
+        raise ResourceNotFoundException
+    return cohort_db
+
+
+def get_cohort(cohort_uri):
+    cohort_db = _get_cohort_db(cohort_uri)
+
+    cohort_data = {
+        "uri": "/uri/cohort/{0}".format(cohort_db.id),
+        "course_uri": "/uri/course/{0}".format(cohort_db.course_id),
+        "term": cohort_db.term,
+        "signup": cohort_db.signup,
+    }
+    #NOTE: fetching course + cohort twice when using get_course_cohort
+    #NOTE-Q: does cohort.course.id fetch the course data?
+    #NOTE-A: Yes, cohort.course_id doesn't
+
+    if cohort_db.term != db.Cohort.ROLLING:
+        cohort_data["start_date"] = cohort_db.start_date.date()
+        cohort_data["end_date"] = cohort_db.end_date.date()
+
+    cohort_data["users"] = {}
+    cohort_data["organizers"] = []
+    for signup in cohort_db.signup_set.filter(leave_date__isnull=True):
+        username = signup.user_uri.strip('/').split('/')[-1]
+        cohort_data["users"][username] = {
+            "username": username,
+            "uri": signup.user_uri,
+            "role": signup.role,
+            "signup_date": signup.signup_date
+        }
+        key = "{0}s".format(signup.role.lower())
+        if not key in cohort_data:
+            cohort_data[key] = []
+        cohort_data[key] += [username]
+
+    return cohort_data  
+
+
+def get_cohort_size( uri ):
+    cohort_db = _get_cohort_db(uri)
+    return cohort_db.signup_set.filter(leave_date__isnull=True).count()
+
+
+def update_cohort( uri, term=None, signup=None, start_date=None, end_date=None ):
+    cohort_db = _get_cohort_db(uri)
+
+    if term:
+        cohort_db.term = term
+    if signup:
+        cohort_db.signup = signup
+    if start_date:
+        cohort_db.start_date = start_date
+    if end_date:
+        cohort_db.end_date = end_date
+    cohort_db.save()
+    return get_cohort(uri)
+
+
+def user_in_cohort(user_uri, cohort_uri):
+    cohort_db = _get_cohort_db(cohort_uri)
+    return cohort_db.signup_set.filter(
+        user_uri=user_uri, leave_date__isnull=True).exists()
+
+
+def is_cohort_organizer(user_uri, cohort_uri):
+    cohort_db = _get_cohort_db(cohort_uri)
+    return cohort_db.signup_set.filter(
+        user_uri=user_uri, leave_date__isnull=True,
+        role=db.CohortSignup.ORGANIZER).exists()
+
+
+def add_user_to_cohort(cohort_uri, user_uri, role, notify_organizers=False):
+    cohort_db = _get_cohort_db(cohort_uri)
+
+    username = user_uri.strip('/').split('/')[-1]
+    if not User.objects.filter(username=username).exists():
+        raise ResourceNotFoundException(u'User {0} does not exist'.format(user_uri))
+
+    if db.CohortSignup.objects.filter(cohort=cohort_db, user_uri=user_uri, leave_date__isnull=True).exists():
+        return None
+
+    signup_db = db.CohortSignup(
+        cohort=cohort_db,
+        user_uri=user_uri,
+        role=role
+    )
+    signup_db.save()
+
+    if notify_organizers:
+        cohort = get_cohort(cohort_uri)
+        course = get_course(cohort['course_uri'])
+        organizers = User.objects.filter(username__in=cohort['organizers'])
+        context = {
+            'course': course,
+            'new_user': username,
+            'domain': settings.domain,
+        }
+        subject_template = 'courses/emails/course_join_subject.txt'
+        body_template = 'courses/emails/course_join.txt'
+        #notification_model.send_notifications_i18n(
+        #    organizers, subject_template, body_template, context,
+        #    notification_category='course-signup.course-{0}'.format(course['id'])
+        #)
+    
+    signup = {
+        "cohort_uri": cohort_uri,
+        "user_uri": user_uri,
+        "role": role
+    }
+    return signup
+
+
+def remove_user_from_cohort(cohort_uri, user_uri):
+    cohort_db = _get_cohort_db(cohort_uri)
+    try:
+        user_signup_db = cohort_db.signup_set.get(
+            user_uri=user_uri, leave_date__isnull=True
+        )
+    except:
+        return False, _("No such user in cohort")
+
+    organizer_count = cohort_db.signup_set.filter(
+        role=db.CohortSignup.ORGANIZER,
+        leave_date__isnull=True
+    ).count() == 1
+
+    if user_signup_db.role == db.CohortSignup.ORGANIZER and organizer_count == 1:
+        return False, _("Cannot remove last organizer")
+
+    user_signup_db.leave_date = datetime.datetime.utcnow()
+    user_signup_db.save()
+    return True, None
+
+
+def send_course_announcement(course_uri, announcement_text):
+    course = get_course(course_uri)
+    cohort = get_course_cohort(course_uri)
+    users = User.objects.filter(username__in=cohort['users'].keys())
+    #notification_model.send_notifications_i18n(
+    #    users,
+    #    'courses/emails/course_announcement_subject.txt',
+    #    'courses/emails/course_announcement.txt',
+    #    { 
+    #        'course': course,
+    #        'announcement_text': announcement_text,
+    #        'domain': settings.domain
+    #    },
+    #    notification_category='course-announcement.course-{0}'.format(course['id'])
+    #)
diff --git a/courses/templates/courses/content.html b/courses/templates/courses/content.html
new file mode 100755
index 000000000..c860acd86
--- /dev/null
+++ b/courses/templates/courses/content.html
@@ -0,0 +1,65 @@
+{% extends "courses/course_base.html" %}
+{% load i18n %}
+
+{% comment %}{% load embed %}{% endcomment %}
+{% load content_tags %}
+{% comment %}{% load settings_tags %}{% endcomment %}
+
+{% block title %}{{course.title}} | {{content.title}}{% endblock %}
+{% block bodyclasses %}course-content{% endblock%}
+
+{% block breadcrumbs %}
+  <li>
+    <span class="divider">&rsaquo;</span>
+    <a href="{% url "courses_show" course_id=course.id slug=course.slug%}">{{course.title}}</a>
+  </li>
+  <li class="active"><span class="divider">&rsaquo;</span>{{ content.title }}</li>
+{% endblock %}
+
+{% block tab-pane-content %}
+  <h2>{{ content.title }}</h2>
+  {% comment %}<div>{{content.content|convert_content|embed|safe}}</div>{% endcomment %}
+  <div>{{content.content|convert_content|safe}}</div>
+  {% if can_edit %}
+    <p>
+      <a class="btn btn-sm dark p2pu-btn" href="{% url "courses_content_edit" course_id=course.id content_id=content.id %}">
+        <i class="icon-edit"></i> {% trans "edit" %}
+      </a>
+    </p>
+  {% endif %}
+
+  <hr/>
+  {% comment %}
+  <h2>{% trans "Comments" %}</h2>
+  <div id="disqus_thread"></div>
+  <script type="text/javascript">
+    var disqus_shortname = '{% settings_value "DISQUS_SHORTNAME" %}';
+    {% if debug %}var disqus_developer = 1;{% endif %}
+    var disqus_identifier = "{{course.id}}" + "-" + "{{content.id}}";
+    /* * * DON'T EDIT BELOW THIS LINE * * */
+    (function() {
+      var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+      dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
+      (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+    })();
+  </script>
+  <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+  <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+  <script type="text/javascript">
+    var disqus_config = function() {
+      this.page.remote_auth_s3 = "{{ disqus_sso }}";
+      this.page.api_key = "{{ disqus_public_key }}";
+    };
+    this.sso = {
+      name: "P2PU",
+      button: "https://courses.p2pu.org/static/images/disqus-sso-login-button.png",
+      icon: "https://courses.p2pu.org/static/images/favicon.ico",
+      url: "https://courses.p2pu.org/login/",
+      logout: "https://courses.p2pu.org/logout/",
+      width: "800",
+      height: "400"
+    };
+  </script>
+  {% endcomment %}
+
+{% endblock %}
diff --git a/courses/templates/courses/content_form_buttons_snip.html b/courses/templates/courses/content_form_buttons_snip.html
new file mode 100755
index 000000000..855a26b0b
--- /dev/null
+++ b/courses/templates/courses/content_form_buttons_snip.html
@@ -0,0 +1,15 @@
+{% load i18n %}
+
+
+<input class="pull-right btn btn-primary" type="submit" value="{% trans 'Save' %}"/>
+{% if next_url %}
+  <a class="pull-right btn" href="{{ next_url }}">{% trans 'Cancel' %}</a>
+{% else %}
+  {% if content %}
+    <a class="pull-right btn" href="{% url "courses_content_show" course_id=course.id content_id=content.id %}">{% trans 'Cancel' %}</a>
+  {% else %}
+    <a class="pull-right btn" href="{% url "courses_show" course_id=course.id slug=course.slug %}">{% trans 'Cancel' %}</a>
+  {% endif %}
+{% endif %}
+
+
diff --git a/courses/templates/courses/content_form_snip.html b/courses/templates/courses/content_form_snip.html
new file mode 100755
index 000000000..d13c413e8
--- /dev/null
+++ b/courses/templates/courses/content_form_snip.html
@@ -0,0 +1,51 @@
+{% load i18n %}
+
+
+<form action="" method="POST">
+  {% csrf_token %}
+  <input type="hidden" name="next_url" value="{{next_url}}"/>
+  {% include "courses/content_form_buttons_snip.html" %}
+  <div class="tabbable">
+    <ul class="nav nav-tabs">
+      <li class="active"><a href="#edit-tab-pane" data-toggle="tab">{% trans "Edit" %}</a></li>
+      <li><a id="preview-tab" href="#preview-tab-pane" data-toggle="tab">{% trans "Preview" %}</a></li>
+      <li><a id="md-cheatsheet" href="#md-cheatsheet-pane" data-toggle="tab">{% trans "Markdown Help" %}</a></li>
+    </ul>
+    <div class="tab-content">
+      <div class="tab-pane active" id="edit-tab-pane">
+        <div id="content-editor">
+          <p>
+            <label for="id_title">{% trans "Title" %}</label>
+            {{ form.title.errors }}
+            <input class="span8" type="text" id="id_title" name="title" value="{{form.title.value|default_if_none:""}}"/>
+          </p>
+          <p>
+            <label for="id_content">{% trans "Content" %}</label>
+            {{ form.content.errors }}
+            <div id="id_content-wmd-button-bar"></div>
+            <textarea id="id_content" name="content" class="span8" rows="20">{{form.content.value|default_if_none:""}}</textarea>
+            <p class="help-block">
+                {% blocktrans %}You can use markdown for your content.
+                    For some help on using markdown, look
+                    <a id="MDCStrigger" href="#markdown-cheatsheet" role="button">here</a>
+                {% endblocktrans %}
+            </p>
+          </p>
+        </div>
+      </div>
+      <div class="tab-pane" id="preview-tab-pane">
+        <div class="hidden" id="id_content-wmd-preview"></div>
+        <div id="content-preview-placeholder"></div>
+      </div>
+     <div class="tab-pane" id="md-cheatsheet-pane">
+       {% comment %}
+         {% include 'learn/markdown_cheatsheet.html' %}
+       {% endcomment %}
+      </div>
+      {% include "courses/content_form_buttons_snip.html" %}
+
+    </div>
+  </div>
+</form>
+
+
diff --git a/courses/templates/courses/course.html b/courses/templates/courses/course.html
new file mode 100755
index 000000000..045b3c2e2
--- /dev/null
+++ b/courses/templates/courses/course.html
@@ -0,0 +1,24 @@
+{% extends "courses/course_base.html" %}
+
+{% load i18n %}
+{% load content_tags %}
+
+{% block tab-pane-content %}
+  {% if about.content|length == 0 %}
+    {% if can_edit %}
+      <div class="alert alert-info">
+        <p class="text-info">{% blocktrans %}You can add some information here by editing this page!</a>{% endblocktrans %}
+        </p>
+      </div>
+    {% endif %}
+  {% else %}
+    <div>{{about.content|convert_content|safe}}</div>
+  {% endif %}
+  <p>
+  {% if can_edit %}
+    <p>
+      <a class="btn btn-sm dark p2pu-btn" href="{% url 'courses_content_edit' course_id=course.id content_id=about.id %}?next_url={{course_url}}"><i class="icon-edit"></i> {% trans "edit" %}</a>
+    </p>
+  {% endif %}
+  </p>
+{% endblock %}
diff --git a/courses/templates/courses/course_admin_content.html b/courses/templates/courses/course_admin_content.html
new file mode 100755
index 000000000..d475c7b23
--- /dev/null
+++ b/courses/templates/courses/course_admin_content.html
@@ -0,0 +1,37 @@
+{% extends "courses/course_base.html" %}
+
+{% load i18n %}
+
+{% block tab-pane-content %}
+  {% if course.content|length %}
+    <table class="table table-striped">
+      {% for task in course.content %}
+        <tr>
+          <td><a class="taskLink" href="{% url "courses_content_show" course_id=course.id content_id=task.id %}">{{ task.title }}</a></td>
+          {% if organizer %}
+              <td>{% if not forloop.first %}<a class="robttn up" href="{% url "courses_content_up" course_id=course.id content_id=task.id %}"><i class="icon-arrow-up"></i></a>{% endif %}</td>
+              <td>{% if not forloop.last %}<a class="robttn dwn" href="{% url "courses_content_down" course_id=course.id content_id=task.id%}"><i class="icon-arrow-down"></i></a>{% endif %}</td>
+          {% endif %}
+
+          {% if organizer %}
+            <td><form class="form-inline" action="{% url "courses_content_remove" course_id=course.id content_id=task.id %}" method="POST">
+              {% csrf_token %}
+              <button class="btn btn-mini btn-danger" type="submit">{% trans "remove" %}</button>
+            </form></td>
+          <td><a href="{% url "courses_content_edit" course_id=course.id content_id=task.id %}?next_url={{ course_url }}">
+              <i class="icon-edit"></i>
+          </a></td>
+          {% endif %}
+        </tr>
+      {% endfor %}
+    </table>
+
+    {% if organizer %}
+      <a class="btn" href="{% url "courses_create_content" course_id=course.id %}?next_url={{ course_url }}">{% trans "Add more content" %}</a>
+    {% endif %}
+  {% else %}
+    {% if organizer %}
+      <p class="text-info">{% blocktrans %}This course doesn't have any content yet. {% endblocktrans %}<a href="{% url "courses_create_content" course_id=course.id%}">Click here</a> to add some.</p>
+    {% endif %}
+  {% endif %}
+{% endblock %}
diff --git a/courses/templates/courses/course_announcement.html b/courses/templates/courses/course_announcement.html
new file mode 100755
index 000000000..015767f82
--- /dev/null
+++ b/courses/templates/courses/course_announcement.html
@@ -0,0 +1,21 @@
+{% extends "courses/course_base.html" %}
+
+{% load i18n %}
+{% load learn_tags %}
+{% load embed %}
+
+{% block tab-pane-content %}
+
+  <span>
+    <p class="alert">{% blocktrans %}Users can opt-out of course announcements and not all users will receive this message. Consider adding the relevant information to the course as content or on the about page{% endblocktrans %}</p>
+  </span>
+  <p>
+    <form action="{% url courses_announcement course_id=course.id %}" method="POST">
+      {% csrf_token %}
+      <p><strong>{% trans 'Subject: ' %}</strong>{% blocktrans with hashtag=course.hashtag %}P2PU Course Announcement #{{ hashtag }}{% endblocktrans %}</p>
+      <label for="id_announcement_text"><strong>{% trans 'Announcement text:' %}</strong></label>
+      <p class="row-fluid"><textarea class="span12" id="id_announcement_test" rows="10" name="announcement_text"/></textarea></p>
+      <button type="submit">{% trans "Send" %}</button>
+    </form>
+  </p>
+{% endblock %}
diff --git a/courses/templates/courses/course_badges.html b/courses/templates/courses/course_badges.html
new file mode 100755
index 000000000..a1df7c7d5
--- /dev/null
+++ b/courses/templates/courses/course_badges.html
@@ -0,0 +1,58 @@
+{% extends "courses/course_base.html" %}
+
+{% load i18n %}
+{% load learn_tags %}
+{% load embed %}
+{% load settings_tags %}
+
+{% block tab-pane-content %}
+    <h2>{% trans 'How to Add a Badge to Your P2PU Course' %}</h2>
+    <div class="badges-content-wrapper">
+        <div class="span3">
+            <h2>{% trans 'Create a Badge' %}</h2>
+            <p>{% blocktrans %}
+                Head on over to
+                <a href="http://badges.p2pu.org" target="_blank">
+                    badges.p2pu.org</a>
+                to create your snappy Badge.
+                {% endblocktrans %}
+            </p>
+            <a class="btn btn-olive" href="http://badges.p2pu.org/badge/create/" target="_blank">
+                {% trans 'Create a Badge' %}
+            </a>
+        </div>
+        <div class="span3">
+            <h2>{% trans 'Insert the URL' %}</h2>
+            <p>{% blocktrans %}
+                Grab the unique URL for your Badge from
+                <a href="http://badges.p2pu.org" target="_blank">
+                    badges.p2pu.org</a>
+                and insert it here.'
+                {% endblocktrans %}
+            </p>
+            <form action="" method="POST">
+                {% csrf_token %}
+            <p>
+                <label for="id_url">{% trans "Badge URL:"%} <a class="form-tip" href="#" rel="tooltip" data-original-title="{% trans "Paste URL from Badge."%}">?</a></label>
+                    {{form.url.errors}}
+                <input type="text" name="url" id="id_url" placeholder="{% trans "Paste URL of the Badge that can be won." %}" value="{{form.url.value|default_if_none:""}}"/>
+                <input type="submit" class="btn btn-olive" value="{% trans 'Add Badge' %}" />
+            </p>
+            </form>
+        </div>
+        <div class="span3">
+            <h2>{% trans 'Manage Your Badge' %}</h2>
+            <p> {% blocktrans %}
+                Navigate over to "Content" and select
+                "Organize and add content". You can move Badges
+                up or down in the order you'd like
+                {% endblocktrans %}
+            </p>
+            <div class="align-center">
+                <img src="{{ STATIC_URL }}images/edit_badges.png" alt="{% trans 'How to manage your Badge' %}"/>
+            </div>
+        </div>
+    </div>
+
+
+{% endblock %}
diff --git a/courses/templates/courses/course_base.html b/courses/templates/courses/course_base.html
new file mode 100755
index 000000000..5cf7b2512
--- /dev/null
+++ b/courses/templates/courses/course_base.html
@@ -0,0 +1,93 @@
+{% extends "base.html" %}
+
+{% load i18n %}
+{% load static %}
+
+{% block page_title %}{{course.title}}{% endblock %}
+{% block bodyclasses %}course-landing{% endblock%}
+
+{% block css %}
+  <link rel="stylesheet" href="{% static 'css/course.css' %}">
+{% endblock %}
+
+{% block links %}
+{% if project %}
+  <meta name="thumbnail" property="og:image" content="{{ project.get_image_url }}" />
+{% endif %}
+{% endblock %}
+
+{% block breadcrumbs_title %}
+  <h1 itemprop="name">{{course.title}}</h1>
+{% endblock %}
+
+{% block breadcrumbs %}
+  <li class="active"><span class="divider">&rsaquo;</span>{{course.title}}</li>
+{% endblock %}
+
+{% block content %}
+
+<div class="row">
+
+  <div id="sidebar-wrapper" class="col-3">
+    {% include "courses/course_sidebar.html" %}
+  </div>
+
+  <div id="main" class="col-9">
+    <meta itemprop="description" content="{{course.description}}">
+    <meta itemprop="inLanguage" content="{{course.language}}">
+    <meta itemprop="dateCreated" content="{{course.date_created.date.isoformat}}">
+    <meta itemprop="author" content="{{course.author}}" >
+
+    <meta itemprop="useRightsUrl" content="http://creativecommons.org/licenses/by-sa/3.0/">
+    <meta itemprop="learningResourceType" content="Course">
+
+    {% for metaitem in meta_data.items %}
+      <meta itemprop="{{metaitem.0}}" content="{{metaitem.1}}">
+    {% endfor %}
+
+    {% if educational_alignment %}
+      <span itemprop="educationalAlignment" itemscope itemtype="http://schema.org/AlignmentObject">
+        {% for metaitem in educational_alignment.items %}
+          <meta itemprop="{{metaitem.0}}" content="{{metaitem.1}}">
+        {% endfor %}
+      </span>
+    {% endif %}
+    
+    <div class="tabbable">
+      <ul class="nav nav-tabs">
+        <li class="nav-item {% if about_active %}active{% endif %}">
+          <a class="nav-link" href="{% url 'courses_show' course_id=course.id slug=course.slug %}">{% trans 'About' %}</a>
+        </li>
+        <li class="nav-item dropdown{% if content_active %} active{% endif %}">
+          <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown">{% trans 'Content' %}<b class="caret"></b></a>
+          <ul class="dropdown-menu">
+            {% for task in course.content %}
+              <li class="dropdown-item {% if content and content.id == task.id %}active{% endif %}">
+                <a href="{% url 'courses_content_show' course.id task.id %}">{{ task.title }}</a>
+              </li>
+            {% endfor %}
+            {% if can_edit %}
+              <li class="dropdown-item">
+                <a href="{% url 'courses_admin_content' course_id=course.id %}">{% trans "Organize and add content" %}</a>
+              </li>
+            {% endif %}
+          </ul>
+        </li>
+  
+        {% if organizer %}
+          <li class="nav-team {% if settings_active %}active{% endif %}">
+            <a class="nav-link" href="{% url 'courses_settings' course_id=course.id %}">{% trans 'Settings' %}</a>
+          </li>
+        {% endif %}
+      </ul>
+      <div class="tab-content">
+        <div class="tab-pane active">
+          {% block tab-pane-content %}
+          {% endblock %}
+        </div>
+      </div>
+    </div> <!-- /#tabbable -->
+  </div> <!-- /#main -->
+</div> <!-- /#row -->
+
+{% endblock %}
diff --git a/courses/templates/courses/course_comment_snip.html b/courses/templates/courses/course_comment_snip.html
new file mode 100755
index 000000000..52482d24e
--- /dev/null
+++ b/courses/templates/courses/course_comment_snip.html
@@ -0,0 +1,41 @@
+        <!--
+        {% for comment in comments %}
+          <div class="comment">
+            <a name="comment-{{comment.id}}"></a>
+            <p>{{comment.content}}</p>
+            {% if comment.replies|length > 0 %}
+              <a data-toggle="collapse" data-target="#comment-{{comment.id}}-replies">
+                {% blocktrans with reply_count=comment.replies|length %}{{reply_count}} replies{% endblocktrans %}
+              </a>
+              <div id="comment-{{comment.id}}-replies" class="collapse">
+                {% for reply in comment.replies %}
+                  <div class="reply">
+                    <a name="comment-{{reply.id}}"></a>
+                    <p>{{reply.content}}</p>
+                  </div>
+                {% endfor %}
+              </div>
+            {% endif %}
+            <a data-toggle="collapse" data-target="#comment-{{comment.id}}-reply"><i class="icon-comment"></i>{% trans 'Reply to comment' %}</a>
+            <div id="comment-{{comment.id}}-reply" class="collapse">
+              <form action="{% url courses_post_comment_reply course_id=course.id content_id=about.id comment_id=comment.id %}" method="POST">
+                {% csrf_token %}
+                <input type="hidden" name="next_url" value="{{course_url}}">
+                <p><textarea id="id_comment" name="comment" cols="40" rows="2"></textarea></p>
+                <input type="submit" value="{% trans "Post comment" %}"/>
+              </form>
+            </div>
+          </div>
+        {% endfor %}
+  
+        <div>
+          <h3>{% trans 'Post new comment' %}</h3>
+          <form action="{% url courses_post_content_comment course_id=course.id content_id=about.id %}" method="POST">
+            {% csrf_token %}
+            <input type="hidden" name="next_url" value="{{course_url}}">
+            <p><textarea id="id_comment" name="comment" cols="40" rows="2"></textarea></p>
+            <input type="submit" value="{% trans "Post comment" %}"/>
+          </form>
+        </div>
+        -->
+
diff --git a/courses/templates/courses/course_delete_confirmation.html b/courses/templates/courses/course_delete_confirmation.html
new file mode 100755
index 000000000..6c1c6b34d
--- /dev/null
+++ b/courses/templates/courses/course_delete_confirmation.html
@@ -0,0 +1,22 @@
+{% extends "base.html" %}
+
+
+{% load i18n %}
+
+{% block title %}{{ _('Confirm course deletion') }}{% endblock %}
+{% block body %}
+<section class="modal">
+  <article>
+    <h1>{{ _('Delete Course') }}</h1>
+    <fieldset>
+      <form action="{% url courses_delete_spam course_id=course.id %}" method="post">
+	      {% csrf_token %}
+        <p>
+	        <button type="submit">{{ _('Delete') }}</button>
+	        <a class="btn" href="{% url courses_show course_id=course.id slug=course.slug %}">{{ _('Back') }}</a>
+        </p>
+      </form>
+    </fieldset>
+  </article>
+</section>
+{% endblock %}
diff --git a/courses/templates/courses/course_discussion.html b/courses/templates/courses/course_discussion.html
new file mode 100755
index 000000000..c2d7609e3
--- /dev/null
+++ b/courses/templates/courses/course_discussion.html
@@ -0,0 +1,40 @@
+{% extends "courses/course_base.html" %}
+
+{% load i18n %}
+{% load learn_tags %}
+{% load embed %}
+{% load settings_tags %}
+
+{% block tab-pane-content %}
+  <p>{% blocktrans %}This page is for general discussion of the course. Feel free to post questions, comments, ideas.{% endblocktrans %}</p>
+   <br/>
+   <div id="disqus_thread"></div>
+   <script type="text/javascript">
+     var disqus_shortname = '{% settings_value "DISQUS_SHORTNAME" %}';
+     {% if debug %}var disqus_developer = 1;{% endif %}
+     var disqus_identifier = "{{course.id}}";
+     /* * * DON'T EDIT BELOW THIS LINE * * */
+     (function() {
+       var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+       dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
+       (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+     })();
+   </script>
+   <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+   <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+   <script type="text/javascript">
+      var disqus_config = function() {
+        this.page.remote_auth_s3 = "{{ disqus_sso }}";
+        this.page.api_key = "{{ disqus_public_key }}";
+      };
+      this.sso = {
+        name: "P2PU",
+        button: "https://courses.p2pu.org/static/images/disqus-sso-login-button.png",
+        icon: "https://courses.p2pu.org/static/images/favicon.ico",
+        url: "https://courses.p2pu.org/login/",
+        logout: "https://courses.p2pu.org/logout/",
+        width: "800",
+        height: "400"
+      };
+   </script>
+{% endblock %}
diff --git a/courses/templates/courses/course_people.html b/courses/templates/courses/course_people.html
new file mode 100755
index 000000000..86cc4fd57
--- /dev/null
+++ b/courses/templates/courses/course_people.html
@@ -0,0 +1,40 @@
+{% extends "courses/course_base.html" %}
+
+{% load i18n %}
+{% load learn_tags %}
+{% load embed %}
+
+{% block tab-pane-content %}
+  <div id="learner-list" class="user-list">
+    <h3>{% trans "Learners" %}</h3>
+    <ul class="thumbnails">
+      {% for user in cohort.users.values %}
+        {% if user.role == "LEARNER" %}
+          {% include "courses/course_user_snip.html" %}
+        {% endif %}
+      {% endfor %}
+    </ul>
+  </div>
+  <div id="learner-list" class="user-list">
+    <h3>{% trans "Organizers" %}</h3>
+    <ul class="thumbnails">
+    {% for user in cohort.users.values %}
+      {% if user.role == "ORGANIZER" %}
+        {% include "courses/course_user_snip.html" %}
+      {% endif %}
+    {% endfor %}
+    </ul>
+  </div>
+  {% if can_edit %}
+    <p>
+      <form action="{% url courses_add_user course_id=course.id %}" method="POST">
+        {% csrf_token %}
+        <p><input type="text" name="username" autocomplete="off"/></p>
+        <button type="submit">{% trans "Add user" %}</button>
+      </form>
+    </p>
+    {% if trusted_user %}
+      <a href="{% url courses_export_emails course_id=course.id %}" target="_blank" class="btn">{% trans 'Export emails' %}</a>
+    {% endif %}
+  {% endif %}
+{% endblock %}
diff --git a/courses/templates/courses/course_settings.html b/courses/templates/courses/course_settings.html
new file mode 100755
index 000000000..32a8bc187
--- /dev/null
+++ b/courses/templates/courses/course_settings.html
@@ -0,0 +1,196 @@
+{% extends "courses/course_base.html" %}
+
+{% load i18n %}
+
+{% block tab-pane-content %}
+  {% if course.status == 'archived' %}
+    <div>
+      <p class="text-warning">{% blocktrans %}This course is currently archived. Before you can make changes you need to change the course to published or draft.{% endblocktrans %}</p>
+      <form action="{% url "courses_change_status" course_id=course.id %}" method="POST">
+        {% csrf_token %}
+        <p><label for="id_status">{% trans "Course status" %}</label></p>
+        {{ status_form.status }}
+        <p><button type="submit">{% trans "Save" %}</button></p>
+      </form>
+    </div>
+  {% else %}
+    <div>
+      <form action="{% url "courses_update_attribute" course_id=course.id attribute='title' %}" method="POST">
+        {% csrf_token %}
+        <p>
+          <label for="id_title">{% trans "Course Title" %}</label>
+          {{ update_form.title }}
+        </p>
+        <button type="submit">{% trans "Save" %}</button>
+      </form>
+    </div>
+    <hr/>
+    <div id="hashtag-edit">
+      <form action="{% url 'courses_update_attribute' course_id=course.id attribute='hashtag' %}" method="POST">
+        {% csrf_token %}
+        <p>
+          <label for="id_hashtag">{% trans "Hashtag" %}</label>
+          {{ update_form.hashtag }}
+        </p>
+        <button type="submit">{% trans "Save" %}</button>
+      </form>
+    </div>
+ 
+    <hr/>
+ 
+    <div id="image-edit">
+      <form action="{% url 'courses_image' course_id=course.id %}" method="POST" enctype="multipart/form-data">
+        {% csrf_token %}
+        <p>{{image_form.image}}</p>
+        <p><button type="submit" >{% trans 'Upload new image' %}</button></p>
+      </form>
+    </div>
+ 
+    <hr>
+    <div>
+      <form action="{% url 'courses_update_attribute' course_id=course.id attribute='description' %}" method="POST">
+        {% csrf_token %}
+        <label for="id_description">{% trans "Description" %}</label>
+        {{ update_form.description }}
+        <p><button type="submit">{% trans "Update description" %}</button></p>
+      </form>
+    </div>
+    <hr/>
+    <div>
+      <form action="{% url 'courses_change_status' course_id=course.id %}" method="POST">
+        {% csrf_token %}
+        <p><label for="id_status">{% trans "Course status" %}</label></p>
+        {{ status_form.status }}
+        <p><button type="submit">{% trans "Save" %}</button></p>
+      </form>
+    </div>
+    <hr/>
+    <div id="course-term">
+      {% if cohort.term == 'ROLLING' %}
+        <p>{%trans "Users can join this course at any time."%}</p>
+      {% else %}
+        {% blocktrans with start_date=cohort.start_date end_date=cohort.end_date %}
+          <p>This course runs from {{ start_date }} to {{end_date}}.</p>
+        {% endblocktrans %}
+      {% endif %}
+ 
+      <div>
+        <p>{%trans "Set dates"%}</p>
+        <form action="{% url 'courses_change_term' course_id=course.id term='fixed' %}" method="POST">
+          {% csrf_token %}
+          <p><label for="id_start_date">{% trans "Start date" %}</label>{{term_form.start_date}}</p>
+          <p><label for="id_end_date">{% trans "End date" %}</label>{{term_form.end_date}}</p>
+          <p><input type="submit" class="btn" value="{% trans "Save" %}"/></p>
+        </form>
+      </div>
+      {% if cohort.term == 'FIXED' %}
+        <p>{%trans "or" %}</p>
+        <div>
+          <form action="{% url 'courses_change_term' course_id=course.id term='rolling' %}" method="POST">
+            {% csrf_token %}
+            <p><input type="submit" value="{% trans "Switch to rolling term" %}"/></p>
+          </form>
+        </div>
+      {% endif %}
+    </div>
+    <div class="clearfix"></div>
+    <hr/>
+    <div>
+      {% if cohort.signup == 'OPEN' %}
+        <p>{% trans 'Signup is open to anyone.' %}</p>
+      {% endif %}
+      {% if cohort.signup == 'MODERATED' %}
+        <p>{% trans 'Signup is moderated. To sign up for this course you should contact one of the course organizer.' %}</p>
+      {% endif %}
+      {% if cohort.signup == 'CLOSED' %}
+        <p>{% trans 'Signup is closed. Only organizers can add more people.' %}</p>
+      {% endif %}
+      
+      <div id="signup-edit">
+        <form action="{% url 'courses_change_signup' course_id=course.id %}" method="POST">
+          {% csrf_token %}
+          {{ signup_form.signup }}
+          <button type="submit">{% trans "Save" %}</button>
+        </form>
+      </div>
+    </div>
+    <hr/>
+    <div>
+      <form action="{% url 'courses_update_tags' course_id=course.id %}" method="POST">
+          {% csrf_token %}
+          <label for="id_tags">{% trans "Tags" %}</label>
+          {{ tags_form.tags }}
+          <p><button type="submit">{% trans "Save" %}</button></p>
+      </form>
+    </div>
+    <hr/>
+    <div id="course-language">
+      <div id="language-edit">
+        <form action="{% url 'courses_update_attribute' course_id=course.id attribute='language' %}" method="POST">
+          {% csrf_token %}
+          <label for="id_language">{% trans "Course languge" %}</label>
+          {{ update_form.language }}
+          <p><button type="submit">{% trans "Update language" %}</button></p>
+        </form>
+      </div>
+    </div>
+    <hr/>
+    {% comment %}
+    <div id="course-metadata">
+      <h3>{% trans 'Meta data' %}</h3>
+      <p>{% blocktrans %}For more information about the supported meta data, see <a href="http://www.lrmi.net/the-specification">lrmi.net</a>{% endblocktrans %}</p>
+      <form action="{% url 'courses_update_metadata' course.id %}" method="POST">
+        {% csrf_token %}
+        <fieldset>
+          <p>
+            <label for="id_about">{% trans 'About (subject)' %}</label>
+            {{ metadata_form.about }}
+          </p>
+          <p>
+            <label for="id_timerequired">{% blocktrans %}Time Required (In <a href="http://en.wikipedia.org/wiki/ISO_8601#Durations">ISO 8601</a> duration format){% endblocktrans %}</label>
+            {{ metadata_form.timerequired }}
+          </p>
+          <p>
+            <label for="id_typicalagerange">{% trans 'Typical Age Range' %}</label>
+            {{ metadata_form.typicalagerange }}
+          </p>
+          <p>
+            <label for="id_isbasedonurl">{% trans 'Is Based on URL' %}</label>
+            {{ metadata_form.isbasedonurl }}
+          </p>
+          <p>
+            <label for="id_educationalrole">{% trans 'Educational Role (target audience)' %}</label>
+            {{ metadata_form.educationalrole }}
+          </p>
+          <p>
+            <label for="id_educationaluse">{% trans 'Educational Use' %}</label>
+            {{ metadata_form.educationaluse }}
+          </p>
+          <p>
+            <label for="id_interactivitytype">{% trans 'Interactivity Type' %}</label> 
+            {{ metadata_form.interactivitytype }}
+          </p>
+        </fieldset>
+        
+        <label>{% trans 'Educational Alignment' %}</label>
+        <fieldset>
+          <span class="row-fluid">
+            <span class="span11 offset1">
+              {{ educational_alignment_form }}
+            </span>
+          </span>
+        </fieldset>
+        <p><button type="submit">{% trans 'Save metadata' %}</button></p>
+      </form>
+    </div>
+    {% endcomment %}
+  {% endif %}
+{% endblock %}
+
+{% block js %}
+  <script type="text/javascript">
+    $(document).ready(function(){
+      $("#id_start_date").datepicker();
+    });
+  </script>
+{% endblock %}
diff --git a/courses/templates/courses/course_sidebar.html b/courses/templates/courses/course_sidebar.html
new file mode 100755
index 000000000..2b034ad80
--- /dev/null
+++ b/courses/templates/courses/course_sidebar.html
@@ -0,0 +1,84 @@
+{% load i18n %}
+
+<div id="sidebar">
+    <figure class="project_img">
+      <a id="id-course-image-link" itemprop="url" href="{% url 'courses_show' course_id=course.id slug=course.slug %}">
+        {% if course.image %}
+  	         <img id="id-course-image" src="{{ course.image.url }}" alt="course image" itemprop="image" />
+        {% else %}
+             <img id="id-course-image" src="{{ STATIC_URL}}images/project-missing.png" alt="course image" itemprop="image" />
+        {% endif %}
+        {% if course.status == 'archived' %}
+          <img id="id-course-image-overlay" src="{{ STATIC_URL }}images/course-archived.png" alt="Archived course"/>
+        {% else %}
+        {% if course.status == 'draft' %}
+          <img id="id-course-image-overlay" src="{{ STATIC_URL }}images/course-draft.png" alt="Draft course"/>
+        {% endif %}
+        {% endif %}
+      </a>
+    </figure>
+
+    {% if course.based_on %}
+    <div>{% trans 'Based on '%}<a href="{% url 'courses_show' course_id=course.based_on.id slug=course.based_on.slug %}" itemprop="isBasedOnUrl" >{{course.based_on.title}}</a></div>
+    {% endif %}
+
+    {% if lists %}
+      <div>
+        <h2>{% trans 'Featured in:' %}</h2>
+        <ul class="unstyled">
+          {% for list in lists %}
+            <li><a href="{{list.url}}">{{list.title}}</a></li>
+          {% endfor %}
+        </ul>
+      </div>
+    {% endif %}
+
+    <div>
+      <ul class="nav flex-column">
+        <li class="nav-item {% if not content%}active{% endif %}">
+          <a class="nav-link" href="{% url 'courses_show' course_id=course.id slug=course.slug %}">{% trans "About" %}</a>
+        </li>
+        <li class="divider"></li>
+        {% for task in course.content %}
+          {% if content and content.id == task.id %}
+            <li class="nav-item active">
+          {% else %}
+            <li class="nav-item">
+          {% endif %}
+            <a class="nav-link" href="{% url 'courses_content_show' course_id=course.id content_id=task.id %}">{{ task.title }}</a>
+            <div>
+            </div>
+          </li>
+        {% endfor %}
+      </ul>
+    </div>
+
+    <hr/>
+    {% if organizer %}
+      <p>
+        <a href="{% url 'courses_clone' course_id=course.id %}" class="btn">{% trans 'Clone course' %}</a>
+      </p>
+    {% endif %}
+
+    {% if admin %}
+      <p>
+        <a class="btn" href="{% url 'courses_delete_spam' course_id=course.id %}">{% trans 'Delete spam' %}</a>
+      </p>
+    {% endif %}
+
+    <p>
+    {% comment %}
+      <form action="{% url 'report_abuse' %}" method="post">
+        {% csrf_token %}
+        <input id="id_url" name="url" type="hidden" value="{{request.get_full_path}}"/>
+        <button type="submit">Report abuse</button>
+      </form>
+      {% endcomment %}
+    </p>
+
+    <!--div id="course-description">
+      <h2>{% trans "Description" %}</h2>
+      <p>{{ course.description }}</p>
+    </div-->
+</div> <!-- /#sidebar -->
+
diff --git a/courses/templates/courses/course_user_snip.html b/courses/templates/courses/course_user_snip.html
new file mode 100755
index 000000000..f6f07000a
--- /dev/null
+++ b/courses/templates/courses/course_user_snip.html
@@ -0,0 +1,24 @@
+
+{% load i18n %}
+
+<li class="user-tile">
+  <div><strong>{{user.username}}</strong></div>
+  <a href="{% url users_profile_view username=user.username %}">
+    <img src="{{ user.profile_image_url }}" alt="{{user.username}}">
+  </a>
+
+  <div>
+  {% if can_edit %}
+    <form action="{% url courses_leave course_id=course.id username=user.username %}" method="POST">
+      {% csrf_token %}
+      <button class="btn btn-mini btn-danger" type="submit">{% trans "Remove user" %}</button>
+    </form>
+    {% if user.role == "LEARNER" %}
+      <form action="{% url courses_add_organizer course_id=course.id username=user.username %}" method="POST">
+        {% csrf_token %}
+        <button class="btn btn-mini" type="submit">{% trans "Make organizer" %}</button>
+      </form>
+    {% endif %}
+  {% endif %}
+  </div>
+</li>
diff --git a/courses/templates/courses/create_content.html b/courses/templates/courses/create_content.html
new file mode 100755
index 000000000..22b6c35c8
--- /dev/null
+++ b/courses/templates/courses/create_content.html
@@ -0,0 +1,72 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+
+{% block title %}Create a new course{% endblock %}
+{% block bodyclasses %}course-create{% endblock%}
+
+{% block css %}
+<link rel="stylesheet" href="{{ STATIC_URL }}css/course.css">
+<link rel="stylesheet" href="{{ STATIC_URL }}pagedown/pagedown.css">
+{% endblock %}
+
+{% block links %}
+{% endblock %}
+
+{% block breadcrumbs_title %}
+  <h1 id="project-name">
+    <a href="{% url courses_show course_id=course.id slug=course.slug%}">{{course.title}}</a></h1>
+{% endblock %}
+
+{% block breadcrumbs %}
+  <li>
+    <span class="divider">&rsaquo;</span>
+    <a href="{% url courses_show course_id=course.id slug=course.slug%}">{{course.title}}</a>
+  </li>
+{% endblock %}
+
+
+{% block content %}
+
+<div class="row">
+  <div id="sidebar-wrapper" class="col-3">
+    {% include "courses/course_sidebar.html" %}
+  </div>
+
+  <div id="content-container" class="col-9">
+    {% include "courses/content_form_snip.html" %}
+  </div>
+{% endblock %}
+
+{% block js %}
+  <script src="{{ STATIC_URL }}pagedown/Markdown.Converter.js"></script>
+  <script src="{{ STATIC_URL }}pagedown/Markdown.Sanitizer.js"></script>
+  <script src="{{ STATIC_URL }}pagedown/Markdown.Editor.js"></script>
+
+  <script type="text/javascript">
+    $(document).ready(function(){
+      var converter1 = Markdown.getSanitizingConverter();
+      var editor1 = new Markdown.Editor(converter1, "id_content");
+      editor1.run();
+    });
+  </script>
+
+  <script type="text/javascript">
+    $(document).ready(function(){
+      $('#preview-tab').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+        $("#content-preview-placeholder").load(
+            "{% url courses_preview_content %}",
+            {
+                "content":$("#id_content").attr("value"),
+                "csrfmiddlewaretoken": "{{ csrf_token }}"
+            });
+        });
+
+        $('#MDCStrigger').bind('click', function(e){
+            $('#md-cheatsheet').tab('show');
+        });
+    });
+  </script>
+{% endblock %}
diff --git a/courses/templates/courses/create_course.html b/courses/templates/courses/create_course.html
new file mode 100755
index 000000000..9fa0c62c7
--- /dev/null
+++ b/courses/templates/courses/create_course.html
@@ -0,0 +1,72 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}Create a new course{% endblock %}
+{% block bodyclasses %}course-create{% endblock%}
+
+{% block css %}
+<link rel="stylesheet" href="{{ STATIC_URL }}css/course.css">
+{% endblock %}
+
+{% block links %}
+{% endblock %}
+
+{% block breadcrumbs_title %}
+    <h1>{% trans "Create a new course" %}</h1>
+{% endblock %}
+
+{% block breadcrumbs %}
+{% endblock %}
+
+{% block content %}
+  <div class="row">
+    <div class="span3">
+      {% blocktrans %}
+        <h2>Ready to create a course?</h2>
+        <p>First, give your course a title--we recommend something zippy, snappy and attention-grabby.</p>
+        <p>Next, create a "hashtag" or handle for your course.</p>
+        <p>Give a few more details in the "description" field, hit the button and voilà! You've created a P2PU course!</p>
+        <p>Need further guidance on how to make a stellar experience? Check out the <a href="/en/groups/make-a-course/">"Create a Course"</a> materials!</p>
+        <p>Be sure to have a look at our <a href="/groups/list/community/">featured</a> courses for good examples.</p>
+        <p>If you'd like help or feedback on your course, drop a line to the P2PU Community <a href="http://community.p2pu.org" target="_blank">forum</a> and say 'Hi'.</p>
+      {% endblocktrans %}
+    </div>
+
+    <div class="span7 offset1">
+      <form action="" method="POST">
+        {% csrf_token %}
+        <p>
+          <label for="id_title">{% trans "Course Title:" %}</label>
+          {{form.title.errors}}
+          <input class="span6" type="text" name="title" id="id_title" placeholder="{% trans "A catchy title for the course, ex. 'Get CC Savvy'" %}" value="{{form.title.value|default_if_none:""}}"/>
+          <span class="help-inline"></span>
+        </p>
+        <p>
+          <label for="id_hashtag">{% trans "Hashtag:"%} <a class="form-tip" href="#" rel="tooltip" data-original-title="{% trans "Specify a short hashtag of up to 20 characters that should be used when sending out notifications and tweets about the course."%}">?</a></label> 
+          {{form.hashtag.errors}}
+
+          <input class="span6" type="text" name="hashtag" id="id_hashtag" placeholder="{% trans "A short handle for the course, ex. 'ccsavvy'" %}" value="{{form.hashtag.value|default_if_none:""}}"/>
+
+        </p>
+        <p>
+          <label for="id_description">{% trans "Description:" %} <a class="form-tip" href="#" rel="tooltip" data-original-title="{% trans "This description is used in places where your course will be listed."%}">?</a></label> 
+          {{form.description.errors}}
+          <textarea class="span6" id="id_description" rows="4" name="description" placeholder="{% trans "A brief description of what the course is about, ex. 'Learn when, where and how to use a CC license'" %}">{{form.description.value|default_if_none:""}}</textarea>
+        </p>
+        <p>
+          <label for="id_language">Language: <a class="form-tip" href="#" rel="tooltip" data-original-title="{% trans "This is the language that your course will use. It will help people searching for courses in a particular language."%}">?</a></label>
+          {{ form.language }}
+        </p>
+        <button class="btn-primary" type="submit">{% trans "Create my course!" %}</button>
+      </form>
+    </div>
+  </div>
+{% endblock %}
+
+{% block scripts %}
+  <script type="text/javascript">
+    $(document).ready(function(){
+        $(".form-tip").tooltip({placement:"right"});
+    });
+  </script>
+{% endblock %}
diff --git a/courses/templates/courses/edit_content.html b/courses/templates/courses/edit_content.html
new file mode 100755
index 000000000..38545e457
--- /dev/null
+++ b/courses/templates/courses/edit_content.html
@@ -0,0 +1,68 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+
+{% block title %}{{content.title}}{% endblock %}
+{% block bodyclasses %}course-content{% endblock%}
+
+{% block css %}
+<link rel="stylesheet" href="{{ STATIC_URL }}css/course.css">
+<link rel="stylesheet" href="{{ STATIC_URL }}pagedown/pagedown.css">
+{% endblock %}
+
+{% block breadcrumbs_title %}
+  <h1 id="project-name">
+    <a href="{% url courses_show course_id=course.id slug=course.slug%}">{{course.title}}</a></h1>
+{% endblock %}
+
+{% block breadcrumbs %}
+  <li>
+    <span class="divider">&rsaquo;</span>
+    <a href="{% url courses_show course_id=course.id slug=course.slug%}">{{course.title}}</a>
+  </li>
+
+{% endblock %}
+
+{% block content %}
+<div class="row">
+  <div id="sidebar-wrapper" class="span3">
+    {% include "courses/course_sidebar.html" %}
+  </div>
+   
+  <div id="content-container" class="span9">
+    <h2>{{ content.title }}</h2>
+    {% include "courses/content_form_snip.html" %}
+  </div>
+</div>
+{% endblock %}
+
+{% block script %}
+  <script src="{{ STATIC_URL }}pagedown/Markdown.Converter.js"></script>
+  <script src="{{ STATIC_URL }}pagedown/Markdown.Sanitizer.js"></script>
+  <script src="{{ STATIC_URL }}pagedown/Markdown.Editor.js"></script>
+
+  <script type="text/javascript">
+    $(document).ready(function(){
+      var converter1 = Markdown.getSanitizingConverter();
+      var editor1 = new Markdown.Editor(converter1, "id_content");
+      editor1.run();
+    });
+  </script>
+
+  <script type="text/javascript">
+    $(document).ready(function(){
+      $('#preview-tab').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+        $("#content-preview-placeholder").load(
+            "{% url courses_preview_content %}",
+            {
+                "content":$("#id_content").attr("value"),
+                "csrfmiddlewaretoken": "{{ csrf_token }}"
+            }
+        );
+      });
+    });
+  </script>
+
+{% endblock %}
diff --git a/courses/templates/courses/emails/course_announcement.txt b/courses/templates/courses/emails/course_announcement.txt
new file mode 100755
index 000000000..5278aad12
--- /dev/null
+++ b/courses/templates/courses/emails/course_announcement.txt
@@ -0,0 +1,5 @@
+{% load i18n %}
+
+{{ announcement_text|safe }}
+
+{{ _('Manage how often you get these delightful messages at:') }} http://{{domain}}/profile/edit/notifications/
diff --git a/courses/templates/courses/emails/course_announcement_subject.txt b/courses/templates/courses/emails/course_announcement_subject.txt
new file mode 100755
index 000000000..437ee1890
--- /dev/null
+++ b/courses/templates/courses/emails/course_announcement_subject.txt
@@ -0,0 +1,3 @@
+{% load i18n %}
+
+{% blocktrans with hashtag=course.hashtag %}P2PU Course Announcement #{{ hashtag }}{% endblocktrans %}
diff --git a/courses/templates/courses/emails/course_join.txt b/courses/templates/courses/emails/course_join.txt
new file mode 100755
index 000000000..1d290a113
--- /dev/null
+++ b/courses/templates/courses/emails/course_join.txt
@@ -0,0 +1,10 @@
+{% load i18n %}
+
+
+{% trans 'Howdy course organizer!' %}
+
+{% blocktrans with course_title=course.title%}{{new_user}} signed up for {{course_title}}!{% endblocktrans %}
+
+{% blocktrans %}Regards
+The P2PU team{% endblocktrans %}
+{% trans 'Manage how often you get these delightful messages at:' %} http://{{domain}}/profile/edit/notifications/
diff --git a/courses/templates/courses/emails/course_join_subject.txt b/courses/templates/courses/emails/course_join_subject.txt
new file mode 100755
index 000000000..bc3b7da3a
--- /dev/null
+++ b/courses/templates/courses/emails/course_join_subject.txt
@@ -0,0 +1,3 @@
+{% load i18n %}
+
+{% blocktrans with course_title=course.title course_hash=course.hashtag username=new_user %}[{{course_hash}}] {{username}} has signed up for {{course_title}}!{% endblocktrans %}
diff --git a/courses/templates/courses/preview_content_snip.html b/courses/templates/courses/preview_content_snip.html
new file mode 100755
index 000000000..5c2e9b7c2
--- /dev/null
+++ b/courses/templates/courses/preview_content_snip.html
@@ -0,0 +1,3 @@
+{% load embed %}
+{% load content2_tags %}
+{{content|convert_content|embed|safe}}
diff --git a/courses/tests.py b/courses/tests.py
new file mode 100755
index 000000000..48daf0fcb
--- /dev/null
+++ b/courses/tests.py
@@ -0,0 +1,200 @@
+from django.test import Client
+from django.contrib.auth.models import User
+from users.models import create_profile
+
+from test_utils import TestCase
+
+from courses import models as course_model
+from content import models as content_model
+from mock import patch
+
+
+class CourseTests(TestCase):
+
+    test_username = 'testuser'
+    test_email = 'test@mail.org'
+    test_password = 'testpass'
+
+    test_username2 = 'bob'
+    test_email2 = 'bob@mail.org'
+    test_password2 = '13245'
+
+    test_title = "A test course"
+    test_hashtag = "hashtag"
+    test_description = "This is only a test."
+
+    def setUp(self):
+        self.client = Client()
+        self.locale = 'en'
+
+        django_user = User(
+            username=self.test_username,
+            email=self.test_email,
+        )
+        self.user = create_profile(django_user)
+        self.user.set_password(self.test_password)
+        self.user.save()
+        
+        django_user2 = User(
+            username=self.test_username2,
+            email=self.test_email2,
+        )
+        self.user2 = create_profile(django_user2)
+        self.user2.set_password(self.test_password2)
+        self.user2.save()
+
+
+        self.course = course_model.create_course(
+            **{
+                "title": self.test_title,
+                "hashtag": self.test_hashtag,
+                "description": self.test_description,
+                "language": "en",
+                "organizer_uri": '/uri/users/testuser',
+            }
+        )
+        content_model.update_content(
+            self.course['about_uri'],
+            'About',
+            'This is the about content',
+            '/uri/users/testuser'
+        )
+        
+    def test_course_creation(self):
+        course = course_model.create_course(
+            **{
+                "title": "A test course",
+                "hashtag": "ATC-1",
+                "description": "This course is all about ABC",
+                "language": "en",
+                "organizer_uri": '/uri/user/testuser'
+            }
+        )
+
+        self.assertTrue(not course == None)
+
+        # test that about content was created
+        about = content_model.get_content(course['about_uri'])
+        self.assertTrue(not about == None)
+        self.assertEqual(about['title'], "About")
+
+        # test that a cohort was created
+        cohort = course_model.get_course_cohort(course['uri'])
+        self.assertTrue(not cohort == None)
+
+        self.assertTrue(
+            course_model.user_in_cohort('/uri/user/testuser', cohort['uri'])
+        )
+        self.assertTrue(
+            course_model.is_cohort_organizer('/uri/user/testuser', cohort['uri'])
+        )
+
+    def test_course_get(self):
+        course = course_model.get_course(self.course['uri'])
+        self.assertTrue('id' in course)
+        self.assertTrue('uri' in course)
+        self.assertTrue('title' in course)
+        self.assertTrue('hashtag' in course)
+        self.assertTrue('slug' in course)
+        self.assertTrue('description' in course)
+        self.assertTrue('language' in course)
+        self.assertTrue('date_created' in course)
+        self.assertTrue('author_uri' in course)
+        self.assertTrue('status' in course)
+        self.assertTrue('about_uri' in course)
+        self.assertTrue('content' in course)
+
+    def test_add_content(self):
+        pass
+
+    def test_add_user(self):
+        cohort = course_model.get_course_cohort(self.course['uri'])
+        course_model.add_user_to_cohort(
+            cohort['uri'], '/uri/user/bob', 'ORGANIZER')
+        cohort2 = course_model.get_course_cohort(self.course['uri'])
+        self.assertEqual(len(cohort['users']), len(cohort2['users'])-1)
+
+    def test_remove_user(self):
+        pass
+
+    def test_make_organizer(self):
+        pass
+
+    def test_send_course_announcement(self):
+        course = course_model.create_course(
+            **{
+                "title": "A test course",
+                "hashtag": "ATC-1",
+                "description": "This course is all about ABC",
+                "language": "en",
+                "organizer_uri": '/uri/user/testuser/'
+            }
+        )
+        with patch('notifications.models.send_notifications_i18n') as send_notification:
+            course_model.send_course_announcement(course['uri'], 'Notification text')
+            self.assertTrue(send_notification.called)
+            #TODO test parameters sent to send_notification
+
+
+    def test_clone_course(self):
+        clone = course_model.clone_course(self.course['uri'], '/uri/user/bob/')
+        for key in ['title', 'hashtag', 'description', 'language']:
+            self.assertEqual(clone[key], self.course[key])
+        self.assertIn('based_on_uri', clone)
+
+        about = content_model.get_content(self.course['about_uri'])
+        clone_about = content_model.get_content(clone['about_uri'])
+        self.assertEquals(about['content'], clone_about['content'])
+
+        self.assertEqual(len(clone['content']), len(self.course['content']))
+        for i in range(len(clone['content'])):
+            self.assertEqual(clone['content'][i]['title'], self.course['content'][i]['title'])
+            self.assertEqual(clone['content'][i]['content'], self.course['content'][i]['content'])
+
+    def test_delete_spam_course(self):
+        course = course_model.create_course(
+            **{
+                "title": "A test course",
+                "hashtag": "ATC-1",
+                "description": "This course is all about ABC",
+                "language": "en",
+                "organizer_uri": '/uri/user/testuser'
+            }
+        )
+        course_model.delete_spam_course(course['uri'])
+        with self.assertRaises(course_model.ResourceDeletedException):
+            course_model.get_course(course['uri'])
+
+    def test_get_courses(self):
+        user = User(username='testuser99', email='99@example.com')
+        user = create_profile(user)
+        user.save()
+
+        course = course_model.create_course(
+            **{
+                "title": "A test course",
+                "hashtag": "ATC-1",
+                "description": "This course is all about ABC",
+                "language": "en",
+                "organizer_uri": '/uri/user/testuser'
+            }
+        )
+        
+        course = course_model.create_course(
+            **{
+                "title": "A unique test course",
+                "hashtag": "AUTC-1",
+                "description": "This course is all about ABC",
+                "language": "en",
+                "organizer_uri": '/uri/user/testuser99'
+            }
+        )
+
+
+        # get course by title
+        courses = course_model.get_courses(title="A unique test course")
+        self.assertEquals(len(courses), 1)
+
+        # get course by user uri
+        courses = course_model.get_courses(organizer_uri="/uri/user/testuser99")
+        self.assertEquals(len(courses), 1)
diff --git a/courses/urls.py b/courses/urls.py
new file mode 100755
index 000000000..49efb23ad
--- /dev/null
+++ b/courses/urls.py
@@ -0,0 +1,128 @@
+from django.urls import re_path
+
+from courses import views
+
+urlpatterns = [
+    re_path(r'^create/$', views.create_course,
+        name='courses_create'),
+
+    re_path(r'^import_project/(?P<project_slug>[\w-]+)/$',
+        views.import_project,
+        name='courses_import_project'),
+
+    re_path(r'^(?P<course_id>[\d]+)/clone/$',
+        views.clone_course,
+        name='courses_clone'),
+
+    re_path(r'^(?P<course_id>[\d]+)/$',
+        views.course_slug_redirect,
+        name='courses_slug_redirect'),
+
+    re_path(r'^(?P<course_id>[\d]+)/learn_api_data/$',
+        views.course_learn_api_data,
+        name='courses_learn_api_data'),
+
+    re_path(r'^(?P<course_id>[\d]+)/admin_content/$',
+        views.course_admin_content,
+        name='courses_admin_content'),
+
+    re_path(r'^(?P<course_id>[\d]+)/discussion/$',
+        views.course_discussion,
+        name='courses_discussion'),
+
+    re_path(r'^(?P<course_id>[\d]+)/people/$',
+        views.course_people,
+        name='courses_people'),
+
+    re_path(r'^(?P<course_id>[\d]+)/settings/$',
+        views.course_settings,
+        name='courses_settings'),
+
+    re_path(r'^(?P<course_id>[\d]+)/announcement/$',
+        views.course_announcement,
+        name='courses_announcement'),
+
+    re_path(r'^(?P<course_id>[\d]+)/export_emails/$',
+        views.course_export_emails,
+        name='courses_export_emails'),
+
+    re_path(r'^(?P<course_id>[\d]+)/badges/$',
+        views.course_add_badge,
+        name='course_add_badge'),
+
+    re_path(r'^(?P<course_id>[\d]+)/signup/$',
+        views.course_signup,
+        name='courses_signup'),
+
+    re_path(r'^(?P<course_id>[\d]+)/delete_spam/$',
+        views.delete_spam,
+        name='courses_delete_spam'),
+
+    re_path(r'^(?P<course_id>[\d]+)/upload_image/$',
+        views.course_image,
+        name='courses_image'),
+
+    re_path(r'^(?P<course_id>[\d]+)/add_user/$',
+        views.course_add_user,
+        name='courses_add_user'),
+
+    re_path(r'^(?P<course_id>[\d]+)/change_status/$',
+        views.course_change_status,
+        name='courses_change_status'),
+
+    re_path(r'^(?P<course_id>[\d]+)/change_signup/$',
+        views.course_change_signup,
+        name='courses_change_signup'),
+
+    re_path(r'^(?P<course_id>[\d]+)/change_term/(?P<term>fixed|rolling)/$',
+        views.course_change_term,
+        name='courses_change_term'),
+
+    re_path(r'^(?P<course_id>[\d]+)/update/(?P<attribute>[\w_]+)/$',
+        views.course_update_attribute,
+        name='courses_update_attribute'),
+
+    re_path(r'^(?P<course_id>[\d]+)/update_tags/$',
+        views.course_update_tags,
+        name='courses_update_tags'),
+
+    re_path(r'^(?P<course_id>[\d]+)/(?P<slug>[\w-]+)/$',
+        views.show_course,
+        name='courses_show'),
+
+    re_path(r'^(?P<course_id>[\d]+)/remove_user/(?P<username>[\w\-\. ]+)/$',
+        views.course_leave,
+        name='courses_leave'),
+
+    re_path(r'^(?P<course_id>[\d]+)/add_organizer/(?P<username>[\w\-\. ]+)/$',
+        views.course_add_organizer,
+        name='courses_add_organizer'),
+
+    re_path(r'^(?P<course_id>[\d]+)/content/create/$',
+        views.create_content,
+        name='courses_create_content'),
+
+    re_path(r'content/preview/$',
+        views.preview_content,
+        name='courses_preview_content'),
+
+    re_path(r'^(?P<course_id>[\d]+)/content/(?P<content_id>[\d]+)/$',
+        views.show_content,
+        name='courses_content_show'),
+    
+    re_path(r'^(?P<course_id>[\d]+)/content/(?P<content_id>[\d]+)/edit/$',
+        views.edit_content,
+        name='courses_content_edit'),
+
+    re_path(r'^(?P<course_id>[\d]+)/content/(?P<content_id>[\d]+)/remove/$',
+        views.remove_content,
+        name='courses_content_remove'),
+
+    re_path(r'^(?P<course_id>[\d]+)/content/(?P<content_id>[\d]+)/up/$',
+        views.move_content_up,
+        name='courses_content_up'),
+
+    re_path(r'^(?P<course_id>[\d]+)/content/(?P<content_id>[\d]+)/down/$',
+        views.move_content_down,
+        name='courses_content_down'),
+]
diff --git a/courses/utils.py b/courses/utils.py
new file mode 100755
index 000000000..ad36ed76c
--- /dev/null
+++ b/courses/utils.py
@@ -0,0 +1,35 @@
+import courses.models as course_model
+import content.models as content_model
+from content import utils as content_utils
+
+def import_project(project, hashtag):
+    course = {}
+    course['title'] = project.name
+    course['hashtag'] = hashtag
+    course['description'] = project.short_description
+    course['language'] = project.language
+    user_uri = "/uri/user/{0}".format(project.participations.filter(organizing=True).order_by('joined_on')[0].user.username)
+    course['organizer_uri'] = user_uri
+
+    course = course_model.create_course(**course)
+
+    # update about page
+    about = {
+        "uri": course['about_uri'],
+        "title": "About",
+        "content": project.long_description,
+        "author_uri": user_uri,
+    }
+    content_model.update_content(**about)
+
+    # add other pages to course
+    for page in project.pages.filter(deleted=False, listed=True).order_by('index'):
+        content = {
+            "title": page.title,
+            "content": content_utils.clean_user_content(page.content),
+            "author_uri": "/uri/user/{0}".format(page.author.username),
+        }
+        content = content_model.create_content(**content)
+        course_model.add_course_content(course['uri'], content['uri'])
+
+    return course
diff --git a/courses/views.py b/courses/views.py
new file mode 100755
index 000000000..cc9dce377
--- /dev/null
+++ b/courses/views.py
@@ -0,0 +1,706 @@
+import logging
+import unicodecsv
+
+from django import http
+from django.shortcuts import render, get_object_or_404
+from django.template.loader import render_to_string
+from django.template import RequestContext
+from django.utils.translation import gettext as _
+from django.utils.translation import get_language
+import json
+from django.views.decorators.http import require_http_methods
+from django.conf import settings
+
+from django.urls import reverse
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth import get_user_model
+User = get_user_model()
+
+from django.contrib import messages
+
+from courses import models as course_model
+from courses.forms import CourseCreationForm
+from courses.forms import CourseUpdateForm
+from courses.forms import CourseTermForm
+from courses.forms import CourseImageForm
+from courses.forms import CourseStatusForm
+from courses.forms import CohortSignupForm
+from courses.forms import CourseTagsForm
+from courses.forms import CourseEmbeddedUrlForm
+from courses.decorators import require_organizer
+from courses.badges_oembed import add_content_from_response
+from courses.badges_oembed import BadgeNotFoundException
+
+from content import models as content_model
+from content.forms import ContentForm
+
+#from learn import models as learn_model
+from media import models as media_model
+
+
+log = logging.getLogger(__name__)
+
+
+def _get_course_or_404( course_uri ):
+    try:
+        course = course_model.get_course(course_uri)
+    #except course_model.ResourceDeletedException:
+    #    raise http.
+    except:
+        # TODO: this masks all exceptions that may happen in get_course!
+        raise http.Http404
+    return course
+
+
+def _populate_course_context( request, course_id, context ):
+    course_uri = course_model.course_id2uri(course_id)
+    course = _get_course_or_404(course_uri)
+    course['author'] = course['author_uri'].strip('/').split('/')[-1]
+    context['course'] = course
+    context['course_url'] = reverse('courses_show',
+        kwargs={'course_id': course['id'], 'slug': course['slug']}
+    )
+    if 'image_uri' in course:
+        context['course']['image'] = media_model.get_image(course['image_uri'])
+
+    #NOTE if performance becomes a problem dont fetch cohort
+    cohort = course_model.get_course_cohort(course_uri)
+    context['cohort'] = cohort
+    user_uri = u"/uri/user/{0}".format(request.user.username)
+    context['organizer'] = course_model.is_cohort_organizer(
+        user_uri, cohort['uri']
+    )
+    context['organizer'] |= request.user.is_superuser
+    context['admin'] = request.user.is_superuser
+    context['can_edit'] = context['organizer'] and not course['status'] == 'archived'
+    context['trusted_user'] = request.user.has_perm('users.trusted_user')
+    if course_model.user_in_cohort(user_uri, cohort['uri']):
+        if not context['organizer']:
+            context['show_leave_course'] = True
+        context['learner'] = True
+    elif cohort['signup'] == "OPEN":
+        context['show_signup'] = True
+
+    #try:
+    #    course_lists = learn_model.get_lists_for_course(reverse(
+    #        'courses_slug_redirect',
+    #        kwargs={'course_id': course_id}
+    #    ))
+    #    f = lambda l: l['name'] not in ['drafts', 'listed', 'archived']
+    #    context['lists'] = filter(f, course_lists)
+    #except:
+    #    log.error("Could not get lists for course!")
+
+    if 'based_on_uri' in course:
+        course['based_on'] = course_model.get_course(course['based_on_uri'])
+
+    return context
+
+
+@login_required
+def create_course( request ):
+    if request.method == "POST":
+        form = CourseCreationForm(request.POST)
+        if form.is_valid():
+            user = request.user
+            user_uri = u"/uri/user/{0}".format(user.username)
+            course = {
+                'title': form.cleaned_data.get('title'),
+                'hashtag': form.cleaned_data.get('hashtag'),
+                'description': form.cleaned_data.get('description'),
+                'language': form.cleaned_data.get('language'),
+                'organizer_uri': user_uri
+            }
+            course = course_model.create_course(**course)
+            redirect_url = reverse('courses_show', 
+                kwargs={'course_id': course['id'], 'slug': course['slug']}
+            )
+            return http.HttpResponseRedirect(redirect_url)
+    else:
+        form = CourseCreationForm(initial={'language': get_language()})
+
+    context = { 'form': form }
+    return render(request, 'courses/create_course.html', context)
+
+
+def import_project( request, project_slug ):
+    from projects.models import Project
+    project = get_object_or_404(Project, slug=project_slug)
+    from courses import utils
+    course = utils.import_project(project, project.name[:3])
+    cohort = course_model.get_course_cohort(course['uri'])
+    user_uri = u"/uri/user/{0}".format(request.user.username)
+    course_model.add_user_to_cohort(cohort['uri'], user_uri, "ORGANIZER")
+    return course_slug_redirect(request, course['id'])
+
+
+@require_organizer
+def clone_course( request, course_id ):
+    course_uri = course_model.course_id2uri(course_id)
+    user_uri = u"/uri/user/{0}".format(request.user.username)
+    course = course_model.clone_course(course_uri, user_uri)
+    return course_slug_redirect(request, course['id'])
+
+
+def course_slug_redirect( request, course_id ):
+    course_uri = course_model.course_id2uri(course_id)
+    course = _get_course_or_404(course_uri)
+    redirect_url = reverse('courses_show', 
+        kwargs={'course_id': course_id, 'slug': course['slug']})
+    return http.HttpResponseRedirect(redirect_url)
+
+
+def show_course( request, course_id, slug=None ):
+    course_uri = course_model.course_id2uri(course_id)
+    course = _get_course_or_404(course_uri)
+    
+    if slug != course['slug']:
+        return course_slug_redirect( request, course_id)
+
+    context = { }
+    context = _populate_course_context(request, course_id, context)
+    context['about_active'] = True
+
+    if context['organizer']:
+        context['update_form'] = CourseUpdateForm(course)
+
+    context['about'] = content_model.get_content(course['about_uri'])
+
+    return render(request, 'courses/course.html', context)
+
+
+def course_learn_api_data( request, course_id ):
+    """ return data required by the learn API """
+    course_uri = course_model.course_id2uri(course_id)
+    try:
+        course_data = course_model.get_course_learn_api_data(course_uri)
+    except:
+        raise http.Http404
+
+    return http.HttpResponse(json.dumps(course_data), mimetype="application/json")
+
+
+@login_required
+@require_organizer
+def course_add_badge( request, course_id ):
+    context = { }
+    context = _populate_course_context(request, course_id, context)
+    context['badges_active'] = True
+    user = request.user
+
+    form = CourseEmbeddedUrlForm()
+
+    if request.method == "POST":
+        form = CourseEmbeddedUrlForm(request.POST)
+
+        if form.is_valid():
+            content = None
+            user_uri = u"/uri/user/{0}".format(user.username)
+            try:
+                content = add_content_from_response(
+                    context['course']['uri'],
+                    form.cleaned_data['url'], user_uri)
+            except BadgeNotFoundException:
+                form = CourseEmbeddedUrlForm()
+                messages.error(request, _('Error! We could not retrieve this Badge'))
+            if content:
+                redirect_url = reverse('courses_content_show',
+                                       kwargs={'course_id': course_id,
+                                               'content_id': content['id']})
+                return http.HttpResponseRedirect(redirect_url)
+
+    context['form'] = form
+    return render(request, 'courses/course_badges.html', context)
+
+
+@login_required
+@require_organizer
+def course_admin_content( request, course_id ):
+    course_uri = course_model.course_id2uri(course_id)
+    course = _get_course_or_404(course_uri)
+ 
+    context = { }
+    context = _populate_course_context(request, course_id, context)
+    context['content_active'] = True
+
+    return render(
+        request,
+        'courses/course_admin_content.html',
+        context
+    )
+
+
+def course_discussion( request, course_id ):
+    course_uri = course_model.course_id2uri(course_id)
+    course = _get_course_or_404(course_uri)
+ 
+    context = { }
+    context = _populate_course_context(request, course_id, context)
+    context['discussion_active'] = True
+
+    return render(
+        request,
+        'courses/course_discussion.html',
+        context
+    )
+
+
+def course_people( request, course_id ):
+    course_uri = course_model.course_id2uri(course_id)
+    course = _get_course_or_404(course_uri)
+ 
+    context = { }
+    context = _populate_course_context(request, course_id, context)
+
+    from users.models import get_user_profile_image_url
+    for user in context['cohort']['users'].values():
+        user['profile_image_url'] = get_user_profile_image_url(user['uri'])
+
+    context['people_active'] = True
+
+    return render(
+        request,
+        'courses/course_people.html',
+        context
+    )
+
+
+@login_required
+@require_organizer
+def course_settings( request, course_id ):
+    course_uri = course_model.course_id2uri(course_id)
+    course = _get_course_or_404(course_uri)
+ 
+    context = { }
+    context = _populate_course_context(request, course_id, context)
+
+    context['update_form'] = CourseUpdateForm(course)
+    context['image_form'] = CourseImageForm()
+    context['status_form'] = CourseStatusForm(course)
+    tags = ", ".join(course_model.get_course_tags(course_uri))
+    context['tags_form'] = CourseTagsForm({'tags': tags})
+    if context['cohort']['term'] == 'FIXED':
+        context['term_form'] = CourseTermForm(context['cohort'])
+    else:
+        context['term_form'] = CourseTermForm()
+    context['signup_form'] = CohortSignupForm(
+        initial={'signup': context['cohort']['signup']}
+    )
+
+    context['settings_active'] = True
+
+    return render(
+        request,
+        'courses/course_settings.html',
+        context
+    )
+
+
+@login_required
+@require_http_methods(['POST'])
+@require_organizer
+def course_image( request, course_id ):
+    course_uri = course_model.course_id2uri(course_id)
+    user_uri = u"/uri/user/{0}".format(request.user.username)
+    image_form = CourseImageForm(request.POST, request.FILES)
+    if image_form.is_valid():
+        image_file = request.FILES['image']
+        image = media_model.upload_image(image_file, course_uri)
+        course_model.update_course(
+            course_uri=course_uri,
+            image_uri=image['uri'],
+        )
+    else:
+        messages.error(request, _("Could not upload image"))
+    redirect_url = reverse('courses_settings', kwargs={'course_id': course_id})
+    return http.HttpResponseRedirect(redirect_url)
+
+
+@login_required
+def course_signup( request, course_id ):
+    #NOTE: consider using cohort_id in URL to avoid cohort lookup
+    cohort = course_model.get_course_cohort( course_id )
+    user_uri = u"/uri/user/{0}".format(request.user.username)
+    if cohort['signup'] == "OPEN":
+        course_model.add_user_to_cohort(cohort['uri'], user_uri, "LEARNER", True)
+        messages.success(request, _("You are now signed up for this course."))
+    else:
+        messages.error(request, _("This course isn't open for signup."))
+    return course_slug_redirect( request, course_id )
+
+
+@login_required
+@require_http_methods(['POST'])
+@require_organizer
+def course_add_user( request, course_id ):
+    cohort_uri = course_model.get_course_cohort_uri(course_id)
+    redirect_url = reverse('courses_people', kwargs={'course_id': course_id})
+    username = request.POST.get('username', None)
+
+    if not username:
+        messages.error(request, _("Please select a user to add."))
+        return http.HttpResponseRedirect(redirect_url)
+
+    user_uri = u"/uri/user/{0}".format(username)
+    try:
+        course_model.add_user_to_cohort(cohort_uri, user_uri, "LEARNER")
+        messages.success(request, _("User added."))
+    except course_model.ResourceNotFoundException as e:
+        messages.error(request, _("User does not exist."))
+
+    return http.HttpResponseRedirect(redirect_url)
+
+
+@login_required
+def course_leave( request, course_id, username ):
+    cohort_uri = course_model.get_course_cohort_uri(course_id)
+    user_uri = u"/uri/user/{0}".format(request.user.username)
+    # TODO site admin should also be able to remove users
+    is_organizer = course_model.is_cohort_organizer(
+        user_uri, cohort_uri
+    )
+    removed = False
+    error_message = _("Could not remove user")
+    if username == request.user.username or is_organizer:
+        removed, error_message = course_model.remove_user_from_cohort(
+            cohort_uri, u"/uri/user/{0}".format(username)
+        )
+
+    if not removed:
+        messages.error(request, error_message)
+
+    if is_organizer:
+        redirect_url = reverse('courses_people', kwargs={'course_id': course_id})
+        return http.HttpResponseRedirect(redirect_url)
+
+    return course_slug_redirect( request, course_id)
+
+
+@login_required
+@require_http_methods(['POST'])
+@require_organizer
+def course_add_organizer( request, course_id, username ):
+    cohort_uri = course_model.get_course_cohort_uri(course_id)
+    user_uri = u"/uri/user/{0}".format(request.user.username)
+    is_organizer = course_model.is_cohort_organizer(
+        user_uri, cohort_uri
+    )
+    if not is_organizer and not request.user.is_superuser:
+        messages.error( request, _("Only other organizers can add a new organizer") )
+        return course_slug_redirect( request, course_id)
+    new_organizer_uri = u"/uri/user/{0}".format(username)
+    course_model.remove_user_from_cohort(cohort_uri, new_organizer_uri)
+    course_model.add_user_to_cohort(cohort_uri, new_organizer_uri, "ORGANIZER")
+
+    #TODO
+    redirect_url = reverse('courses_people', kwargs={'course_id': course_id})
+    return http.HttpResponseRedirect(redirect_url)
+
+
+@login_required
+@require_http_methods(['POST'])
+@require_organizer
+def course_change_status( request, course_id ):
+    user_uri = u"/uri/user/{0}".format(request.user.username)
+    course_uri = course_model.course_id2uri(course_id)
+    form = CourseStatusForm(request.POST)
+    if form.is_valid():
+        status = form.cleaned_data['status']
+        if status == 'draft':
+            course = course_model.unpublish_course(course_uri)
+        elif status == 'published':
+            course = course_model.publish_course(course_uri)
+        elif status == 'archived':
+            course = course_model.archive_course(course_uri)
+        messages.success(request, _('Course status updated.'))
+
+    redirect_url = reverse('courses_settings', kwargs={'course_id': course_id})
+    return http.HttpResponseRedirect(redirect_url)
+
+
+@login_required
+@require_http_methods(['POST'])
+@require_organizer
+def course_change_signup( request, course_id ):
+    form = CohortSignupForm(request.POST)
+    if form.is_valid():
+        signup = form.cleaned_data['signup']
+        cohort_uri = course_model.get_course_cohort_uri(course_id)
+        cohort = course_model.update_cohort(cohort_uri, signup=signup.upper())
+        if not cohort:
+            messages.error( request, _("Could not change cohort signup"))
+    else:
+        request.messages.error(request, _("Invalid choice for signup"))
+    redirect_url = reverse('courses_settings', kwargs={'course_id': course_id})
+    return http.HttpResponseRedirect(redirect_url)
+
+
+@login_required
+@require_http_methods(['POST'])
+@require_organizer
+def course_change_term( request, course_id, term ):
+    cohort_uri = course_model.get_course_cohort_uri( course_id )
+    if term == 'fixed':
+        form = CourseTermForm(request.POST)
+        if form.is_valid():
+            course_model.update_cohort(
+                cohort_uri,
+                term=term.upper(),
+                start_date=form.cleaned_data['start_date'],
+                end_date=form.cleaned_data['end_date']
+            )
+        else:
+            messages.error( request, _("Could not update fixed term dates"))
+    elif term == 'rolling':
+        course_model.update_cohort(cohort_uri, term=term.upper())
+    redirect_url = reverse('courses_settings', kwargs={'course_id': course_id})
+    return http.HttpResponseRedirect(redirect_url)
+
+
+@login_required
+@require_http_methods(['POST'])
+@require_organizer
+def course_update_attribute( request, course_id, attribute):
+    course_uri = course_model.course_id2uri(course_id)
+    form = CourseUpdateForm(request.POST)
+    if form.is_valid():
+        kwargs = { attribute: form.cleaned_data[attribute] }
+        course_model.update_course( course_uri, **kwargs )
+    else:
+        messages.error(request, _("Could not update {0}.".format(attribute)))
+    redirect_url = reverse('courses_settings', kwargs={'course_id': course_id})
+    return http.HttpResponseRedirect(redirect_url)
+
+
+@login_required
+@require_http_methods(['POST'])
+@require_organizer
+def course_update_tags( request, course_id ):
+    course_uri = course_model.course_id2uri(course_id)
+    form = CourseTagsForm(request.POST)
+    if form.is_valid():
+        tags = [tag.strip() for tag in form.cleaned_data['tags'].split(',')]
+        course_model.remove_course_tags(
+            course_uri, course_model.get_course_tags(course_uri)
+        )
+        course_model.add_course_tags(course_uri, tags)
+        messages.success( request, _("Course tags successfully updated") )
+
+    redirect_url = reverse('courses_settings', kwargs={'course_id': course_id})
+    return http.HttpResponseRedirect(redirect_url)
+
+
+@login_required
+@require_organizer
+def course_announcement( request, course_id ):
+    context = _populate_course_context(request, course_id, {})
+    context['announcement_active'] = True
+
+    if request.method == "POST" and len(request.POST.get('announcement_text', '')) > 0:
+        text = request.POST.get('announcement_text')
+        course_model.send_course_announcement(
+            context['course']['uri'],
+            text
+        )
+        messages.success(request, _('The announcement has been sent!'))
+        redirect_url = reverse('courses_show', kwargs={'course_id': course_id, 'slug': context['course']['slug']})
+        return http.HttpResponseRedirect(redirect_url)
+
+    return render(
+        request,
+        'courses/course_announcement.html',
+        context
+    )
+
+
+@login_required
+@require_organizer
+def course_export_emails( request, course_id ):
+    if not request.user.has_perm('users.trusted_user'):
+        msg = _('You do not have permission to view this page')
+        return http.HttpResponseForbidden(msg)
+    
+    course_uri = course_model.course_id2uri(course_id)
+    cohort = course_model.get_course_cohort(course_uri)
+
+    response = http.HttpResponse(mimetype='text/csv')
+    response['Content-Disposition'] = 'attachment; '
+    response['Content-Disposition'] += 'filename=detailed_report.csv'
+    writer = unicodecsv.writer(response)
+    writer.writerow(["username", "email address", "signup date"])
+
+    for user in cohort['users'].values():
+        username = user['uri'].strip('/').split('/')[-1]
+        user['email'] = User.objects.get(username=username).email
+        writer.writerow([username, user['email'], user['signup_date']])
+
+    return response
+
+
+def show_content( request, course_id, content_id):
+    content_uri = u'/uri/content/{0}'.format(content_id)
+    user_uri = u"/uri/user/{0}".format(request.user.username)
+    context = _populate_course_context(request, course_id, {})
+
+    if not any( c['uri'] == content_uri for c in context['course']['content']):
+       raise http.Http404
+
+    content = content_model.get_content(content_uri)
+    context['content'] = content
+    context['content_active'] = True
+
+    context['form'] = ContentForm(content)
+    return render(
+        request,
+        'courses/content.html', 
+        context
+    )
+
+
+@login_required
+@require_organizer
+def create_content( request, course_id ):
+    course_uri = course_model.course_id2uri(course_id)
+    course = _get_course_or_404(course_uri)
+    if request.method == "POST":
+        form = ContentForm(request.POST)
+        if form.is_valid():
+            user = request.user
+            user_uri = u"/uri/user/{0}".format(user.username)
+            content_data = {
+                'title': form.cleaned_data.get('title'),
+                'content': form.cleaned_data.get('content'),
+                'author_uri': user_uri,
+            }
+            content = content_model.create_content(**content_data)
+            course_model.add_course_content(course['uri'], content['uri'])
+
+            redirect_url = request.POST.get('next_url', None)
+            if not redirect_url:
+                redirect_url = reverse('courses_show',
+                    kwargs={'course_id': course['id'], 'slug': course['slug']}
+                )
+            return http.HttpResponseRedirect(redirect_url)
+    else:
+        form = ContentForm()
+
+    context = { 'form': form }
+    context = _populate_course_context(request, course_id, context)
+    if request.GET.get('next_url', None):
+        context['next_url'] = request.GET.get('next_url', None)
+
+    return render(
+        request,
+        'courses/create_content.html', 
+        context
+    )
+
+
+@login_required
+@require_organizer
+def edit_content( request, course_id, content_id ):
+    course_uri = course_model.course_id2uri(course_id)
+    course = _get_course_or_404(course_uri)
+    content = content_model.get_content("/uri/content/{0}".format(content_id))
+
+    if request.method == "POST":
+        form = ContentForm(request.POST)
+        if form.is_valid():
+            content_data = {
+                'title': form.cleaned_data.get('title'),
+                'content': form.cleaned_data.get('content'),
+            }
+            user = request.user
+            user_uri = u"/uri/user/{0}".format(user.username)
+            content = content_model.update_content(
+                content['uri'], content_data['title'], 
+                content_data['content'], user_uri
+            )
+            
+            redirect_url = request.POST.get('next_url', None)
+            if not redirect_url:
+                redirect_url = reverse('courses_content_show',
+                    kwargs={'course_id': course_id, 'content_id': content_id}
+                )
+            return http.HttpResponseRedirect(redirect_url)
+    else:
+        form = ContentForm(initial=content)
+
+    context = {
+        'form': form,
+        'content': content,
+    }
+    context = _populate_course_context(request, course_id, context)
+    if request.GET.get('next_url', None):
+        context['next_url'] = request.GET.get('next_url', None)
+    return render(
+        request,
+        'courses/edit_content.html', 
+        context
+    )
+
+
+@login_required
+@require_http_methods(['POST'])
+def preview_content( request ):
+    content = request.POST.get('content')
+    from content import utils
+    content = utils.clean_user_content(content)
+    content = render_to_string("courses/preview_content_snip.html", 
+        {'content':content })
+    return http.HttpResponse(content, mimetype="application/json")
+
+
+@login_required
+@require_organizer
+def remove_content( request, course_id, content_id ):
+    course_uri = course_model.course_id2uri(course_id)
+    content_uri = "/uri/content/{0}".format(content_id)
+    course_model.remove_course_content(course_uri, content_uri)
+    redirect_url = reverse('courses_admin_content', kwargs={'course_id': course_id})
+    return http.HttpResponseRedirect(redirect_url)
+
+
+@login_required
+@require_organizer
+def move_content_up( request, course_id, content_id ):
+    try:
+        course_model.reorder_course_content(
+            "/uri/content/{0}".format(content_id), "UP"
+        )
+    except:
+        messages.error(request, _("Could not move content up!"))
+    redirect_url = reverse('courses_admin_content', kwargs={'course_id': course_id})
+    return http.HttpResponseRedirect(redirect_url)
+
+
+@login_required
+@require_organizer
+def move_content_down( request, course_id, content_id ):
+    try:
+        course_model.reorder_course_content(
+            "/uri/content/{0}".format(content_id), "DOWN"
+        )
+    except:
+        messages.error(request, _("Could not move content down!"))
+    redirect_url = reverse('courses_admin_content', kwargs={'course_id': course_id})
+    return http.HttpResponseRedirect(redirect_url)
+
+
+@login_required
+@require_organizer
+def delete_spam(request, course_id):
+    course_uri = course_model.course_id2uri(course_id)
+    course = _get_course_or_404(course_uri)
+    if request.method == "POST":
+        course_model.delete_spam_course(course_uri)
+        #TODO display splash message to indicate success
+        return http.HttpResponseRedirect(reverse('home'))
+
+    context = { }
+    context = _populate_course_context(request, course_id, context)
+    return render(
+        request,
+        'courses/course_delete_confirmation.html', 
+        context
+    )
diff --git a/learnwithpeople/settings.py b/learnwithpeople/settings.py
index f087db366..9e0932365 100644
--- a/learnwithpeople/settings.py
+++ b/learnwithpeople/settings.py
@@ -64,6 +64,9 @@
     'community_calendar',
     'client_logging',
     'contact',
+    'content',
+    'courses',
+    'media',
 ]
 
 MIDDLEWARE = [
diff --git a/learnwithpeople/urls.py b/learnwithpeople/urls.py
index 2758bed49..845a19be4 100644
--- a/learnwithpeople/urls.py
+++ b/learnwithpeople/urls.py
@@ -12,6 +12,7 @@
     re_path(r'^discourse/', include('discourse_sso.urls')),
     re_path(r'^surveys/', include('surveys.urls')),
     re_path(r'^community_calendar/', include('community_calendar.urls')),
+    re_path(r'^course/', include('courses.urls')),
     re_path(r'^', include('studygroups.urls'))
 )
 
diff --git a/media/__init__.py b/media/__init__.py
new file mode 100755
index 000000000..e69de29bb
diff --git a/media/db.py b/media/db.py
new file mode 100755
index 000000000..df06cbd19
--- /dev/null
+++ b/media/db.py
@@ -0,0 +1,7 @@
+from django.db import models
+
+
+class Image(models.Model):
+
+    image_file = models.FileField(upload_to="uploads/images")
+    uploader_uri = models.CharField(max_length=256)
diff --git a/media/migrations/0001_initial.py b/media/migrations/0001_initial.py
new file mode 100644
index 000000000..ce6017040
--- /dev/null
+++ b/media/migrations/0001_initial.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.2 on 2019-04-09 05:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Image',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('image_file', models.FileField(upload_to='uploads/images')),
+                ('uploader_uri', models.CharField(max_length=256)),
+            ],
+        ),
+    ]
diff --git a/media/migrations/__init__.py b/media/migrations/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/media/models.py b/media/models.py
new file mode 100755
index 000000000..d99732444
--- /dev/null
+++ b/media/models.py
@@ -0,0 +1,23 @@
+from media import db
+
+def upload_image(image_file, uploader_uri):
+    image_db = db.Image(image_file=image_file, uploader_uri=uploader_uri)
+    try:
+        image_db.save()
+    except:
+        return None
+    return get_image("/uri/media/image/{0}".format(image_db.id))
+
+
+def get_image(image_uri):
+    image_id = image_uri.strip('/').split('/')[-1]
+    image_db = None
+    try:
+        image_db = db.Image.objects.get(id=image_id)
+    except:
+        return None
+    image = {
+        "uri": "/uri/media/image/{0}".format(image_db.id),
+        "url": image_db.image_file.url, #this needs to be https!
+    }
+    return image

From 439975a9be80247ac5c13559a6f7bcf59cbcba88 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 27 Nov 2025 14:13:59 +0200
Subject: [PATCH 02/63] Add content to learning circles

---
 content/templatetags/content_tags.py          |   5 +-
 .../templates/courses/content_form_snip.html  |   6 +-
 courses/templates/courses/edit_content.html   |   4 +-
 learnwithpeople/urls.py                       |   2 +-
 ...e_topic_guides_alter_courselist_courses.py |  23 +++
 .../0173_studygroup_course_content.py         |  20 +++
 studygroups/models/learningcircle.py          |   1 +
 studygroups/urls.py                           |   3 +
 studygroups/views/learner.py                  |  30 ++++
 templates/studygroups/content_view.html       | 150 ++++++++++++++++++
 10 files changed, 236 insertions(+), 8 deletions(-)
 create mode 100644 studygroups/migrations/0172_alter_course_topic_guides_alter_courselist_courses.py
 create mode 100644 studygroups/migrations/0173_studygroup_course_content.py
 create mode 100644 templates/studygroups/content_view.html

diff --git a/content/templatetags/content_tags.py b/content/templatetags/content_tags.py
index fac61cf78..088b680ea 100755
--- a/content/templatetags/content_tags.py
+++ b/content/templatetags/content_tags.py
@@ -1,5 +1,6 @@
 from django import template
 from django.template.defaultfilters import stringfilter
+from django.utils.safestring import mark_safe
 
 import markdown
 import bleach
@@ -12,7 +13,7 @@ def add_target_blank(attrs, new=False):
     attrs[(None, 'target')] = '_blank'
     return attrs
 
-@register.filter
+@register.filter(is_safe=True)
 @stringfilter
 def convert_content( markdown_text ):
     html = markdown.markdown(markdown_text)#TODO , ['tables'])
@@ -22,6 +23,6 @@ def convert_content( markdown_text ):
     regex = re.compile(r'<pre\>.*?</pre\>', re.IGNORECASE|re.DOTALL)
     f = lambda m: re.sub(r'&amp;', '&', m.group(0))
     html = regex.sub(f, html)
-    return html
+    return mark_safe(html)
 
 convert_content.is_safe = True
diff --git a/courses/templates/courses/content_form_snip.html b/courses/templates/courses/content_form_snip.html
index d13c413e8..be4333eb4 100755
--- a/courses/templates/courses/content_form_snip.html
+++ b/courses/templates/courses/content_form_snip.html
@@ -17,13 +17,13 @@
           <p>
             <label for="id_title">{% trans "Title" %}</label>
             {{ form.title.errors }}
-            <input class="span8" type="text" id="id_title" name="title" value="{{form.title.value|default_if_none:""}}"/>
+            <input class="col-8" type="text" id="id_title" name="title" value="{{form.title.value|default_if_none:""}}"/>
           </p>
           <p>
             <label for="id_content">{% trans "Content" %}</label>
             {{ form.content.errors }}
             <div id="id_content-wmd-button-bar"></div>
-            <textarea id="id_content" name="content" class="span8" rows="20">{{form.content.value|default_if_none:""}}</textarea>
+            <textarea id="id_content" name="content" class="col-8" rows="20">{{form.content.value|default_if_none:""}}</textarea>
             <p class="help-block">
                 {% blocktrans %}You can use markdown for your content.
                     For some help on using markdown, look
@@ -37,7 +37,7 @@
         <div class="hidden" id="id_content-wmd-preview"></div>
         <div id="content-preview-placeholder"></div>
       </div>
-     <div class="tab-pane" id="md-cheatsheet-pane">
+      <div class="tab-pane" id="md-cheatsheet-pane">
        {% comment %}
          {% include 'learn/markdown_cheatsheet.html' %}
        {% endcomment %}
diff --git a/courses/templates/courses/edit_content.html b/courses/templates/courses/edit_content.html
index 38545e457..aedd0f4c9 100755
--- a/courses/templates/courses/edit_content.html
+++ b/courses/templates/courses/edit_content.html
@@ -25,11 +25,11 @@ <h1 id="project-name">
 
 {% block content %}
 <div class="row">
-  <div id="sidebar-wrapper" class="span3">
+  <div id="sidebar-wrapper" class="col-3">
     {% include "courses/course_sidebar.html" %}
   </div>
    
-  <div id="content-container" class="span9">
+  <div id="content-container" class="col-9">
     <h2>{{ content.title }}</h2>
     {% include "courses/content_form_snip.html" %}
   </div>
diff --git a/learnwithpeople/urls.py b/learnwithpeople/urls.py
index 845a19be4..618827d65 100644
--- a/learnwithpeople/urls.py
+++ b/learnwithpeople/urls.py
@@ -12,7 +12,7 @@
     re_path(r'^discourse/', include('discourse_sso.urls')),
     re_path(r'^surveys/', include('surveys.urls')),
     re_path(r'^community_calendar/', include('community_calendar.urls')),
-    re_path(r'^course/', include('courses.urls')),
+    re_path(r'^courses/', include('courses.urls')),
     re_path(r'^', include('studygroups.urls'))
 )
 
diff --git a/studygroups/migrations/0172_alter_course_topic_guides_alter_courselist_courses.py b/studygroups/migrations/0172_alter_course_topic_guides_alter_courselist_courses.py
new file mode 100644
index 000000000..3c09bd306
--- /dev/null
+++ b/studygroups/migrations/0172_alter_course_topic_guides_alter_courselist_courses.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.11 on 2025-07-24 07:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('studygroups', '0171_courselist'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='course',
+            name='topic_guides',
+            field=models.ManyToManyField(blank=True, to='studygroups.topicguide'),
+        ),
+        migrations.AlterField(
+            model_name='courselist',
+            name='courses',
+            field=models.ManyToManyField(blank=True, to='studygroups.course'),
+        ),
+    ]
diff --git a/studygroups/migrations/0173_studygroup_course_content.py b/studygroups/migrations/0173_studygroup_course_content.py
new file mode 100644
index 000000000..bba239f18
--- /dev/null
+++ b/studygroups/migrations/0173_studygroup_course_content.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.11 on 2025-11-27 08:45
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0001_initial'),
+        ('studygroups', '0172_alter_course_topic_guides_alter_courselist_courses'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='studygroup',
+            name='course_content',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='courses.course'),
+        ),
+    ]
diff --git a/studygroups/models/learningcircle.py b/studygroups/models/learningcircle.py
index ed2e11805..01da8b16e 100644
--- a/studygroups/models/learningcircle.py
+++ b/studygroups/models/learningcircle.py
@@ -57,6 +57,7 @@ def published(self):
 class StudyGroup(LifeTimeTrackingModel):
     name = models.CharField(max_length=128, blank=True)
     course = models.ForeignKey(Course, on_delete=models.CASCADE)
+    course_content = models.ForeignKey('courses.Course', on_delete=models.CASCADE, blank=True, null=True)
     description = BleachField(max_length=2000, blank=True, allowed_tags=settings.TINYMCE_DEFAULT_CONFIG.get('valid_elements', '').split(','), allowed_attributes={'a': ['href', 'title', 'rel', 'target']})
     course_description = BleachField(max_length=2000, blank=True, allowed_tags=settings.TINYMCE_DEFAULT_CONFIG.get('valid_elements', '').split(','), allowed_attributes={'a': ['href', 'title', 'rel', 'target']})
     venue_name = models.CharField(max_length=256)
diff --git a/studygroups/urls.py b/studygroups/urls.py
index 87a9beb9b..5cacdc070 100644
--- a/studygroups/urls.py
+++ b/studygroups/urls.py
@@ -47,6 +47,7 @@
 from studygroups.views import MessageView
 from studygroups.views import MeetingRecap
 from studygroups.views import MeetingRecapDismiss
+from studygroups.views import ContentView
 
 from . import views
 
@@ -107,6 +108,8 @@
     re_path(r'^course/(?P<pk>[\d]+)/edit/$', CourseUpdate.as_view(), name='studygroups_course_edit'),
     re_path(r'^course/(?P<pk>[\d]+)/delete/$', CourseDelete.as_view(), name='studygroups_course_delete'),
 
+    re_path(r'^studygroup/(?P<study_group_id>[\d]+)/content/(?P<pk>[\d]+)/$', ContentView.as_view(), name='studygroups_content_view'),
+
     re_path(r'^facilitator/$', RedirectView.as_view(url='/'), name='studygroups_facilitator_deprecated'),
     re_path(r'^facilitator/team-invitation/$', InvitationConfirm.as_view(), name='studygroups_facilitator_invitation_confirm'),
     re_path(r'^facilitator/team-invitation/(?P<invitation_id>[\d]+)/$', InvitationConfirm.as_view(), name='studygroups_facilitator_invitation_confirm'),
diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index c30781b54..7672b4f69 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -48,6 +48,7 @@
 import json
 import urllib
 import logging
+import re
 
 logger = logging.getLogger(__name__)
 
@@ -409,3 +410,32 @@ def get(self, request, *args, **kwargs):
                 }
 
         return render(request, self.template_name, context)
+
+
+@method_decorator(login_required, name="dispatch")
+class ContentView(TemplateView):
+    template_name = 'studygroups/content_view.html'
+
+    def get(self, request, *args, **kwargs):
+        study_group = get_object_or_404(StudyGroup, pk=kwargs.get('study_group_id'))
+
+        import content.db
+        content = content.db.Content.objects.get(pk=kwargs.get('pk'))
+        
+        import courses.models
+        course_uri = courses.models.course_id2uri(study_group.course_content.pk)
+        sections = courses.models.get_course_content(course_uri)
+
+        markdown_content = content.latest.content
+        h1_headings = re.findall(r'^\s*#(?!#)\s+(.+)$', markdown_content, flags=re.MULTILINE)
+
+        context = {
+            "study_group": study_group,
+            "content": markdown_content,
+            "content_title": content.latest.title,
+            "sections": sections,
+            "h1_headings": h1_headings,
+        }
+
+        return render(request, self.template_name, context)
+
diff --git a/templates/studygroups/content_view.html b/templates/studygroups/content_view.html
new file mode 100644
index 000000000..f7fb22e70
--- /dev/null
+++ b/templates/studygroups/content_view.html
@@ -0,0 +1,150 @@
+{% extends 'base.html' %}
+{% load render_bundle from webpack_loader %}
+{% load crispy_forms_tags %}
+{% load static %}
+{% load i18n %}
+{% load tz %}
+{% load extras %}
+{% load content_tags %}
+
+{% block content %}
+{% localtime off %}
+
+  <div class="container-xl">
+    <div class="row my-3">
+      <a href="/"><i class="fas fa-arrow-left mr-2"></i>Back to my dashboard</a>
+    </div>
+  </div>
+
+  <div class="topbit">
+    <div class="container-xl">
+      <div class="heading row">
+        <div class="offset-sm-3 col-sm-9 lc-details">
+          <h1>{{study_group.name}}</h1>
+        </div>
+        <div class="col-sm-3">
+          <div class="lc-manage-image participant">
+            
+            <div class="wrapper">
+              {% if study_group.image %}
+                <img class="img img-responsive full-width" src="{{study_group.image.url}}">
+              {% else %}
+                <img class="default-image img img-responsive full-width" src="{% static 'images/learning-circle-default.jpg' %}">
+              {% endif %}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    {% url 'studygroups_signup' location=study_group.venue_name|unicode_slugify study_group_id=study_group.pk as signup_url %}
+    <div class="action-bar participant">
+      <div class="container-xl">
+        <div class="row">
+          <div class="col-sm-9 offset-sm-3">
+            <a class="p2pu-btn btn btn-primary" href="mailto:{% for f in study_group.facilitator_set.all %}{% if not forloop.first%},{%endif%}{{f.user.email}}{% endfor %}">{% trans "Email facilitator(s)" %}</a>
+            <a class="p2pu-btn btn btn-primary" href="{{ signup_url }}">{% trans "View signup page" %}</a>
+            <a class="p2pu-btn btn btn-primary" href="{{ application.unapply_link }}">{% trans "Leave" %}</a>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="container-xl mt-5">
+
+    <nav id="content-navbar" class="navbar bg-light px-3 mb-3 sticky-top" style="top: 10rem;">
+      <div class="dropdown">
+        <a class="btn btn-sm d-flex align-items-center secondary p2pu-btn gray mx-0 dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false">
+          {{ content_title }} <span class="material-icons">expand_more</span>
+        </a>
+        <ul class="dropdown-menu" aria-labelledby="content-sections-dropdown">
+          {% for content in sections %}
+          <li><a class="dropdown-item" href="{% url 'studygroups_content_view' study_group.id content.id %}">{{ content.title }}</a></li>
+          {% endfor %}
+        </ul>
+      </div>
+
+      <ul class="nav nav-pills">
+        {% for heading in h1_headings %}
+          <li class="nav-item">
+            <a class="nav-link" data-heading-index="{{ forloop.counter0 }}" href="#" >{{ heading}}</a>
+          </li>
+        {% endfor %}
+      </ul>
+    </nav>
+
+    <div id="learning-circle-timeline" class="manage mt-4">
+      {{ content|convert_content }}
+    </div>
+  </div>
+{% endlocaltime %}
+{% endblock %}
+
+{% block scripts %}
+
+<script>
+$(document).ready(function () {
+  $('[data-toggle="popover"]').popover();
+});
+</script>
+{% if h1_headings %}
+<script>
+(function () {
+  var navLinks = document.querySelectorAll('#content-navbar .nav-link[data-heading-index]');
+  if (!navLinks.length) {
+    return;
+  }
+  var headingNodes = document.querySelectorAll('#learning-circle-timeline h1');
+  var slugify = function (text) {
+    return text
+      .toString()
+      .toLowerCase()
+      .trim()
+      .replace(/[^\w\s-]/g, '')
+      .replace(/[\s_-]+/g, '-')
+      .replace(/^-+|-+$/g, '');
+  };
+  navLinks.forEach(function (link) {
+    var idx = parseInt(link.dataset.headingIndex, 10);
+    var headingEl = headingNodes[idx];
+    if (!headingEl) {
+      link.classList.add('disabled');
+      link.removeAttribute('href');
+      return;
+    }
+    var slug = slugify(headingEl.textContent);
+    if (!slug) {
+      slug = 'content-heading-' + idx;
+    }
+    headingEl.id = slug;
+    link.setAttribute('href', '#' + slug);
+  });
+
+  var setActiveLink = function (id) {
+    navLinks.forEach(function (link) {
+      if (link.getAttribute('href') === '#' + id) {
+        link.classList.add('active');
+      } else {
+        link.classList.remove('active');
+      }
+    });
+  };
+
+  var observer = new IntersectionObserver(function (entries) {
+    entries.forEach(function (entry) {
+      if (entry.isIntersecting) {
+        setActiveLink(entry.target.id);
+      }
+    });
+  }, {
+    rootMargin: '0px 0px -70% 0px',
+    threshold: 0
+  });
+
+  headingNodes.forEach(function (headingEl) {
+    observer.observe(headingEl);
+  });
+})();
+</script>
+{% endif %}
+{% endblock %}

From e94f51893f0ed0a1085794ef61f39e9191d6a98c Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 8 Dec 2025 11:41:27 +0200
Subject: [PATCH 03/63] Add link to course content if a learning circle has
 content associated

---
 studygroups/views/learner.py                        | 13 +++++++++++++
 .../studygroups/learning_circle_participant.html    |  1 +
 2 files changed, 14 insertions(+)

diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index 7672b4f69..1a482e50e 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -288,6 +288,17 @@ def get(self, request, *args, **kwargs):
         context = self.get_context_data(**kwargs)
         context['study_group'] = study_group
         context['application'] = application
+        context['content_link'] = None
+        if study_group.course_content:
+            import courses.models
+            course_uri = courses.models.course_id2uri(study_group.course_content.pk)
+            sections = courses.models.get_course_content(course_uri)
+            context['content_link'] = reverse(
+                'studygroups_content_view',
+                args=(study_group.pk, sections[0]['id'],)
+            )
+
+
         meetings = study_group.meeting_set.active().order_by('meeting_date', 'meeting_time')
         messages = study_group.reminder_set.filter(sent_at__isnull=False)
 
@@ -419,6 +430,8 @@ class ContentView(TemplateView):
     def get(self, request, *args, **kwargs):
         study_group = get_object_or_404(StudyGroup, pk=kwargs.get('study_group_id'))
 
+        # TODO check if content is part of study_group.course_content
+
         import content.db
         content = content.db.Content.objects.get(pk=kwargs.get('pk'))
         
diff --git a/templates/studygroups/learning_circle_participant.html b/templates/studygroups/learning_circle_participant.html
index 15cfa5e9d..911f16a45 100644
--- a/templates/studygroups/learning_circle_participant.html
+++ b/templates/studygroups/learning_circle_participant.html
@@ -41,6 +41,7 @@ <h1>{{study_group.name}}</h1>
         <div class="col-sm-9 offset-sm-3">
           <a class="p2pu-btn btn btn-primary" href="mailto:{% for f in study_group.facilitator_set.all %}{% if not forloop.first%},{%endif%}{{f.user.email}}{% endfor %}">{% trans "Email facilitator(s)" %}</a>
           <a class="p2pu-btn btn btn-primary" href="{{ signup_url }}">{% trans "View signup page" %}</a>
+          {% if content_link %}<a class="p2pu-btn btn btn-primary" href="{{ content_link }}">{% trans "View content" %}</a>{% endif %}
           <a class="p2pu-btn btn btn-primary" href="{{ application.unapply_link }}">{% trans "Leave" %}</a>
         </div>
       </div>

From 6a29c617bda401b06113033f53b14f4d1170a092 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 12 Dec 2025 14:30:04 +0200
Subject: [PATCH 04/63] Comments and other small changes

---
 courses/db.py                                  |  3 +++
 .../templates/courses/content_form_snip.html   | 18 ++++++++++++++----
 courses/views.py                               | 13 +++++++++++++
 learnwithpeople/settings.py                    |  3 +--
 studygroups/views/learner.py                   |  1 +
 5 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/courses/db.py b/courses/db.py
index ae923129c..bde0c6c22 100755
--- a/courses/db.py
+++ b/courses/db.py
@@ -28,6 +28,7 @@ class CourseTags(models.Model):
     tag = models.CharField(max_length=64)
 
 
+# TODO remove
 class Cohort(models.Model):
 
     OPEN = "OPEN"
@@ -53,6 +54,7 @@ class Cohort(models.Model):
     signup = models.CharField(max_length=32, choices=SIGNUP_MODELS)
 
 
+# TODO remove
 class CohortSignup(models.Model):
 
     LEARNER = "LEARNER"
@@ -69,6 +71,7 @@ class CohortSignup(models.Model):
     leave_date = models.DateTimeField(blank=True, null=True)
 
 
+# TODO remove
 class CohortComment(models.Model):
 
     cohort = models.ForeignKey(Cohort, models.CASCADE, related_name="comment_set")
diff --git a/courses/templates/courses/content_form_snip.html b/courses/templates/courses/content_form_snip.html
index be4333eb4..722ea771e 100755
--- a/courses/templates/courses/content_form_snip.html
+++ b/courses/templates/courses/content_form_snip.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load static %}
 
 
 <form action="" method="POST">
@@ -15,12 +16,13 @@
       <div class="tab-pane active" id="edit-tab-pane">
         <div id="content-editor">
           <p>
-            <label for="id_title">{% trans "Title" %}</label>
+            <label class="form-label" for="id_title">{% trans "Title" %}</label>
             {{ form.title.errors }}
-            <input class="col-8" type="text" id="id_title" name="title" value="{{form.title.value|default_if_none:""}}"/>
+            <input class="form-control" type="text" id="id_title" name="title" value="{{form.title.value|default_if_none:""}}"/>
           </p>
+
           <p>
-            <label for="id_content">{% trans "Content" %}</label>
+            <label class="form-label" for="id_content">{% trans "Content" %}</label>
             {{ form.content.errors }}
             <div id="id_content-wmd-button-bar"></div>
             <textarea id="id_content" name="content" class="col-8" rows="20">{{form.content.value|default_if_none:""}}</textarea>
@@ -48,4 +50,12 @@
   </div>
 </form>
 
-
+<script src="{% static 'js/vendor/tinymce/tinymce.min.js' %}"></script>
+<script>
+  tinymce.init({
+    selector: 'textarea#id_content'
+  });
+  tinymce.activeEditor.uploadImages(function(success) {
+    // TODO
+  });
+</script>
diff --git a/courses/views.py b/courses/views.py
index cc9dce377..23fbe4a1d 100755
--- a/courses/views.py
+++ b/courses/views.py
@@ -124,6 +124,7 @@ def create_course( request ):
 
 
 def import_project( request, project_slug ):
+    raise Exception('not implemented')
     from projects.models import Project
     project = get_object_or_404(Project, slug=project_slug)
     from courses import utils
@@ -170,6 +171,7 @@ def show_course( request, course_id, slug=None ):
 
 
 def course_learn_api_data( request, course_id ):
+    # TODO?
     """ return data required by the learn API """
     course_uri = course_model.course_id2uri(course_id)
     try:
@@ -183,6 +185,7 @@ def course_learn_api_data( request, course_id ):
 @login_required
 @require_organizer
 def course_add_badge( request, course_id ):
+    raise Exception('not implemented')
     context = { }
     context = _populate_course_context(request, course_id, context)
     context['badges_active'] = True
@@ -231,6 +234,7 @@ def course_admin_content( request, course_id ):
 
 
 def course_discussion( request, course_id ):
+    raise Exception('not implemented')
     course_uri = course_model.course_id2uri(course_id)
     course = _get_course_or_404(course_uri)
  
@@ -246,6 +250,7 @@ def course_discussion( request, course_id ):
 
 
 def course_people( request, course_id ):
+    raise Exception('not implemented')
     course_uri = course_model.course_id2uri(course_id)
     course = _get_course_or_404(course_uri)
  
@@ -318,6 +323,7 @@ def course_image( request, course_id ):
 
 @login_required
 def course_signup( request, course_id ):
+    raise Exception('not implemented')
     #NOTE: consider using cohort_id in URL to avoid cohort lookup
     cohort = course_model.get_course_cohort( course_id )
     user_uri = u"/uri/user/{0}".format(request.user.username)
@@ -333,6 +339,7 @@ def course_signup( request, course_id ):
 @require_http_methods(['POST'])
 @require_organizer
 def course_add_user( request, course_id ):
+    raise Exception('not implemented')
     cohort_uri = course_model.get_course_cohort_uri(course_id)
     redirect_url = reverse('courses_people', kwargs={'course_id': course_id})
     username = request.POST.get('username', None)
@@ -353,6 +360,7 @@ def course_add_user( request, course_id ):
 
 @login_required
 def course_leave( request, course_id, username ):
+    raise Exception('not implemented')
     cohort_uri = course_model.get_course_cohort_uri(course_id)
     user_uri = u"/uri/user/{0}".format(request.user.username)
     # TODO site admin should also be able to remove users
@@ -380,6 +388,7 @@ def course_leave( request, course_id, username ):
 @require_http_methods(['POST'])
 @require_organizer
 def course_add_organizer( request, course_id, username ):
+    raise Exception('not implemented')
     cohort_uri = course_model.get_course_cohort_uri(course_id)
     user_uri = u"/uri/user/{0}".format(request.user.username)
     is_organizer = course_model.is_cohort_organizer(
@@ -422,6 +431,7 @@ def course_change_status( request, course_id ):
 @require_http_methods(['POST'])
 @require_organizer
 def course_change_signup( request, course_id ):
+    raise Exception('not implemented')
     form = CohortSignupForm(request.POST)
     if form.is_valid():
         signup = form.cleaned_data['signup']
@@ -439,6 +449,7 @@ def course_change_signup( request, course_id ):
 @require_http_methods(['POST'])
 @require_organizer
 def course_change_term( request, course_id, term ):
+    raise Exception('not implemented')
     cohort_uri = course_model.get_course_cohort_uri( course_id )
     if term == 'fixed':
         form = CourseTermForm(request.POST)
@@ -493,6 +504,7 @@ def course_update_tags( request, course_id ):
 @login_required
 @require_organizer
 def course_announcement( request, course_id ):
+    raise Exception('not implemented')
     context = _populate_course_context(request, course_id, {})
     context['announcement_active'] = True
 
@@ -516,6 +528,7 @@ def course_announcement( request, course_id ):
 @login_required
 @require_organizer
 def course_export_emails( request, course_id ):
+    raise Exception('not implemented')
     if not request.user.has_perm('users.trusted_user'):
         msg = _('You do not have permission to view this page')
         return http.HttpResponseForbidden(msg)
diff --git a/learnwithpeople/settings.py b/learnwithpeople/settings.py
index 9e0932365..dd46266c1 100644
--- a/learnwithpeople/settings.py
+++ b/learnwithpeople/settings.py
@@ -323,7 +323,7 @@
         },
         'console': {
             'class': 'logging.StreamHandler',
-            'level': 'DEBUG' if DEBUG else 'WARNING',
+            'level': 'WARNING' if DEBUG else 'WARNING',
         },
     },
     'root': {
@@ -351,7 +351,6 @@
 USE_DEPRECATED_PYTZ = True
 
 #### Backup config ####
-
 BACKUP_DIR = os.environ.get('BACKUP_DIR', '/tmp') # Directory where backups will be stored locally
 BACKUP_AWS_ACCESS_KEY_ID = os.environ.get('BACKUP_AWS_ACCESS_KEY_ID') # AWS key with access to backup bucket
 BACKUP_AWS_SECRET_ACCESS_KEY = os.environ.get('BACKUP_AWS_SECRET_ACCESS_KEY') # AWS secret for above key
diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index 1a482e50e..71f14a7fd 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -423,6 +423,7 @@ def get(self, request, *args, **kwargs):
         return render(request, self.template_name, context)
 
 
+# TODO protect view behind signup 
 @method_decorator(login_required, name="dispatch")
 class ContentView(TemplateView):
     template_name = 'studygroups/content_view.html'

From 3d04538f58fb929301c9ecd4443e56ade05eb1eb Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 12 Dec 2025 14:31:00 +0200
Subject: [PATCH 05/63] Remove HTML from text email

---
 templates/custom_registration/email_confirm.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/custom_registration/email_confirm.txt b/templates/custom_registration/email_confirm.txt
index fe769c494..7d587db5e 100644
--- a/templates/custom_registration/email_confirm.txt
+++ b/templates/custom_registration/email_confirm.txt
@@ -4,7 +4,7 @@
 
 {{ PROTOCOL }}://{{ DOMAIN }}{{ email_confirm_url }}
 
-Your username is {{ email }}.{% endblocktrans %}</p>
+Your username is {{ email }}.{% endblocktrans %}
 
 {% trans "Cheers" %}
 P2PU

From ede420abc6392dcf9be8dec2fa22c8ffe0540597 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 12 Dec 2025 14:32:12 +0200
Subject: [PATCH 06/63] Comments and small changes hanging around in my local
 workdir

---
 docker-compose.test.yml                                 | 4 ++--
 frontend/components/learning_circle_form/PlaceInput.jsx | 3 ++-
 studygroups/views/api.py                                | 2 +-
 webpack.config.js                                       | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 1589bb3b1..9f03ffd6b 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,9 +1,9 @@
 version: '3'
 services:
   postgres:
-    image: postgres:11
+    image: postgres:15
     volumes:
-    - ./compose/postgres:/var/lib/postgresql/data
+    - ./compose/postgres-15:/var/lib/postgresql/data
   email:
     image: djfarrelly/maildev
     ports:
diff --git a/frontend/components/learning_circle_form/PlaceInput.jsx b/frontend/components/learning_circle_form/PlaceInput.jsx
index bc8c82b1a..c25833293 100644
--- a/frontend/components/learning_circle_form/PlaceInput.jsx
+++ b/frontend/components/learning_circle_form/PlaceInput.jsx
@@ -4,6 +4,7 @@ import InputWrapper from 'p2pu-components/dist/InputFields/InputWrapper'
 import AsyncCreatableSelect from 'react-select/async-creatable';
 import InputWithLabel from 'p2pu-components/dist/InputFields/InputWithLabel'
 
+// TODO move to p2pu-components
 
 const CountryInput = props => {
   const { handleChange, name, value, disabled, selectClasses, ...rest } = props;
@@ -14,7 +15,7 @@ const CountryInput = props => {
   }
 
   const searchPlaces = (query) => {
-    const url = "/api/places/search/country/";
+    const url = "/api/places/search/country/"; // TODO pass URL as a prop
     return axios({
       url,
       method: 'GET',
diff --git a/studygroups/views/api.py b/studygroups/views/api.py
index 92cc3e293..0f7ed81e3 100644
--- a/studygroups/views/api.py
+++ b/studygroups/views/api.py
@@ -139,7 +139,7 @@ def serialize_learning_circle(sg):
         "report_url": sg.report_url(),
         "studygroup_path": reverse('studygroups_view_study_group', args=(sg.id,)),
         "draft": sg.draft,
-        "signup_count": sg.application_set.active().count(),
+        "signup_count": sg.application_set.active().count(), # should this be serialized for public API endpionts?
         "signup_open": sg.signup_open and sg.end_date > datetime.date.today(),
     }
 
diff --git a/webpack.config.js b/webpack.config.js
index 899aa5b47..19d745ebe 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -89,6 +89,7 @@ const styleBuild = {
   entry: {
     'p2pu-strap': './static/sass/p2pu-custom.scss'
   },
+  devtool: 'source-map',
   module: {
     rules: [
       {

From 407427b774555b46cf92101d37e3511dc028e5ed Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 12 Dec 2025 16:14:50 +0200
Subject: [PATCH 07/63] Add signup limit field, update API and add input in
 learning circle form

---
 .../learning_circle_form/FinalizeSection.jsx  | 15 +++++++++-
 frontend/helpers/constants.js                 |  1 +
 ...imit_alter_course_topic_guides_and_more.py | 28 +++++++++++++++++++
 studygroups/models/learningcircle.py          |  2 ++
 studygroups/views/api.py                      |  6 +++-
 5 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 studygroups/migrations/0172_studygroup_signup_limit_alter_course_topic_guides_and_more.py

diff --git a/frontend/components/learning_circle_form/FinalizeSection.jsx b/frontend/components/learning_circle_form/FinalizeSection.jsx
index a9104d56b..8d0489b6a 100644
--- a/frontend/components/learning_circle_form/FinalizeSection.jsx
+++ b/frontend/components/learning_circle_form/FinalizeSection.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import { TextareaWithLabel, SelectWithLabel } from 'p2pu-components'
+import { TextareaWithLabel, SelectWithLabel, InputWithLabel } from 'p2pu-components'
 
 const FinalizeSection = (props) => {
 
@@ -54,6 +54,19 @@ const FinalizeSection = (props) => {
       id={'id_facilitator_concerns'}
       errorMessage={props.errors.facilitator_concerns}
     />
+    <InputWithLabel
+      label={'Limit the number of people that can sign up'}
+      helpText='0 means unlimited'
+      type='number'
+      value={props.learningCircle.signup_limit}
+      handleChange={props.updateFormData}
+      name='signup_limit'
+      id='id_signup_limit'
+      errorMessage={props.errors.signup_limit}
+    />
+    <div>
+      <a>Link to docs explaining what this means</a>
+    </div>
     <div className='lc-co-facilitator-input'>
       <SelectWithLabel
         options={populateTeamOptions(props.team)}
diff --git a/frontend/helpers/constants.js b/frontend/helpers/constants.js
index 4aee5426d..3f9ba07ad 100644
--- a/frontend/helpers/constants.js
+++ b/frontend/helpers/constants.js
@@ -87,6 +87,7 @@ export const LC_DEFAULTS = {
   online: false,
   draft: true,
   language: 'en',
+  signup_limit: 0,
   meetings: [],
 };
 
diff --git a/studygroups/migrations/0172_studygroup_signup_limit_alter_course_topic_guides_and_more.py b/studygroups/migrations/0172_studygroup_signup_limit_alter_course_topic_guides_and_more.py
new file mode 100644
index 000000000..7f269ff9a
--- /dev/null
+++ b/studygroups/migrations/0172_studygroup_signup_limit_alter_course_topic_guides_and_more.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.2.11 on 2025-12-12 14:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('studygroups', '0171_courselist'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='studygroup',
+            name='signup_limit',
+            field=models.SmallIntegerField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='course',
+            name='topic_guides',
+            field=models.ManyToManyField(blank=True, to='studygroups.topicguide'),
+        ),
+        migrations.AlterField(
+            model_name='courselist',
+            name='courses',
+            field=models.ManyToManyField(blank=True, to='studygroups.course'),
+        ),
+    ]
diff --git a/studygroups/models/learningcircle.py b/studygroups/models/learningcircle.py
index ed2e11805..9011c94a3 100644
--- a/studygroups/models/learningcircle.py
+++ b/studygroups/models/learningcircle.py
@@ -79,6 +79,7 @@ class StudyGroup(LifeTimeTrackingModel):
     duration = models.PositiveIntegerField(default=90)  # meeting duration in minutes
     timezone = models.CharField(max_length=128)
     signup_open = models.BooleanField(default=True)
+    signup_limit = models.SmallIntegerField(blank=True, null=True)
     draft = models.BooleanField(default=True)
     members_only = models.BooleanField(default=False)
     image = models.ImageField(blank=True)
@@ -255,6 +256,7 @@ def to_dict(self):
             "facilitator_goal": sg.facilitator_goal,
             "facilitator_concerns": sg.facilitator_concerns,
             "draft": sg.draft,
+            "signup_limit": sg.signup_limit,
             "signup_count": sg.application_set.active().count(),
             "signup_url": reverse('studygroups_signup', args=(slugify(sg.venue_name, allow_unicode=True), sg.id,)),
         }
diff --git a/studygroups/views/api.py b/studygroups/views/api.py
index 0f7ed81e3..86b0b32a4 100644
--- a/studygroups/views/api.py
+++ b/studygroups/views/api.py
@@ -139,6 +139,7 @@ def serialize_learning_circle(sg):
         "report_url": sg.report_url(),
         "studygroup_path": reverse('studygroups_view_study_group', args=(sg.id,)),
         "draft": sg.draft,
+        "signup_limit": sg.signup_limit,
         "signup_count": sg.application_set.active().count(), # should this be serialized for public API endpionts?
         "signup_open": sg.signup_open and sg.end_date > datetime.date.today(),
     }
@@ -721,6 +722,7 @@ def _make_learning_circle_schema(request):
         "duration": schema.integer(required=True),
         "timezone": schema.text(required=True, length=128),
         "signup_question": schema.text(length=256),
+        "signup_limit": schema.integer(required=False),
         "facilitators": _facilitators_validator,
         "facilitator_goal": schema.text(length=256),
         "facilitator_concerns": schema.text(length=256),
@@ -788,7 +790,8 @@ def post(self, request):
             image=data.get('image_url'),
             signup_question=data.get('signup_question', ''),
             facilitator_goal=data.get('facilitator_goal', ''),
-            facilitator_concerns=data.get('facilitator_concerns', '')
+            facilitator_concerns=data.get('facilitator_concerns', ''),
+            signup_limit=data.get('signup_limit', 0)
         )
 
         # use course.caption if course_description is not set
@@ -888,6 +891,7 @@ def post(self, request, *args, **kwargs):
         study_group.timezone = data.get('timezone')
         study_group.image = data.get('image_url')
         study_group.signup_question = data.get('signup_question', '')
+        study_group.signup_limit = data.get('signup_limit', 0)
         study_group.facilitator_goal = data.get('facilitator_goal', '')
         study_group.facilitator_concerns = data.get('facilitator_concerns', '')
 

From 899d81bc2489d4ebcf6d60ad3514c9a2aa3480ba Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 15 Dec 2025 15:10:34 +0200
Subject: [PATCH 08/63] Check for learning circle capacity on signup view

---
 studygroups/views/learner.py      | 9 ++++++++-
 templates/studygroups/signup.html | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index c30781b54..f8d5fe778 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -57,7 +57,13 @@ def signup(request, location, study_group_id):
     if not study_group.deleted_at is None:
         raise http.Http404(_("Learning circle does not exist"))
 
+    signup_count = study_group.application_set.active().count()
+    at_capacity = study_group.signup_limit > 0 and signup_count >= study_group.signup_limit
+
     if request.method == 'POST':
+        # handle over capacity signup
+        if at_capacity:
+            messages.warning(request, 'Unfortunately all the available spots for this learning circle has already been taken.')
         recaptcha_response = request.POST.get('g-recaptcha-response')
         data = {
             'secret': settings.RECAPTCHA_SECRET_KEY,
@@ -66,7 +72,7 @@ def signup(request, location, study_group_id):
         r = requests.post('https://www.google.com/recaptcha/api/siteverify', data=data)
         captcha_result = r.json()
         form = ApplicationForm(request.POST, initial={'study_group': study_group})
-        if form.is_valid() and study_group.signup_open == True and study_group.draft == False and captcha_result.get('success'):
+        if form.is_valid() and study_group.signup_open == True and study_group.draft == False and captcha_result.get('success') and not at_capacity:
             application = form.save(commit=False)
             if application.email and Application.objects.active().filter(email__iexact=application.email, study_group=study_group).exists():
                 old_application = Application.objects.active().filter(email__iexact=application.email, study_group=study_group).first()
@@ -93,6 +99,7 @@ def signup(request, location, study_group_id):
     context = {
         'form': form,
         'study_group': study_group,
+        'at_capacity': at_capacity,
         'meetings': meetings,
         'mapbox_token': settings.MAPBOX_TOKEN,
         'completed': last_meeting is not None and last_meeting.meeting_date < datetime.date.today(),
diff --git a/templates/studygroups/signup.html b/templates/studygroups/signup.html
index 2b4d4e5fc..b281b137a 100644
--- a/templates/studygroups/signup.html
+++ b/templates/studygroups/signup.html
@@ -223,7 +223,7 @@ <h2>{% trans "Join this learning circle" %}</h2>
               {% blocktrans %}
                 <p>What is a learning circle? <a href="https://docs.p2pu.org/frequently-asked-questions" target="_blank" rel="noopener noreferrer">Read the FAQs.</a></p>
               {% endblocktrans %}
-              {% if study_group.signup_open and not completed %}
+              {% if study_group.signup_open and not completed and not at_capacity %}
                 {% if study_group.draft %}
                   <p>{% trans "Signup for this learning circle is not open yet." %}</p>
                 {% else %}
@@ -236,6 +236,8 @@ <h2>{% trans "Join this learning circle" %}</h2>
                     </form>
                   </div>
                 {% endif %}
+              {% elif at_capacity %}
+              <p>{% trans "Unfortunately there are no more available spots for this learning circle." %}</p>
               {% else %}
               <p>{% trans "Unfortunately this learning circle is now closed for signup." %}</p>
               {% endif %}

From f1df87411a9e353ac75a89ef85d761451f0e71a3 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 18 Dec 2025 16:16:08 +0200
Subject: [PATCH 09/63] Prevent facilitator from adding signups that would
 exceed the signup limit

---
 studygroups/models/learningcircle.py   |  9 +++++
 studygroups/views/facilitate.py        | 49 ++++++++++++++++++++++----
 templates/studygroups/add_learner.html |  3 ++
 3 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/studygroups/models/learningcircle.py b/studygroups/models/learningcircle.py
index 9011c94a3..063be0516 100644
--- a/studygroups/models/learningcircle.py
+++ b/studygroups/models/learningcircle.py
@@ -212,6 +212,15 @@ def reminders(self):
     def weeks(self):
         return (self.end_date - self.start_date).days//7 + 1
 
+
+    @property
+    def at_capacity(self):
+        if self.signup_limit == 0:
+            return False
+        signup_count = self.application_set.active().count()
+        return signup_count >= self.signup_limit
+
+
     def to_dict(self):
         sg = self  # TODO - this logic is repeated in the API class
         facilitators = [f.user.first_name for f in sg.facilitator_set.all()]
diff --git a/studygroups/views/facilitate.py b/studygroups/views/facilitate.py
index 74923ed6f..796f93fa1 100644
--- a/studygroups/views/facilitate.py
+++ b/studygroups/views/facilitate.py
@@ -591,8 +591,9 @@ def add_learner(request, study_group_id):
                 messages.warning(request, _('User with the given email address already signed up.'))
             elif application.mobile and Application.objects.active().filter(mobile=application.mobile, study_group=study_group).exists():
                 messages.warning(request, _('User with the given mobile number already signed up.'))
+            elif study_group.at_capacity:
+                messages.warning(request, _('The learning circle is full'))
             else:
-                # TODO - remove accepted_at or use accepting applications flow
                 application.accepted_at = timezone.now()
                 application.save()
             return http.HttpResponseRedirect(url)
@@ -608,14 +609,20 @@ def add_learner(request, study_group_id):
 
 @method_decorator([user_is_group_facilitator, study_group_is_published], name='dispatch')
 class ApplicationCreateMultiple(FormView):
+
     template_name = 'studygroups/add_learners.html'
-    form_class = modelformset_factory(
-        Application,
-        form=ApplicationInlineForm,
-        extra=5
-    )
     success_url = reverse_lazy('studygroups_facilitator')
 
+    def dispatch(self, request, *args, **kwargs):
+        study_group_id = self.kwargs.get('study_group_id')
+        study_group = get_object_or_404(StudyGroup, pk=study_group_id)
+
+        if study_group.at_capacity:
+            url = reverse('studygroups_view_study_group', args=(study_group_id,))
+            messages.warning(request, 'No more available signups, please increase signup limit first')
+            return http.HttpResponseRedirect(url)
+        return super().dispatch(request, *args, **kwargs)
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         study_group_id = self.kwargs.get('study_group_id')
@@ -623,13 +630,41 @@ def get_context_data(self, **kwargs):
         return context
 
     def get_form(self):
+        study_group_id = self.kwargs.get('study_group_id')
+        study_group = get_object_or_404(StudyGroup, pk=study_group_id)
+
+        signup_rows = 5
+        if study_group.signup_limit > 0:
+            signup_count = study_group.application_set.active().count()
+            signup_rows = study_group.signup_limit - signup_count
+      
+        form_class = modelformset_factory(
+            Application,
+            form=ApplicationInlineForm,
+            extra=signup_rows
+        )
+
         queryset = Application.objects.none()
-        return self.form_class(queryset=queryset, **self.get_form_kwargs())
+        kwargs = self.get_form_kwargs()
+        return form_class(queryset=queryset, **kwargs)
 
     def form_valid(self, form):
+        # TODO take signup_limit into account
         study_group_id = self.kwargs.get('study_group_id')
         study_group = get_object_or_404(StudyGroup, pk=study_group_id)
         applications = form.save(commit=False)
+
+        if study_group.signup_limit > 0:
+            signup_count = study_group.application_set.active().count()
+            available_signups = study_group.signup_limit - signup_count
+
+            if len(applications) > available_signups:
+                url = reverse('studygroups_view_study_group', args=(study_group_id,))
+                messages.warning(self.request, 'No more available signups, please increase signup limit first')
+                return http.HttpResponseRedirect(url)
+
+
+
         for application in applications:
             if application.email and Application.objects.active().filter(email__iexact=application.email, study_group=study_group).exists():
                 messages.warning(self.request, _(f'A learner with the email address {application.email} has already signed up.'))
diff --git a/templates/studygroups/add_learner.html b/templates/studygroups/add_learner.html
index d82a59386..969e64ffe 100644
--- a/templates/studygroups/add_learner.html
+++ b/templates/studygroups/add_learner.html
@@ -17,6 +17,9 @@ <h2>{% blocktrans with name=object.name %}Update details for {{name}} {% endbloc
       {% else %}
         <h2>{% blocktrans with studygroup_name=study_group.name %}Add a new learner to {{studygroup_name}} {% endblocktrans %}</h2>
       {% endif %}
+      {% if study_group.at_capacity %}
+      <p class="alert alert-warning">{% trans "Adding another learner will exceed the signup limit." %}</p>
+      {% endif %}
       {% url 'studygroups_add_learners' study_group.id as add_multiple_url %}
       <p>{% blocktrans %}<a href="{{add_multiple_url}}">Click here</a> to add multiple learners at once{% endblocktrans%}</p>
     </div>

From 56486358e0c29192b893ce329443754f9299a122 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 19 Dec 2025 17:40:41 +0200
Subject: [PATCH 10/63] use property defined on model to check if a learning
 circle has reached signup capacity

---
 studygroups/views/learner.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index f8d5fe778..9c5455296 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -57,8 +57,7 @@ def signup(request, location, study_group_id):
     if not study_group.deleted_at is None:
         raise http.Http404(_("Learning circle does not exist"))
 
-    signup_count = study_group.application_set.active().count()
-    at_capacity = study_group.signup_limit > 0 and signup_count >= study_group.signup_limit
+    at_capacity = study_group.at_capacity
 
     if request.method == 'POST':
         # handle over capacity signup

From 4088bd29b67eba02b81832c2eaf8915c4decbd80 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 19 Dec 2025 17:44:41 +0200
Subject: [PATCH 11/63] Add test, that should be failing

---
 studygroups/tests/test_learner_views.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/studygroups/tests/test_learner_views.py b/studygroups/tests/test_learner_views.py
index 107eeba3b..5c0d16a8f 100644
--- a/studygroups/tests/test_learner_views.py
+++ b/studygroups/tests/test_learner_views.py
@@ -212,6 +212,25 @@ def test_update_application(self):
         self.assertEqual(Application.objects.active().count(), 2)
 
 
+    def test_signup_limit(self):
+        sg = StudyGroup.objects.get(pk=1)
+        sg.signup_limit = 1 # must be a lonely learning circle?
+        sg.save()
+
+        signup_data = self.APPLICATION_DATA.copy()
+        c = Client()
+        resp = c.post('/en/signup/foo-bob-1/', signup_data)
+        self.assertRedirects(resp, '/en/signup/1/success/')
+        self.assertEqual(Application.objects.active().count(), 1)
+
+        signup_data = self.APPLICATION_DATA.copy()
+        signup_data['email'] = 'test2@mail.com'
+        c = Client()
+        resp = c.post('/en/signup/foo-bob-1/', signup_data)
+        self.assertRedirects(resp, '/en/signup/1/success/')
+        self.assertEqual(Application.objects.active().count(), 1)
+
+
     def test_unapply(self):
         c = Client()
         data = self.APPLICATION_DATA.copy()

From 22e66f039e687058d1243eaf952bb624feb43e98 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 19 Dec 2025 18:02:28 +0200
Subject: [PATCH 12/63] Make test pass

---
 studygroups/tests/test_learner_views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/studygroups/tests/test_learner_views.py b/studygroups/tests/test_learner_views.py
index 5c0d16a8f..6831175f9 100644
--- a/studygroups/tests/test_learner_views.py
+++ b/studygroups/tests/test_learner_views.py
@@ -227,7 +227,7 @@ def test_signup_limit(self):
         signup_data['email'] = 'test2@mail.com'
         c = Client()
         resp = c.post('/en/signup/foo-bob-1/', signup_data)
-        self.assertRedirects(resp, '/en/signup/1/success/')
+        self.assertEqual(resp.status_code, 200)
         self.assertEqual(Application.objects.active().count(), 1)
 
 

From a6ec7b1dc19fcfa68eb9e3e06e971806847ce81a Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 19 Dec 2025 18:15:36 +0200
Subject: [PATCH 13/63] Fix bug where signup_limit could be None leading to
 comparison between int and NoneType

---
 studygroups/models/learningcircle.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/studygroups/models/learningcircle.py b/studygroups/models/learningcircle.py
index 063be0516..9f829cdc3 100644
--- a/studygroups/models/learningcircle.py
+++ b/studygroups/models/learningcircle.py
@@ -215,7 +215,7 @@ def weeks(self):
 
     @property
     def at_capacity(self):
-        if self.signup_limit == 0:
+        if not self.signup_limit:
             return False
         signup_count = self.application_set.active().count()
         return signup_count >= self.signup_limit

From 46bb66a2db27e84f9c45969f8f92a8a2079ee797 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 5 Jan 2026 15:20:26 +0200
Subject: [PATCH 14/63] Remove comment and update user message

---
 studygroups/views/facilitate.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/studygroups/views/facilitate.py b/studygroups/views/facilitate.py
index 796f93fa1..29eb10ae3 100644
--- a/studygroups/views/facilitate.py
+++ b/studygroups/views/facilitate.py
@@ -649,7 +649,6 @@ def get_form(self):
         return form_class(queryset=queryset, **kwargs)
 
     def form_valid(self, form):
-        # TODO take signup_limit into account
         study_group_id = self.kwargs.get('study_group_id')
         study_group = get_object_or_404(StudyGroup, pk=study_group_id)
         applications = form.save(commit=False)
@@ -660,11 +659,10 @@ def form_valid(self, form):
 
             if len(applications) > available_signups:
                 url = reverse('studygroups_view_study_group', args=(study_group_id,))
-                messages.warning(self.request, 'No more available signups, please increase signup limit first')
+                messages.warning(self.request, 'Adding participants will exceed the signup limit, please increase the limit first.')
                 return http.HttpResponseRedirect(url)
 
 
-
         for application in applications:
             if application.email and Application.objects.active().filter(email__iexact=application.email, study_group=study_group).exists():
                 messages.warning(self.request, _(f'A learner with the email address {application.email} has already signed up.'))

From e1d1fcc0d9c7fc726d77c92c68b94cde314ed9a6 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 5 Jan 2026 15:23:06 +0200
Subject: [PATCH 15/63] Make sure signup limit is serialized as an int

---
 studygroups/models/learningcircle.py | 2 +-
 studygroups/views/api.py             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/studygroups/models/learningcircle.py b/studygroups/models/learningcircle.py
index 9f829cdc3..18a89ab0f 100644
--- a/studygroups/models/learningcircle.py
+++ b/studygroups/models/learningcircle.py
@@ -265,7 +265,7 @@ def to_dict(self):
             "facilitator_goal": sg.facilitator_goal,
             "facilitator_concerns": sg.facilitator_concerns,
             "draft": sg.draft,
-            "signup_limit": sg.signup_limit,
+            "signup_limit": sg.signup_limit or 0,
             "signup_count": sg.application_set.active().count(),
             "signup_url": reverse('studygroups_signup', args=(slugify(sg.venue_name, allow_unicode=True), sg.id,)),
         }
diff --git a/studygroups/views/api.py b/studygroups/views/api.py
index 86b0b32a4..f003f0f96 100644
--- a/studygroups/views/api.py
+++ b/studygroups/views/api.py
@@ -139,7 +139,7 @@ def serialize_learning_circle(sg):
         "report_url": sg.report_url(),
         "studygroup_path": reverse('studygroups_view_study_group', args=(sg.id,)),
         "draft": sg.draft,
-        "signup_limit": sg.signup_limit,
+        "signup_limit": sg.signup_limit or 0,
         "signup_count": sg.application_set.active().count(), # should this be serialized for public API endpionts?
         "signup_open": sg.signup_open and sg.end_date > datetime.date.today(),
     }

From 1a140a38959c49594ff96e776b82e888f4c9bd17 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Tue, 6 Jan 2026 10:49:31 +0200
Subject: [PATCH 16/63] Add link to docs

---
 frontend/components/learning_circle_form/FinalizeSection.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/learning_circle_form/FinalizeSection.jsx b/frontend/components/learning_circle_form/FinalizeSection.jsx
index 8d0489b6a..97954d505 100644
--- a/frontend/components/learning_circle_form/FinalizeSection.jsx
+++ b/frontend/components/learning_circle_form/FinalizeSection.jsx
@@ -65,7 +65,7 @@ const FinalizeSection = (props) => {
       errorMessage={props.errors.signup_limit}
     />
     <div>
-      <a>Link to docs explaining what this means</a>
+      <a href="https://docs.p2pu.org/tools-and-resources/tools-for-learning-circles/managing-learning-circles#limiting-learning-circle-signups">More info about signup limits</a>
     </div>
     <div className='lc-co-facilitator-input'>
       <SelectWithLabel

From 1aa70a6e3a856d882f6ca61327f709e027c75b18 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 9 Jan 2026 13:36:19 +0200
Subject: [PATCH 17/63] Add view for uploading images for courses. Remove
 unused URLs and views

---
 .../templates/courses/content_form_snip.html  |   2 +
 .../templates/courses/content_image_form.html |  76 ++++++
 .../templates/courses/course_settings.html    |  97 -------
 courses/templates/courses/edit_content.html   |   2 +
 courses/urls.py                               |  53 +---
 courses/views.py                              | 258 ++----------------
 media/db.py                                   |   3 +
 7 files changed, 118 insertions(+), 373 deletions(-)
 create mode 100644 courses/templates/courses/content_image_form.html

diff --git a/courses/templates/courses/content_form_snip.html b/courses/templates/courses/content_form_snip.html
index 722ea771e..d4cf2d014 100755
--- a/courses/templates/courses/content_form_snip.html
+++ b/courses/templates/courses/content_form_snip.html
@@ -52,10 +52,12 @@
 
 <script src="{% static 'js/vendor/tinymce/tinymce.min.js' %}"></script>
 <script>
+/*
   tinymce.init({
     selector: 'textarea#id_content'
   });
   tinymce.activeEditor.uploadImages(function(success) {
     // TODO
   });
+  */
 </script>
diff --git a/courses/templates/courses/content_image_form.html b/courses/templates/courses/content_image_form.html
new file mode 100644
index 000000000..0e65da36f
--- /dev/null
+++ b/courses/templates/courses/content_image_form.html
@@ -0,0 +1,76 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+
+{% block title %}Upload a course{% endblock %}
+{% block bodyclasses %}course-create{% endblock%}
+
+{% block css %}
+<link rel="stylesheet" href="{{ STATIC_URL }}css/course.css">
+<link rel="stylesheet" href="{{ STATIC_URL }}pagedown/pagedown.css">
+{% endblock %}
+
+{% block links %}
+{% endblock %}
+
+{% block breadcrumbs_title %}
+  <h1 id="project-name">
+    <a href="{% url courses_show course_id=course.id slug=course.slug%}">{{course.title}}</a></h1>
+{% endblock %}
+
+{% block breadcrumbs %}
+  <li>
+    <span class="divider">&rsaquo;</span>
+    <a href="{% url courses_show course_id=course.id slug=course.slug%}">{{course.title}}</a>
+  </li>
+{% endblock %}
+
+
+{% block content %}
+
+<div class="row">
+  <div id="sidebar-wrapper" class="col-3">
+    {% include "courses/course_sidebar.html" %}
+  </div>
+
+  <div id="content-container" class="col-9">
+    <form action="" method="POST" enctype="multipart/form-data">
+      {% csrf_token %}
+      {{ form }}
+      <input type="submit" value="upload"/>
+    </form>
+  </div>
+{% endblock %}
+
+{% block js %}
+  <script src="{{ STATIC_URL }}pagedown/Markdown.Converter.js"></script>
+  <script src="{{ STATIC_URL }}pagedown/Markdown.Sanitizer.js"></script>
+  <script src="{{ STATIC_URL }}pagedown/Markdown.Editor.js"></script>
+
+  <script type="text/javascript">
+    $(document).ready(function(){
+      var converter1 = Markdown.getSanitizingConverter();
+      var editor1 = new Markdown.Editor(converter1, "id_content");
+      editor1.run();
+    });
+  </script>
+
+  <script type="text/javascript">
+    $(document).ready(function(){
+      $('#preview-tab').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+        $("#content-preview-placeholder").load(
+            "{% url courses_preview_content %}",
+            {
+                "content":$("#id_content").attr("value"),
+                "csrfmiddlewaretoken": "{{ csrf_token }}"
+            });
+        });
+
+        $('#MDCStrigger').bind('click', function(e){
+            $('#md-cheatsheet').tab('show');
+        });
+    });
+  </script>
+{% endblock %}
diff --git a/courses/templates/courses/course_settings.html b/courses/templates/courses/course_settings.html
index 32a8bc187..54a3dd106 100755
--- a/courses/templates/courses/course_settings.html
+++ b/courses/templates/courses/course_settings.html
@@ -65,56 +65,8 @@
       </form>
     </div>
     <hr/>
-    <div id="course-term">
-      {% if cohort.term == 'ROLLING' %}
-        <p>{%trans "Users can join this course at any time."%}</p>
-      {% else %}
-        {% blocktrans with start_date=cohort.start_date end_date=cohort.end_date %}
-          <p>This course runs from {{ start_date }} to {{end_date}}.</p>
-        {% endblocktrans %}
-      {% endif %}
- 
-      <div>
-        <p>{%trans "Set dates"%}</p>
-        <form action="{% url 'courses_change_term' course_id=course.id term='fixed' %}" method="POST">
-          {% csrf_token %}
-          <p><label for="id_start_date">{% trans "Start date" %}</label>{{term_form.start_date}}</p>
-          <p><label for="id_end_date">{% trans "End date" %}</label>{{term_form.end_date}}</p>
-          <p><input type="submit" class="btn" value="{% trans "Save" %}"/></p>
-        </form>
-      </div>
-      {% if cohort.term == 'FIXED' %}
-        <p>{%trans "or" %}</p>
-        <div>
-          <form action="{% url 'courses_change_term' course_id=course.id term='rolling' %}" method="POST">
-            {% csrf_token %}
-            <p><input type="submit" value="{% trans "Switch to rolling term" %}"/></p>
-          </form>
-        </div>
-      {% endif %}
-    </div>
     <div class="clearfix"></div>
     <hr/>
-    <div>
-      {% if cohort.signup == 'OPEN' %}
-        <p>{% trans 'Signup is open to anyone.' %}</p>
-      {% endif %}
-      {% if cohort.signup == 'MODERATED' %}
-        <p>{% trans 'Signup is moderated. To sign up for this course you should contact one of the course organizer.' %}</p>
-      {% endif %}
-      {% if cohort.signup == 'CLOSED' %}
-        <p>{% trans 'Signup is closed. Only organizers can add more people.' %}</p>
-      {% endif %}
-      
-      <div id="signup-edit">
-        <form action="{% url 'courses_change_signup' course_id=course.id %}" method="POST">
-          {% csrf_token %}
-          {{ signup_form.signup }}
-          <button type="submit">{% trans "Save" %}</button>
-        </form>
-      </div>
-    </div>
-    <hr/>
     <div>
       <form action="{% url 'courses_update_tags' course_id=course.id %}" method="POST">
           {% csrf_token %}
@@ -135,55 +87,6 @@
       </div>
     </div>
     <hr/>
-    {% comment %}
-    <div id="course-metadata">
-      <h3>{% trans 'Meta data' %}</h3>
-      <p>{% blocktrans %}For more information about the supported meta data, see <a href="http://www.lrmi.net/the-specification">lrmi.net</a>{% endblocktrans %}</p>
-      <form action="{% url 'courses_update_metadata' course.id %}" method="POST">
-        {% csrf_token %}
-        <fieldset>
-          <p>
-            <label for="id_about">{% trans 'About (subject)' %}</label>
-            {{ metadata_form.about }}
-          </p>
-          <p>
-            <label for="id_timerequired">{% blocktrans %}Time Required (In <a href="http://en.wikipedia.org/wiki/ISO_8601#Durations">ISO 8601</a> duration format){% endblocktrans %}</label>
-            {{ metadata_form.timerequired }}
-          </p>
-          <p>
-            <label for="id_typicalagerange">{% trans 'Typical Age Range' %}</label>
-            {{ metadata_form.typicalagerange }}
-          </p>
-          <p>
-            <label for="id_isbasedonurl">{% trans 'Is Based on URL' %}</label>
-            {{ metadata_form.isbasedonurl }}
-          </p>
-          <p>
-            <label for="id_educationalrole">{% trans 'Educational Role (target audience)' %}</label>
-            {{ metadata_form.educationalrole }}
-          </p>
-          <p>
-            <label for="id_educationaluse">{% trans 'Educational Use' %}</label>
-            {{ metadata_form.educationaluse }}
-          </p>
-          <p>
-            <label for="id_interactivitytype">{% trans 'Interactivity Type' %}</label> 
-            {{ metadata_form.interactivitytype }}
-          </p>
-        </fieldset>
-        
-        <label>{% trans 'Educational Alignment' %}</label>
-        <fieldset>
-          <span class="row-fluid">
-            <span class="span11 offset1">
-              {{ educational_alignment_form }}
-            </span>
-          </span>
-        </fieldset>
-        <p><button type="submit">{% trans 'Save metadata' %}</button></p>
-      </form>
-    </div>
-    {% endcomment %}
   {% endif %}
 {% endblock %}
 
diff --git a/courses/templates/courses/edit_content.html b/courses/templates/courses/edit_content.html
index aedd0f4c9..e96a07448 100755
--- a/courses/templates/courses/edit_content.html
+++ b/courses/templates/courses/edit_content.html
@@ -43,9 +43,11 @@ <h2>{{ content.title }}</h2>
 
   <script type="text/javascript">
     $(document).ready(function(){
+      /*
       var converter1 = Markdown.getSanitizingConverter();
       var editor1 = new Markdown.Editor(converter1, "id_content");
       editor1.run();
+      */
     });
   </script>
 
diff --git a/courses/urls.py b/courses/urls.py
index 49efb23ad..a66dfd22a 100755
--- a/courses/urls.py
+++ b/courses/urls.py
@@ -6,10 +6,6 @@
     re_path(r'^create/$', views.create_course,
         name='courses_create'),
 
-    re_path(r'^import_project/(?P<project_slug>[\w-]+)/$',
-        views.import_project,
-        name='courses_import_project'),
-
     re_path(r'^(?P<course_id>[\d]+)/clone/$',
         views.clone_course,
         name='courses_clone'),
@@ -26,34 +22,10 @@
         views.course_admin_content,
         name='courses_admin_content'),
 
-    re_path(r'^(?P<course_id>[\d]+)/discussion/$',
-        views.course_discussion,
-        name='courses_discussion'),
-
-    re_path(r'^(?P<course_id>[\d]+)/people/$',
-        views.course_people,
-        name='courses_people'),
-
     re_path(r'^(?P<course_id>[\d]+)/settings/$',
         views.course_settings,
         name='courses_settings'),
 
-    re_path(r'^(?P<course_id>[\d]+)/announcement/$',
-        views.course_announcement,
-        name='courses_announcement'),
-
-    re_path(r'^(?P<course_id>[\d]+)/export_emails/$',
-        views.course_export_emails,
-        name='courses_export_emails'),
-
-    re_path(r'^(?P<course_id>[\d]+)/badges/$',
-        views.course_add_badge,
-        name='course_add_badge'),
-
-    re_path(r'^(?P<course_id>[\d]+)/signup/$',
-        views.course_signup,
-        name='courses_signup'),
-
     re_path(r'^(?P<course_id>[\d]+)/delete_spam/$',
         views.delete_spam,
         name='courses_delete_spam'),
@@ -62,22 +34,17 @@
         views.course_image,
         name='courses_image'),
 
-    re_path(r'^(?P<course_id>[\d]+)/add_user/$',
-        views.course_add_user,
-        name='courses_add_user'),
+    # view to upload image for content
+    re_path(
+        r'^(?P<course_id>[\d]+)/content/upload_image/$',
+        views.course_content_image_upload,
+        name='courses_content_image_upload'
+    ),
 
     re_path(r'^(?P<course_id>[\d]+)/change_status/$',
         views.course_change_status,
         name='courses_change_status'),
 
-    re_path(r'^(?P<course_id>[\d]+)/change_signup/$',
-        views.course_change_signup,
-        name='courses_change_signup'),
-
-    re_path(r'^(?P<course_id>[\d]+)/change_term/(?P<term>fixed|rolling)/$',
-        views.course_change_term,
-        name='courses_change_term'),
-
     re_path(r'^(?P<course_id>[\d]+)/update/(?P<attribute>[\w_]+)/$',
         views.course_update_attribute,
         name='courses_update_attribute'),
@@ -90,14 +57,6 @@
         views.show_course,
         name='courses_show'),
 
-    re_path(r'^(?P<course_id>[\d]+)/remove_user/(?P<username>[\w\-\. ]+)/$',
-        views.course_leave,
-        name='courses_leave'),
-
-    re_path(r'^(?P<course_id>[\d]+)/add_organizer/(?P<username>[\w\-\. ]+)/$',
-        views.course_add_organizer,
-        name='courses_add_organizer'),
-
     re_path(r'^(?P<course_id>[\d]+)/content/create/$',
         views.create_content,
         name='courses_create_content'),
diff --git a/courses/views.py b/courses/views.py
index 23fbe4a1d..0e9c8e165 100755
--- a/courses/views.py
+++ b/courses/views.py
@@ -123,18 +123,6 @@ def create_course( request ):
     return render(request, 'courses/create_course.html', context)
 
 
-def import_project( request, project_slug ):
-    raise Exception('not implemented')
-    from projects.models import Project
-    project = get_object_or_404(Project, slug=project_slug)
-    from courses import utils
-    course = utils.import_project(project, project.name[:3])
-    cohort = course_model.get_course_cohort(course['uri'])
-    user_uri = u"/uri/user/{0}".format(request.user.username)
-    course_model.add_user_to_cohort(cohort['uri'], user_uri, "ORGANIZER")
-    return course_slug_redirect(request, course['id'])
-
-
 @require_organizer
 def clone_course( request, course_id ):
     course_uri = course_model.course_id2uri(course_id)
@@ -182,40 +170,6 @@ def course_learn_api_data( request, course_id ):
     return http.HttpResponse(json.dumps(course_data), mimetype="application/json")
 
 
-@login_required
-@require_organizer
-def course_add_badge( request, course_id ):
-    raise Exception('not implemented')
-    context = { }
-    context = _populate_course_context(request, course_id, context)
-    context['badges_active'] = True
-    user = request.user
-
-    form = CourseEmbeddedUrlForm()
-
-    if request.method == "POST":
-        form = CourseEmbeddedUrlForm(request.POST)
-
-        if form.is_valid():
-            content = None
-            user_uri = u"/uri/user/{0}".format(user.username)
-            try:
-                content = add_content_from_response(
-                    context['course']['uri'],
-                    form.cleaned_data['url'], user_uri)
-            except BadgeNotFoundException:
-                form = CourseEmbeddedUrlForm()
-                messages.error(request, _('Error! We could not retrieve this Badge'))
-            if content:
-                redirect_url = reverse('courses_content_show',
-                                       kwargs={'course_id': course_id,
-                                               'content_id': content['id']})
-                return http.HttpResponseRedirect(redirect_url)
-
-    context['form'] = form
-    return render(request, 'courses/course_badges.html', context)
-
-
 @login_required
 @require_organizer
 def course_admin_content( request, course_id ):
@@ -233,43 +187,6 @@ def course_admin_content( request, course_id ):
     )
 
 
-def course_discussion( request, course_id ):
-    raise Exception('not implemented')
-    course_uri = course_model.course_id2uri(course_id)
-    course = _get_course_or_404(course_uri)
- 
-    context = { }
-    context = _populate_course_context(request, course_id, context)
-    context['discussion_active'] = True
-
-    return render(
-        request,
-        'courses/course_discussion.html',
-        context
-    )
-
-
-def course_people( request, course_id ):
-    raise Exception('not implemented')
-    course_uri = course_model.course_id2uri(course_id)
-    course = _get_course_or_404(course_uri)
- 
-    context = { }
-    context = _populate_course_context(request, course_id, context)
-
-    from users.models import get_user_profile_image_url
-    for user in context['cohort']['users'].values():
-        user['profile_image_url'] = get_user_profile_image_url(user['uri'])
-
-    context['people_active'] = True
-
-    return render(
-        request,
-        'courses/course_people.html',
-        context
-    )
-
-
 @login_required
 @require_organizer
 def course_settings( request, course_id ):
@@ -322,66 +239,39 @@ def course_image( request, course_id ):
 
 
 @login_required
-def course_signup( request, course_id ):
-    raise Exception('not implemented')
-    #NOTE: consider using cohort_id in URL to avoid cohort lookup
-    cohort = course_model.get_course_cohort( course_id )
-    user_uri = u"/uri/user/{0}".format(request.user.username)
-    if cohort['signup'] == "OPEN":
-        course_model.add_user_to_cohort(cohort['uri'], user_uri, "LEARNER", True)
-        messages.success(request, _("You are now signed up for this course."))
-    else:
-        messages.error(request, _("This course isn't open for signup."))
-    return course_slug_redirect( request, course_id )
-
-
-@login_required
-@require_http_methods(['POST'])
 @require_organizer
-def course_add_user( request, course_id ):
-    raise Exception('not implemented')
-    cohort_uri = course_model.get_course_cohort_uri(course_id)
-    redirect_url = reverse('courses_people', kwargs={'course_id': course_id})
-    username = request.POST.get('username', None)
-
-    if not username:
-        messages.error(request, _("Please select a user to add."))
-        return http.HttpResponseRedirect(redirect_url)
-
-    user_uri = u"/uri/user/{0}".format(username)
-    try:
-        course_model.add_user_to_cohort(cohort_uri, user_uri, "LEARNER")
-        messages.success(request, _("User added."))
-    except course_model.ResourceNotFoundException as e:
-        messages.error(request, _("User does not exist."))
-
-    return http.HttpResponseRedirect(redirect_url)
-
-
-@login_required
-def course_leave( request, course_id, username ):
-    raise Exception('not implemented')
-    cohort_uri = course_model.get_course_cohort_uri(course_id)
+def course_content_image_upload( request, course_id ):
+    course_uri = course_model.course_id2uri(course_id)
     user_uri = u"/uri/user/{0}".format(request.user.username)
-    # TODO site admin should also be able to remove users
-    is_organizer = course_model.is_cohort_organizer(
-        user_uri, cohort_uri
-    )
-    removed = False
-    error_message = _("Could not remove user")
-    if username == request.user.username or is_organizer:
-        removed, error_message = course_model.remove_user_from_cohort(
-            cohort_uri, u"/uri/user/{0}".format(username)
-        )
-
-    if not removed:
-        messages.error(request, error_message)
+    if request.method == 'POST':
+        image_form = CourseImageForm(request.POST, request.FILES)
+        if image_form.is_valid():
+            image_file = request.FILES['image']
+            image = media_model.upload_image(image_file, course_uri)
+            if request.headers.get('accept') == 'application/json' or request.headers.get('x-requested-with') == 'XMLHttpRequest':
+                return http.JsonResponse({
+                    'status': 'success',
+                    'image_uri': image['uri'],
+                    'image_url': image['url'],
+                })
+            redirect_url = reverse('courses_show',
+                kwargs={'course_id': course_id, 'slug': 'ermm'}
+            )
 
-    if is_organizer:
-        redirect_url = reverse('courses_people', kwargs={'course_id': course_id})
-        return http.HttpResponseRedirect(redirect_url)
+            return http.HttpResponseRedirect(redirect_url)
+        else:
+            messages.error(request, _("Could not upload image"))
+    else:
+        image_form = CourseImageForm()
+ 
+    context = _populate_course_context(request, course_id, {})
+    context["form"] = image_form
 
-    return course_slug_redirect( request, course_id)
+    return render(
+        request,
+        'courses/content_image_form.html',
+        context
+    )
 
 
 @login_required
@@ -427,47 +317,6 @@ def course_change_status( request, course_id ):
     return http.HttpResponseRedirect(redirect_url)
 
 
-@login_required
-@require_http_methods(['POST'])
-@require_organizer
-def course_change_signup( request, course_id ):
-    raise Exception('not implemented')
-    form = CohortSignupForm(request.POST)
-    if form.is_valid():
-        signup = form.cleaned_data['signup']
-        cohort_uri = course_model.get_course_cohort_uri(course_id)
-        cohort = course_model.update_cohort(cohort_uri, signup=signup.upper())
-        if not cohort:
-            messages.error( request, _("Could not change cohort signup"))
-    else:
-        request.messages.error(request, _("Invalid choice for signup"))
-    redirect_url = reverse('courses_settings', kwargs={'course_id': course_id})
-    return http.HttpResponseRedirect(redirect_url)
-
-
-@login_required
-@require_http_methods(['POST'])
-@require_organizer
-def course_change_term( request, course_id, term ):
-    raise Exception('not implemented')
-    cohort_uri = course_model.get_course_cohort_uri( course_id )
-    if term == 'fixed':
-        form = CourseTermForm(request.POST)
-        if form.is_valid():
-            course_model.update_cohort(
-                cohort_uri,
-                term=term.upper(),
-                start_date=form.cleaned_data['start_date'],
-                end_date=form.cleaned_data['end_date']
-            )
-        else:
-            messages.error( request, _("Could not update fixed term dates"))
-    elif term == 'rolling':
-        course_model.update_cohort(cohort_uri, term=term.upper())
-    redirect_url = reverse('courses_settings', kwargs={'course_id': course_id})
-    return http.HttpResponseRedirect(redirect_url)
-
-
 @login_required
 @require_http_methods(['POST'])
 @require_organizer
@@ -501,55 +350,6 @@ def course_update_tags( request, course_id ):
     return http.HttpResponseRedirect(redirect_url)
 
 
-@login_required
-@require_organizer
-def course_announcement( request, course_id ):
-    raise Exception('not implemented')
-    context = _populate_course_context(request, course_id, {})
-    context['announcement_active'] = True
-
-    if request.method == "POST" and len(request.POST.get('announcement_text', '')) > 0:
-        text = request.POST.get('announcement_text')
-        course_model.send_course_announcement(
-            context['course']['uri'],
-            text
-        )
-        messages.success(request, _('The announcement has been sent!'))
-        redirect_url = reverse('courses_show', kwargs={'course_id': course_id, 'slug': context['course']['slug']})
-        return http.HttpResponseRedirect(redirect_url)
-
-    return render(
-        request,
-        'courses/course_announcement.html',
-        context
-    )
-
-
-@login_required
-@require_organizer
-def course_export_emails( request, course_id ):
-    raise Exception('not implemented')
-    if not request.user.has_perm('users.trusted_user'):
-        msg = _('You do not have permission to view this page')
-        return http.HttpResponseForbidden(msg)
-    
-    course_uri = course_model.course_id2uri(course_id)
-    cohort = course_model.get_course_cohort(course_uri)
-
-    response = http.HttpResponse(mimetype='text/csv')
-    response['Content-Disposition'] = 'attachment; '
-    response['Content-Disposition'] += 'filename=detailed_report.csv'
-    writer = unicodecsv.writer(response)
-    writer.writerow(["username", "email address", "signup date"])
-
-    for user in cohort['users'].values():
-        username = user['uri'].strip('/').split('/')[-1]
-        user['email'] = User.objects.get(username=username).email
-        writer.writerow([username, user['email'], user['signup_date']])
-
-    return response
-
-
 def show_content( request, course_id, content_id):
     content_uri = u'/uri/content/{0}'.format(content_id)
     user_uri = u"/uri/user/{0}".format(request.user.username)
diff --git a/media/db.py b/media/db.py
index df06cbd19..9ae17327a 100755
--- a/media/db.py
+++ b/media/db.py
@@ -5,3 +5,6 @@ class Image(models.Model):
 
     image_file = models.FileField(upload_to="uploads/images")
     uploader_uri = models.CharField(max_length=256)
+
+    def __str__(self):
+        return self.image_file

From 816dd536fabbc30cddd4ca500095d6e3dcaa8537 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 9 Jan 2026 14:21:23 +0200
Subject: [PATCH 18/63] Add script used to convert google doc to course content

---
 gdoc/README.md          |   6 +
 gdoc/docker-compose.yml |  11 ++
 gdoc/gdoc2ciab.py       | 286 ++++++++++++++++++++++++++++++++++++++++
 gdoc/requirements.txt   |  26 ++++
 4 files changed, 329 insertions(+)
 create mode 100644 gdoc/README.md
 create mode 100644 gdoc/docker-compose.yml
 create mode 100644 gdoc/gdoc2ciab.py
 create mode 100644 gdoc/requirements.txt

diff --git a/gdoc/README.md b/gdoc/README.md
new file mode 100644
index 000000000..0b6bbb89a
--- /dev/null
+++ b/gdoc/README.md
@@ -0,0 +1,6 @@
+A python script to 
+
+1. download a google document
+2. convert it to markdown
+3. download included images
+4. upload to learning circle course content
diff --git a/gdoc/docker-compose.yml b/gdoc/docker-compose.yml
new file mode 100644
index 000000000..48d3a6feb
--- /dev/null
+++ b/gdoc/docker-compose.yml
@@ -0,0 +1,11 @@
+services:
+  python:
+    image: python:3.11
+    volumes:
+    - .:/opt/app
+    ports:
+    - 8080:8080
+    network_mode: host
+    user: 1000:1000
+    working_dir: /opt/app
+    command: bash -c "python3 -m venv venv && /opt/app/venv/bin/pip install -r requirements.txt"
diff --git a/gdoc/gdoc2ciab.py b/gdoc/gdoc2ciab.py
new file mode 100644
index 000000000..3e493216e
--- /dev/null
+++ b/gdoc/gdoc2ciab.py
@@ -0,0 +1,286 @@
+from __future__ import print_function
+import pickle
+import os.path
+import os
+import logging
+import yaml
+import re
+import requests
+import shutil
+from pprint import pprint
+
+from google.auth.transport.requests import Request
+from google.oauth2.credentials import Credentials
+from google_auth_oauthlib.flow import InstalledAppFlow
+from googleapiclient.discovery import build
+from googleapiclient.errors import HttpError
+
+
+logger = logging.getLogger(__name__)
+
+# If modifying these scopes, delete the file token.pickle.
+SCOPES = ['https://www.googleapis.com/auth/documents.readonly']
+
+
+# The ID of the google doc with the course content.
+#DOCUMENT_ID = '1hfsuDUvoRqMDP5Hl0Xv5G73tPFSxtVM7HTJWxLfDMVo'
+DOCUMENT_ID = '1MPULtjQmBonAh7rZmivJFslk21KisFR8UeVKRXF2zN8'
+
+NEW_TAB_LINKS = [
+    r'https://community.p2pu.org/t/introduce-yourself/1571/',
+    r'https://docs.google.com/presentation/d/1_s0FFtAPG8MHxL8yRFrdxaI22obFrX_ZsONz-sIZJSY/edit#slide=id.g3c793ae459_0_0',
+    r'https://www.p2pu.org/en/courses/',
+    r'https://learningcircles.p2pu.org/en/accounts/register.*?',
+    r'https://learningcircles.p2pu.org.*?',
+    r'https://community.p2pu.org/t/what-topics-are-missing/2786',
+]
+
+
+def get_doc(document_id):
+    """Shows basic usage of the Docs API.
+    Prints the title of a sample document.
+    """
+    creds = None
+    # The file token.pickle stores the user's access and refresh tokens, and is
+    # created automatically when the authorization flow completes for the first
+    # time.
+    if os.path.exists('token.pickle'):
+        with open('token.pickle', 'rb') as token:
+            creds = pickle.load(token)
+    # If there are no (valid) credentials available, let the user log in.
+    if not creds or not creds.valid:
+        if creds and creds.expired and creds.refresh_token:
+            creds.refresh(Request())
+        else:
+            flow = InstalledAppFlow.from_client_secrets_file('credentials.json', SCOPES)
+            creds = flow.run_local_server()
+            ## TODO can I specify the address to bind to?
+        # Save the credentials for the next run
+        with open('token.pickle', 'wb') as token:
+            pickle.dump(creds, token)
+
+    service = build('docs', 'v1', credentials=creds)
+
+    # Retrieve the documents contents from the Docs service.
+    document = service.documents().get(documentId=document_id).execute()
+    #print('The title of the document is: {}'.format(document.get('title')))
+    return document
+
+
+# Image formats to embed
+IMAGE_FORMATS = ['jpeg', 'jpg', 'png', 'svg'] 
+
+
+def smart_link(text, url, embed=False):
+    #print('' + url + (' embed' if embed else '') )
+    if any(map(lambda x: re.match(x, url), NEW_TAB_LINKS)):
+        return f'<a href="{url}" target="_blank">{text}</a>'
+    if not embed:
+        return f"[{text}]({url})"
+
+    if url.split('.')[-1].lower() in IMAGE_FORMATS:
+        return f"![{text}]({url})"
+
+    return f"[{text}]({url})"
+
+
+def convert_to_course_outline(document):
+    # document is formatted doc > body > content
+    # content is a list of structural elements, for now handle paragraph and table
+    # https://developers.google.com/workspace/docs/api/reference/rest/v1/documents#structuralelement
+
+    content = document.get('body').get('content')
+    #pprint(document.get('inlineObjects'))
+    # TODO this filters out anything that isn't a paragraph!
+    content = filter(lambda se: 'paragraph' in se, content)
+    modules = []  # [{'title': '', 'md': ''}]
+    intro = ''
+    for se in content:
+        paragraph = se['paragraph']
+        #pprint(se)
+        page_break = any([True for e in paragraph['elements'] if 'pageBreak' in e])
+        if page_break:
+            # Stop processing the document after the first page break
+            break
+        text = ''
+        elements = paragraph['elements']
+        #elements = filter(lambda e: e.get('textRun','').strip('\n') == '', elements)
+        for eidx, element in enumerate(elements):
+            if 'textRun' in element:
+                textRun = element.get('textRun')
+                textContent = textRun['content'].strip('\n')
+                bold = textRun['textStyle'].get('bold', False)
+                italic = textRun['textStyle'].get('italic', False)
+                link = textRun['textStyle'].get('link', {}).get('url')
+                if not textContent:
+                    if any([bold, italic, link]):
+                        logger.warning(f'Ignoring empty textRun. bold: {bold} italic: {italic} link: {link}')
+                    continue
+                if bold:
+                    textContent = f'**{textContent}**'
+                if italic:
+                    textContent = f'*{textContent}*'
+                if link:
+                    text += smart_link(textContent, link, embed=True)
+                else:
+                    text += textContent
+            elif 'inlineObjectElement' in element:
+                inlineObjectElement = element.get('inlineObjectElement')
+                inlineObject = document.get('inlineObjects').get(inlineObjectElement.get('inlineObjectId'))
+                imageUri = inlineObject.get('inlineObjectProperties', {}).get('embeddedObject', {}).get('imageProperties', {}).get('contentUri')
+                if imageUri:
+                    print('Found image, downloading the sucker!')
+                    r = requests.get(imageUri, stream=True)
+                    print(r.headers['content-type'])
+                    ext = r.headers.get('content-type', 'image/jpg').split('/')[-1]
+                    image_path = f'assets/uploads/{inlineObject["objectId"]}.{ext}'
+                    if r.status_code == 200:
+                        with open(image_path, 'wb') as f:
+                            r.raw.decode_content = True
+                            shutil.copyfileobj(r.raw, f)
+                        image_id = inlineObject["objectId"]
+                        # add text with reference style link
+                        text += f'![alt todo][{image_id}]'
+                        # add image to current module
+                        if len(modules) > 0:
+                            module = modules[-1]
+                            images = module.get('images', {})
+                            images[image_id] = {
+                                "image_id": image_id,
+                                "image_path": image_path,
+                            } # TODO alt text, title?
+                            module['images'] = images
+
+                    else:
+                        print(f'Could not download image!! {r.status_code}')
+
+
+        if paragraph.get('paragraphStyle',{}).get('namedStyleType') == 'HEADING_2':
+            text = '# ' + text + '\n'
+
+        if paragraph.get('paragraphStyle',{}).get('namedStyleType') == 'HEADING_3':
+            text = '## ' + text
+
+        if paragraph.get('paragraphStyle',{}).get('namedStyleType') == 'HEADING_4':
+            text = '### ' + text
+
+        if 'bullet' in paragraph:
+            bullet = paragraph['bullet']
+            nesting_level = bullet.get('nestingLevel', 0)
+            list_properties = document.get('lists', {}).get(bullet.get('listId'), {}).get('listProperties',{})
+            style = list_properties.get('nestingLevels')[nesting_level]
+            if 'glyphType' in style and not style['glyphType'] == 'GLYPH_TYPE_UNSPECIFIED':
+                glyph = '1.'
+            else:
+                glyph = '-'
+
+            text = '   '*nesting_level + glyph + ' ' + text
+
+        # Start a new module when encountering HEADING 1 (H1)
+        if paragraph.get('paragraphStyle',{}).get('namedStyleType') == 'HEADING_1':
+            modules += [{'title': text, 'md': ''}]
+            continue 
+
+        if len(modules) == 0:
+            intro += text + '\n'
+            continue
+
+        module = modules[-1]
+        module['md'] += text + '\n'
+
+    course_outline = {
+        'modules': modules,
+        'title': document.get('title'),
+        'intro': intro,
+    }
+    return course_outline
+
+
+def write_module(title, text, index):
+    slug = title.replace(' ', '-').lower()
+    path = os.path.join('_guide', f'{index+1:02}_{slug}.md')
+
+    
+    with open(path, 'w') as f:
+        f.write('---\n')
+        f.write(f'title: "{title}"\n')
+        f.write('---\n')
+        f.write(text)
+
+
+def write_index(text_md):
+    with open('./index.md', 'w') as f:
+        f.write('---\n')
+        f.write(f'layout: index\n')
+        f.write('---\n')
+        f.write(text_md)
+
+
+def write_course(course_outline):
+    for index, module in enumerate(course_outline.get('modules')):
+        write_module(module['title'], module['md'], index)
+
+
+import requests
+
+
+def upload_course(course_id, course_outline):
+    # Create a session object
+    with requests.Session() as s:
+        LOGIN_URL = 'http://localhost:8000/en/accounts/login/'
+        r1 = s.get(LOGIN_URL)
+        csrf_token = s.cookies['csrftoken']
+        login_data = {'username': 'dirk', 'password': 'password', 'csrfmiddlewaretoken': csrf_token}
+        s.post(LOGIN_URL, data=login_data)
+        r = s.get('http://localhost:8000/en/accounts/fe/whoami/')
+        print(r.text)
+
+        course_url = 'http://localhost:8000/en/courses/1/'
+        for index, module in enumerate(course_outline.get('modules')):
+            # upload_module(module['title'], module['md'], module['images'], index)
+            module_md = module['md']
+            image_upload_url = f'http://localhost:8000/en/courses/1/content/upload_image/'
+            for image in module.get('images', {}).values():
+                # upload image
+                image_id = image['image_id']
+                image_path = image['image_path']
+                with open(image_path, 'rb') as image_file:
+                    files = {'image': image_file}
+                    data = {
+                        'csrfmiddlewaretoken': s.cookies['csrftoken'],
+                    }
+                    headers = {
+                        'Accept': 'application/json'
+                    }
+                    response = s.post(image_upload_url, files=files, data=data, headers=headers)
+    
+                    if response.status_code == 200:
+                        print("File and form data uploaded successfully.")
+                        # print(response.json())
+                        # add reference style link for image to bottom
+                        image_url = response.json().get('image_url')
+                        module_md += f'\n[{image_id}]: {image_url}'
+                        #module_md += f'\n[{image_id}]: {image_url} "{image_title}"'
+                    else:
+                        print(response.text)
+            # Create new module in course
+            content_create_url = 'http://localhost:8000/en/courses/1/content/create/'
+            data = {
+                'csrfmiddlewaretoken': s.cookies['csrftoken'],
+                'title': module['title'],
+                'content': module_md,
+            }
+            response = s.post(content_create_url, data=data)
+            if response.status_code == 200:
+                print("Module created")
+            else:
+                print(response.text)
+
+
+
+
+if __name__ == '__main__':
+    doc = get_doc(DOCUMENT_ID)
+    course_outline = convert_to_course_outline(doc)
+    upload_course(1, course_outline)
+    #write_course(course_outline)
diff --git a/gdoc/requirements.txt b/gdoc/requirements.txt
new file mode 100644
index 000000000..17b0d44a7
--- /dev/null
+++ b/gdoc/requirements.txt
@@ -0,0 +1,26 @@
+cachetools==3.1.0
+certifi==2019.3.9
+chardet==3.0.4
+charset-normalizer==3.3.2
+google-api-core==2.19.1
+google-api-python-client==2.142.0
+google-auth==2.34.0
+google-auth-httplib2==0.2.0
+google-auth-oauthlib==0.3.0
+googleapis-common-protos==1.63.2
+httplib2==0.22.0
+idna==2.8
+oauthlib==3.0.1
+proto-plus==1.24.0
+protobuf==5.27.3
+pyasn1==0.4.5
+pyasn1-modules==0.2.4
+pyparsing==3.1.4
+PyYAML==5.1
+requests==2.21.0
+requests-oauthlib==1.2.0
+rsa==4.0
+six==1.12.0
+uritemplate==4.1.1
+urllib3==1.24.1
+

From f688024ce492d8f429529eb83dae6598b14b3fe3 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 12 Jan 2026 14:59:28 +0200
Subject: [PATCH 19/63] Update ignore files

---
 .dockerignore | 1 +
 .gitignore    | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
index b951028eb..d333fb4dc 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -15,3 +15,4 @@ Dockerfile
 compose/
 places/data/
 docker.env
+gdoc/
diff --git a/.gitignore b/.gitignore
index de4c44de1..505fc1767 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,6 @@ tmp/*.png
 *.mo
 scripts/*
 docker.env
-compose/
\ No newline at end of file
+compose/
+token.pickle
+credentials.json

From bc7ada1216448081fce468730688e5c85b43af85 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 12 Jan 2026 15:04:11 +0200
Subject: [PATCH 20/63] Disable sticky top on content pages

---
 p2pu-theme                       | 2 +-
 static/sass/_learningcircle.scss | 4 ++++
 studygroups/views/learner.py     | 5 +++--
 templates/base.html              | 2 +-
 templates/nav.html               | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/p2pu-theme b/p2pu-theme
index d3aac8f53..0fd3b28cc 160000
--- a/p2pu-theme
+++ b/p2pu-theme
@@ -1 +1 @@
-Subproject commit d3aac8f5330ba8324a956a71ab567811d82e8f44
+Subproject commit 0fd3b28cc18e564fb29a055d51a7f75900368da9
diff --git a/static/sass/_learningcircle.scss b/static/sass/_learningcircle.scss
index 33ef3acfa..54256a88a 100644
--- a/static/sass/_learningcircle.scss
+++ b/static/sass/_learningcircle.scss
@@ -20,3 +20,7 @@
 .rm-facilitator-warning {
   margin-top: 20px;
 }
+
+.page-content.scroll_top {
+  padding-top: 0;
+}
diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index 71f14a7fd..2b067a091 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -295,7 +295,7 @@ def get(self, request, *args, **kwargs):
             sections = courses.models.get_course_content(course_uri)
             context['content_link'] = reverse(
                 'studygroups_content_view',
-                args=(study_group.pk, sections[0]['id'],)
+                args=(study_group.pk, sections[1]['id'],) #TODO skipping nr 0
             )
 
 
@@ -438,12 +438,13 @@ def get(self, request, *args, **kwargs):
         
         import courses.models
         course_uri = courses.models.course_id2uri(study_group.course_content.pk)
-        sections = courses.models.get_course_content(course_uri)
+        sections = courses.models.get_course_content(course_uri)[1:] #TODO 
 
         markdown_content = content.latest.content
         h1_headings = re.findall(r'^\s*#(?!#)\s+(.+)$', markdown_content, flags=re.MULTILINE)
 
         context = {
+            "scroll_top": True,
             "study_group": study_group,
             "content": markdown_content,
             "content_title": content.latest.title,
diff --git a/templates/base.html b/templates/base.html
index 74cfb69d6..d3fc7146a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -61,7 +61,7 @@
 
   {% include 'nav.html' %}
 
-    <main class="page-content">
+  <main class="page-content {% if scroll_top %}scroll_top{% endif %}">
     {% for message in messages %}
       <div class="alert{% if message.tags %} alert-{{ message.tags }}{% endif %}" role="alert">
         <div class="container">{{ message }}</div>
diff --git a/templates/nav.html b/templates/nav.html
index db15c46e6..2881194b6 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -2,7 +2,7 @@
 {% load extras %}
 {% load i18n %}
 
-<header class="fixed-top bg-white shadow-sm border-bottom">
+<header class="{% if scroll_top %}{% else %}fixed-top {% endif %}bg-white shadow-sm border-bottom">
   <div class="header-top container">
     <div class="d-flex flex-wrap align-items-center">
       <a class="order-1 d-flex align-items-center py-3 me-md-auto text-white text-decoration-none" href="{{STATIC_SITE_URL}}/en/">

From 0c3a1700c8d85fdd75b63b93d4abc922454d2c73 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 12 Jan 2026 15:04:41 +0200
Subject: [PATCH 21/63] Update content navigation for learning circle with
 content

---
 templates/studygroups/content_view.html | 48 ++++++++++++++-----------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/templates/studygroups/content_view.html b/templates/studygroups/content_view.html
index f7fb22e70..3af2dab4d 100644
--- a/templates/studygroups/content_view.html
+++ b/templates/studygroups/content_view.html
@@ -50,29 +50,35 @@ <h1>{{study_group.name}}</h1>
     </div>
   </div>
 
-  <div class="container-xl mt-5">
-
-    <nav id="content-navbar" class="navbar bg-light px-3 mb-3 sticky-top" style="top: 10rem;">
-      <div class="dropdown">
-        <a class="btn btn-sm d-flex align-items-center secondary p2pu-btn gray mx-0 dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false">
-          {{ content_title }} <span class="material-icons">expand_more</span>
-        </a>
-        <ul class="dropdown-menu" aria-labelledby="content-sections-dropdown">
-          {% for content in sections %}
-          <li><a class="dropdown-item" href="{% url 'studygroups_content_view' study_group.id content.id %}">{{ content.title }}</a></li>
-          {% endfor %}
-        </ul>
+    <nav id="content-navbar" class="navbar bg-light px-3 mt-5 mb-2 sticky-top">
+      <div class="container-xl flex-nowrap">
+        <div class="dropdown flex-shrink-0">
+          <a class="btn btn-sm d-flex align-items-center secondary p2pu-btn gray mx-0 dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false">
+            {{ content_title }} <span class="material-icons">expand_more</span>
+          </a>
+          <ul class="dropdown-menu" aria-labelledby="content-sections-dropdown">
+            {% for content in sections %}
+            <li><a class="dropdown-item" href="{% url 'studygroups_content_view' study_group.id content.id %}">{{ content.title }}</a></li>
+            {% endfor %}
+          </ul>
+        </div>
+     
+        <div class="flex-grow-1">
+          <ul class="nav nav-pills">
+            {% for heading in h1_headings %}
+              <li class="nav-item">
+                <a class="nav-link" data-heading-index="{{ forloop.counter0 }}" href="#" >{{ heading}}</a>
+              </li>
+            {% endfor %}
+          </ul>
+        </div>
       </div>
-
-      <ul class="nav nav-pills">
-        {% for heading in h1_headings %}
-          <li class="nav-item">
-            <a class="nav-link" data-heading-index="{{ forloop.counter0 }}" href="#" >{{ heading}}</a>
-          </li>
-        {% endfor %}
-      </ul>
     </nav>
 
+
+  <div class="container-xl mt-5">
+
+
     <div id="learning-circle-timeline" class="manage mt-4">
       {{ content|convert_content }}
     </div>
@@ -87,6 +93,7 @@ <h1>{{study_group.name}}</h1>
   $('[data-toggle="popover"]').popover();
 });
 </script>
+
 {% if h1_headings %}
 <script>
 (function () {
@@ -146,5 +153,6 @@ <h1>{{study_group.name}}</h1>
   });
 })();
 </script>
+
 {% endif %}
 {% endblock %}

From c115bfcef219a665443e82104d4d1a6cadfffbc3 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 12 Jan 2026 15:09:15 +0200
Subject: [PATCH 22/63] Add missing migrations for courses

---
 courses/migrations/0001_initial.py | 84 ++++++++++++++++++++++++++++++
 courses/migrations/__init__.py     |  0
 2 files changed, 84 insertions(+)
 create mode 100644 courses/migrations/0001_initial.py
 create mode 100644 courses/migrations/__init__.py

diff --git a/courses/migrations/0001_initial.py b/courses/migrations/0001_initial.py
new file mode 100644
index 000000000..9f0e72f98
--- /dev/null
+++ b/courses/migrations/0001_initial.py
@@ -0,0 +1,84 @@
+# Generated by Django 4.2.11 on 2025-07-24 07:26
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Cohort',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('term', models.CharField(choices=[('ROLLING', 'Rolling'), ('FIXED', 'Fixed')], max_length=32)),
+                ('start_date', models.DateTimeField(blank=True, null=True)),
+                ('end_date', models.DateTimeField(blank=True, null=True)),
+                ('signup', models.CharField(choices=[('OPEN', 'Anyone can sign up'), ('MODERATED', 'Signups are moderated'), ('CLOSED', 'Signups are closed')], max_length=32)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Course',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+                ('short_title', models.CharField(max_length=20)),
+                ('description', models.CharField(max_length=1000)),
+                ('language', models.CharField(max_length=32)),
+                ('image_uri', models.CharField(max_length=256)),
+                ('creation_date', models.DateTimeField(auto_now_add=True)),
+                ('draft', models.BooleanField(default=True)),
+                ('archived', models.BooleanField(default=False)),
+                ('deleted', models.BooleanField(default=False)),
+                ('creator_uri', models.CharField(max_length=256)),
+                ('based_on', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='derived_courses', to='courses.course')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='CourseTags',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('tag', models.CharField(max_length=64)),
+                ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tags', to='courses.course')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='CourseContent',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('content_uri', models.CharField(max_length=256)),
+                ('index', models.PositiveIntegerField()),
+                ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='content', to='courses.course')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='CohortSignup',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('user_uri', models.CharField(max_length=256)),
+                ('role', models.CharField(choices=[('LEARNER', 'Learner'), ('ORGANIZER', 'Organizer')], max_length=10)),
+                ('signup_date', models.DateTimeField(auto_now_add=True)),
+                ('leave_date', models.DateTimeField(blank=True, null=True)),
+                ('cohort', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='signup_set', to='courses.cohort')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='CohortComment',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('comment_uri', models.CharField(max_length=256)),
+                ('reference_uri', models.CharField(max_length=256)),
+                ('cohort', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comment_set', to='courses.cohort')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='cohort',
+            name='course',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cohort_set', to='courses.course'),
+        ),
+    ]
diff --git a/courses/migrations/__init__.py b/courses/migrations/__init__.py
new file mode 100644
index 000000000..e69de29bb

From a1927e2ad626f63016bf730c1da3aee835f739ce Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 15 Jan 2026 09:49:55 +0200
Subject: [PATCH 23/63] Fix display of icons for buttons to re-order content

---
 courses/templates/courses/course_admin_content.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/courses/templates/courses/course_admin_content.html b/courses/templates/courses/course_admin_content.html
index d475c7b23..2202bdfde 100755
--- a/courses/templates/courses/course_admin_content.html
+++ b/courses/templates/courses/course_admin_content.html
@@ -9,8 +9,8 @@
         <tr>
           <td><a class="taskLink" href="{% url "courses_content_show" course_id=course.id content_id=task.id %}">{{ task.title }}</a></td>
           {% if organizer %}
-              <td>{% if not forloop.first %}<a class="robttn up" href="{% url "courses_content_up" course_id=course.id content_id=task.id %}"><i class="icon-arrow-up"></i></a>{% endif %}</td>
-              <td>{% if not forloop.last %}<a class="robttn dwn" href="{% url "courses_content_down" course_id=course.id content_id=task.id%}"><i class="icon-arrow-down"></i></a>{% endif %}</td>
+              <td>{% if not forloop.first %}<a class="btn up" href="{% url "courses_content_up" course_id=course.id content_id=task.id %}"><i class="fas fa-arrow-up"></i></a>{% endif %}</td>
+              <td>{% if not forloop.last %}<a class="btn btn-small" href="{% url "courses_content_down" course_id=course.id content_id=task.id%}"><i class="fas fa-arrow-down"></i></a>{% endif %}</td>
           {% endif %}
 
           {% if organizer %}

From d22f63708c468d503e15e535882ad41ca8f295dd Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 15 Jan 2026 11:38:45 +0200
Subject: [PATCH 24/63] Add course content association to courses and use when
 creating a learning circle

---
 .../migrations/0174_course_course_content.py  | 20 +++++++++++++++++++
 studygroups/models/course.py                  |  2 ++
 studygroups/views/api.py                      |  1 +
 3 files changed, 23 insertions(+)
 create mode 100644 studygroups/migrations/0174_course_course_content.py

diff --git a/studygroups/migrations/0174_course_course_content.py b/studygroups/migrations/0174_course_course_content.py
new file mode 100644
index 000000000..2fef6a018
--- /dev/null
+++ b/studygroups/migrations/0174_course_course_content.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.11 on 2026-01-15 09:25
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0001_initial'),
+        ('studygroups', '0173_studygroup_course_content'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='course',
+            name='course_content',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='courses.course'),
+        ),
+    ]
diff --git a/studygroups/models/course.py b/studygroups/models/course.py
index 09af51e99..2a4c86c74 100644
--- a/studygroups/models/course.py
+++ b/studygroups/models/course.py
@@ -56,6 +56,8 @@ class Course(LifeTimeTrackingModel):
     rating_step_counts = models.TextField(default="{}") # JSON value             # TODO
     discourse_topic_url = models.URLField(blank=True)
 
+    course_content = models.ForeignKey('courses.Course', on_delete=models.CASCADE, blank=True, null=True)
+
     def __str__(self):
         return self.title
 
diff --git a/studygroups/views/api.py b/studygroups/views/api.py
index 0f7ed81e3..a33afb4d7 100644
--- a/studygroups/views/api.py
+++ b/studygroups/views/api.py
@@ -764,6 +764,7 @@ def post(self, request):
         study_group = StudyGroup(
             name=data.get('name', None),
             course=data.get('course'),
+            course_content=data.get('course').course_content,
             course_description=data.get('course_description', None),
             created_by=request.user,
             description=data.get('description'),

From 3e92de22b89e2ba5d91f30a404d5cb95edf357a7 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 15 Jan 2026 14:01:52 +0200
Subject: [PATCH 25/63] Removed unused code and templates for courses app

---
 courses/badges_oembed.py                      |  39 ---
 courses/db.py                                 |  55 ----
 courses/decorators.py                         |   5 +-
 courses/export.py                             |  15 -
 courses/forms.py                              |  10 -
 ...02_remove_cohortcomment_cohort_and_more.py |  30 ++
 courses/models.py                             | 311 ++----------------
 .../courses/course_announcement.html          |  21 --
 courses/templates/courses/course_badges.html  |  58 ----
 .../templates/courses/course_discussion.html  |  40 ---
 courses/templates/courses/course_people.html  |  40 ---
 .../templates/courses/course_user_snip.html   |  24 --
 .../courses/emails/course_announcement.txt    |   5 -
 .../emails/course_announcement_subject.txt    |   3 -
 .../templates/courses/emails/course_join.txt  |  10 -
 .../courses/emails/course_join_subject.txt    |   3 -
 courses/urls.py                               |   4 -
 courses/utils.py                              |  35 --
 courses/views.py                              |  72 +---
 19 files changed, 54 insertions(+), 726 deletions(-)
 delete mode 100755 courses/badges_oembed.py
 delete mode 100755 courses/export.py
 create mode 100644 courses/migrations/0002_remove_cohortcomment_cohort_and_more.py
 delete mode 100755 courses/templates/courses/course_announcement.html
 delete mode 100755 courses/templates/courses/course_badges.html
 delete mode 100755 courses/templates/courses/course_discussion.html
 delete mode 100755 courses/templates/courses/course_people.html
 delete mode 100755 courses/templates/courses/course_user_snip.html
 delete mode 100755 courses/templates/courses/emails/course_announcement.txt
 delete mode 100755 courses/templates/courses/emails/course_announcement_subject.txt
 delete mode 100755 courses/templates/courses/emails/course_join.txt
 delete mode 100755 courses/templates/courses/emails/course_join_subject.txt
 delete mode 100755 courses/utils.py

diff --git a/courses/badges_oembed.py b/courses/badges_oembed.py
deleted file mode 100755
index 805c9eb9a..000000000
--- a/courses/badges_oembed.py
+++ /dev/null
@@ -1,39 +0,0 @@
-import requests
-from django.conf import settings
-
-from content import models as content_model
-from courses import models as course_model
-
-
-class BadgeNotFoundException(Exception):
-    pass
-
-
-def request_oembedded_content(url):
-    """ Retrieves oembed json from API endpoint"""
-    endpoint_url = settings.BADGES_OEMBED_URL
-
-    try:
-        r = requests.get(endpoint_url, params={'url': url})
-    except (requests.exceptions.RequestException,
-            requests.exceptions.ConnectionError,
-            requests.exceptions.HTTPError) as e:
-        return e
-    return r
-
-
-def add_content_from_response(course_uri, url, user_uri):
-    content = None
-    response = request_oembedded_content(url)
-    if response.status_code == 200:
-        content = response.json
-        content_data = {
-            'title': content['title'],
-            'content': content['html'],
-            'author_uri': user_uri,
-        }
-        content = content_model.create_content(**content_data)
-        course_model.add_course_content(course_uri, content['uri'])
-    else:
-        raise BadgeNotFoundException
-    return content
diff --git a/courses/db.py b/courses/db.py
index bde0c6c22..786cab6ab 100755
--- a/courses/db.py
+++ b/courses/db.py
@@ -1,7 +1,6 @@
 from django.db import models
 
 class Course(models.Model):
-
     title = models.CharField(max_length=255)
     short_title = models.CharField(max_length=20)
     description = models.CharField(max_length=1000)
@@ -16,65 +15,11 @@ class Course(models.Model):
 
 
 class CourseContent(models.Model):
-
     course = models.ForeignKey(Course, models.CASCADE, related_name='content')
     content_uri = models.CharField(max_length=256) 
     index = models.PositiveIntegerField()
 
 
 class CourseTags(models.Model):
-
     course = models.ForeignKey(Course, models.CASCADE, related_name='tags')
     tag = models.CharField(max_length=64)
-
-
-# TODO remove
-class Cohort(models.Model):
-
-    OPEN = "OPEN"
-    MODERATED = "MODERATED"
-    CLOSED = "CLOSED"
-    SIGNUP_MODELS = (
-        (OPEN, "Anyone can sign up"),
-        (MODERATED, "Signups are moderated"),
-        (CLOSED, "Signups are closed"),
-    )
-
-    ROLLING = "ROLLING"
-    FIXED = "FIXED"
-    TERM_CHOICES = (
-        (ROLLING, "Rolling"),
-        (FIXED, "Fixed"),
-    )
-
-    course = models.ForeignKey(Course, models.CASCADE, related_name="cohort_set")
-    term = models.CharField(max_length=32, choices=TERM_CHOICES)
-    start_date = models.DateTimeField(blank=True, null=True)
-    end_date = models.DateTimeField(blank=True, null=True)
-    signup = models.CharField(max_length=32, choices=SIGNUP_MODELS)
-
-
-# TODO remove
-class CohortSignup(models.Model):
-
-    LEARNER = "LEARNER"
-    ORGANIZER = "ORGANIZER"
-    SIGNUP_ROLE_CHOICES = (
-        (LEARNER, "Learner"),
-        (ORGANIZER, "Organizer"),
-    )
-
-    cohort = models.ForeignKey(Cohort, models.CASCADE, related_name="signup_set")
-    user_uri = models.CharField(max_length=256)
-    role = models.CharField(max_length=10, choices=SIGNUP_ROLE_CHOICES)
-    signup_date = models.DateTimeField(auto_now_add=True)
-    leave_date = models.DateTimeField(blank=True, null=True)
-
-
-# TODO remove
-class CohortComment(models.Model):
-
-    cohort = models.ForeignKey(Cohort, models.CASCADE, related_name="comment_set")
-    comment_uri = models.CharField(max_length=256)
-    reference_uri = models.CharField(max_length=256)
-
diff --git a/courses/decorators.py b/courses/decorators.py
index a050fdce6..7a17dc4c2 100755
--- a/courses/decorators.py
+++ b/courses/decorators.py
@@ -9,10 +9,7 @@ def check_organizer( *args, **kwargs ):
         course_id = kwargs.get('course_id')
         course_uri = course_model.course_id2uri(course_id)
         user_uri = "/uri/user/{0}".format(request.user.username)
-        cohort = course_model.get_course_cohort(course_uri)
-        organizer = course_model.is_cohort_organizer(
-            user_uri, cohort['uri']
-        )
+        organizer = course_model.is_organizer(course_uri, user_uri)
         organizer |= request.user.is_superuser
         if not organizer:
             return http.HttpResponseForbidden(_("You need to be a course organizer."))
diff --git a/courses/export.py b/courses/export.py
deleted file mode 100755
index 3454e352f..000000000
--- a/courses/export.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from apps.courses import db
-import unicodecsv
-
-def export_signup_csv(filename):
-    with open(filename, 'w') as fout:
-        writer = unicodecsv.writer(fout)
-        writer.writerow(['signup_date', 'leave_date', 'role', 'user', 'course'])
-        for signup in db.CohortSignup.objects.all():
-            writer.writerow([
-                signup.signup_date.isoformat(),
-                signup.leave_date.isoformat() if signup.leave_date else '',
-                signup.role,
-                signup.user_uri,
-                signup.cohort.course.id
-            ])
diff --git a/courses/forms.py b/courses/forms.py
index 7a8919122..8b72232dc 100755
--- a/courses/forms.py
+++ b/courses/forms.py
@@ -53,13 +53,3 @@ class CourseStatusForm(forms.Form):
     ]
 
     status = forms.ChoiceField(choices=STATUS_CHOICES, widget=RadioSelect)
-
-
-SIGNUP_CHOICES = [
-    ("OPEN", _("Open"),), 
-    ("MODERATED", _("Moderated"),),
-    ("CLOSED", _("Closed"),)
-]
-
-class CohortSignupForm(forms.Form):
-    signup = forms.ChoiceField(choices=SIGNUP_CHOICES, widget=RadioSelect)
diff --git a/courses/migrations/0002_remove_cohortcomment_cohort_and_more.py b/courses/migrations/0002_remove_cohortcomment_cohort_and_more.py
new file mode 100644
index 000000000..b5dfe21eb
--- /dev/null
+++ b/courses/migrations/0002_remove_cohortcomment_cohort_and_more.py
@@ -0,0 +1,30 @@
+# Generated by Django 4.2.11 on 2026-01-15 09:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='cohortcomment',
+            name='cohort',
+        ),
+        migrations.RemoveField(
+            model_name='cohortsignup',
+            name='cohort',
+        ),
+        migrations.DeleteModel(
+            name='Cohort',
+        ),
+        migrations.DeleteModel(
+            name='CohortComment',
+        ),
+        migrations.DeleteModel(
+            name='CohortSignup',
+        ),
+    ]
diff --git a/courses/models.py b/courses/models.py
index 5936aff4d..2c67e9611 100755
--- a/courses/models.py
+++ b/courses/models.py
@@ -113,23 +113,24 @@ def get_courses(title=None, hashtag=None, language=None, organizer_uri=None, dra
 
 def get_user_courses(user_uri):
     """ return courses organized or participated in by an user """
-    signups = db.CohortSignup.objects.filter(user_uri=user_uri, leave_date__isnull=True, cohort__course__archived=False)
-    courses = []
-    for signup in signups:
-        try:
-            course = get_course(course_id2uri(signup.cohort.course.id))
-        except ResourceDeletedException:
-            continue
-        course_data = {
-            "id": course['id'],
-            "title": course['title'],
-            "user_role": signup.role,
-            "url": reverse("courses_show", kwargs={"course_id": course["id"], "slug": course["slug"]}),
-        }
-        if "image_uri" in course:
-            course_data["image_url"] = media_model.get_image(course['image_uri'])['url']
-        courses += [course_data]
-    return courses
+    raise Exception('not implemented')
+    #signups = db.CohortSignup.objects.filter(user_uri=user_uri, leave_date__isnull=True, cohort__course__archived=False)
+    #courses = []
+    #for signup in signups:
+    #    try:
+    #        course = get_course(course_id2uri(signup.cohort.course.id))
+    #    except ResourceDeletedException:
+    #        continue
+    #    course_data = {
+    #        "id": course['id'],
+    #        "title": course['title'],
+    #        "user_role": signup.role,
+    #        "url": reverse("courses_show", kwargs={"course_id": course["id"], "slug": course["slug"]}),
+    #    }
+    #    if "image_uri" in course:
+    #        course_data["image_url"] = media_model.get_image(course['image_uri'])['url']
+    #    courses += [course_data]
+    #return courses
 
 
 def create_course(title, hashtag, description, language, organizer_uri, based_on_uri=None):
@@ -151,14 +152,8 @@ def create_course(title, hashtag, description, language, organizer_uri, based_on
        **{"title": _("About"), "content": "", "author_uri": organizer_uri}
     )
     add_course_content("/uri/course/{0}".format(course_db.id), about['uri'])
-    create_course_cohort("/uri/course/{0}".format(course_db.id), organizer_uri)
     course = get_course("/uri/course/{0}".format(course_db.id))
 
-    #learn_api_data = get_course_learn_api_data(course['uri'])
-    #learn_model.add_course_listing(**learn_api_data)
-    #learn_model.add_course_to_list(learn_api_data['course_url'], "drafts")
-
-    # TODO notify admins
     return course
 
 
@@ -200,46 +195,10 @@ def update_course(course_uri, title=None, hashtag=None, description=None, langua
         course_db.image_uri = image_uri
 
     course_db.save()
-    #update_course_learn_api(course_uri)
 
     return get_course(course_uri)
 
 
-#   def update_course_learn_api(course_uri):
-#       """ send updated course info to the learn API to update course listing """
-#       course_db = _get_course_db(course_uri)
-#       try:
-#           learn_model.update_course_listing(**get_course_learn_api_data(course_uri))
-#       except:
-#           log.error("Could not update learn index information!")
-
-
-def get_course_learn_api_data(course_uri):
-    """ return data used by the learn API to list courses """
-    course = get_course(course_uri)
-
-    course_url = reverse(
-        'courses_slug_redirect',
-        kwargs={'course_id': course["id"]}
-    )
-    data_url = reverse('courses_learn_api_data', kwargs={'course_id': course["id"]})
-
-    learn_api_data = {
-        "course_url": course_url,
-        "title": course['title'],
-        "description": course['description'],
-        "data_url": data_url,
-        "language": course['language'],
-        "thumbnail_url": "",
-        "tags": get_course_tags(course_uri)
-    }
-
-    if 'image_uri' in course:
-        learn_api_data["thumbnail_url"] = media_model.get_image(course['image_uri'])['url']
-
-    return learn_api_data
-
-
 def publish_course(course_uri):
     """ publish the course - also add course to the 'listed' list in the learn index """
 
@@ -256,17 +215,6 @@ def publish_course(course_uri):
         'courses_slug_redirect',
         kwargs={'course_id': course["id"]}
     )
-    #try:
-    #    learn_model.remove_course_from_list(course_url, "drafts")
-    #except:
-    #    try: 
-    #        learn_model.remove_course_from_list(course_url, "archived")
-    #    except:
-    #        pass
-    #
-    #learn_model.add_course_to_list(course_url, "listed")
-
-    # TODO: Notify interested people in new course
     return course
 
 
@@ -285,15 +233,6 @@ def archive_course(course_uri):
         kwargs={'course_id': course["id"]}
     )
 
-    #try:
-    #    learn_model.remove_course_from_list(course_url, "listed")
-    #except:
-    #    try: 
-    #        learn_model.remove_course_from_list(course_url, "drafts")
-    #    except:
-    #        log.error('Course not in any lists')
-    #
-    #learn_model.add_course_to_list(course_url, "archived")
     return course
 
 
@@ -313,16 +252,6 @@ def unpublish_course(course_uri):
         kwargs={'course_id': course["id"]}
     )
 
-    #try:
-    #    learn_model.remove_course_from_list(course_url, 'listed')
-    #except:
-    #    try:
-    #        learn_model.remove_course_from_list(course_url, 'archived')
-    #    except:
-    #        log.error('Course not in any lists')
-    #
-    #learn_model.add_course_to_list(course_url, "drafts")
-
     return course
 
 
@@ -334,19 +263,6 @@ def delete_spam_course(course_uri):
     course_db.deleted = True
     course_db.save()
 
-    # remove the course listing
-    #course_url = reverse(
-    #    'courses_slug_redirect',
-    #    kwargs={'course_id': course_db.id}
-    #)
-    #try:
-    #    lists = learn_model.get_lists_for_course(course_url)
-    #    for course_list in lists:
-    #        learn_model.remove_course_from_list(course_url, course_list['name'])
-    #    learn_model.remove_course_listing(course_url)
-    #except:
-    #    pass
-    
 
 def get_course_content(course_uri):
     content = []
@@ -429,7 +345,6 @@ def add_course_tags(course_uri, tags):
         if not db.CourseTags.objects.filter(course=course_db, tag=tag).exists():
             tag_db = db.CourseTags(course=course_db, tag=tag)
             tag_db.save()
-    #update_course_learn_api(course_uri)
 
 
 def remove_course_tags(course_uri, tags):
@@ -437,196 +352,12 @@ def remove_course_tags(course_uri, tags):
 
     for tag_db in db.CourseTags.objects.filter(course=course_db, tag__in=tags):
         tag_db.delete()
-    #update_course_learn_api(course_uri)
-
-
-def create_course_cohort(course_uri, organizer_uri):
-    course_db = _get_course_db(course_uri)
-
-    if course_db.cohort_set.count() != 0:
-        return None
-
-    cohort_db = db.Cohort(
-        course=course_db,
-        term=db.Cohort.ROLLING,
-        signup=db.Cohort.CLOSED
-    )
-    cohort_db.save()
-    try:
-        cohort = get_course_cohort(course_uri)
-    except:
-        log.error("Could not create new cohort!")
-        #TODO raise appropriate exception
-        raise
-    add_user_to_cohort(cohort["uri"], organizer_uri, db.CohortSignup.ORGANIZER)
-    return get_course_cohort(course_uri)
 
 
-def get_course_cohort_uri(course_uri):
-    course_db = _get_course_db(course_uri)
+def is_organizer(course_uri, user_uri):
     try:
-        cohort_db = db.Cohort.objects.get(course=course_db)
-    except:
-        raise DataIntegrityException
-    return "/uri/cohort/{0}".format(cohort_db.id)
-
-
-def get_course_cohort(course_uri):
-    return get_cohort(get_course_cohort_uri(course_uri))
-
-
-def _get_cohort_db(cohort_uri):
-    cohort_id = cohort_uri.strip('/').split('/')[-1]
-    try:
-        cohort_db = db.Cohort.objects.get(id=cohort_id)
+        course_db = _get_course_db(course_uri)
     except:
         raise ResourceNotFoundException
-    return cohort_db
-
 
-def get_cohort(cohort_uri):
-    cohort_db = _get_cohort_db(cohort_uri)
-
-    cohort_data = {
-        "uri": "/uri/cohort/{0}".format(cohort_db.id),
-        "course_uri": "/uri/course/{0}".format(cohort_db.course_id),
-        "term": cohort_db.term,
-        "signup": cohort_db.signup,
-    }
-    #NOTE: fetching course + cohort twice when using get_course_cohort
-    #NOTE-Q: does cohort.course.id fetch the course data?
-    #NOTE-A: Yes, cohort.course_id doesn't
-
-    if cohort_db.term != db.Cohort.ROLLING:
-        cohort_data["start_date"] = cohort_db.start_date.date()
-        cohort_data["end_date"] = cohort_db.end_date.date()
-
-    cohort_data["users"] = {}
-    cohort_data["organizers"] = []
-    for signup in cohort_db.signup_set.filter(leave_date__isnull=True):
-        username = signup.user_uri.strip('/').split('/')[-1]
-        cohort_data["users"][username] = {
-            "username": username,
-            "uri": signup.user_uri,
-            "role": signup.role,
-            "signup_date": signup.signup_date
-        }
-        key = "{0}s".format(signup.role.lower())
-        if not key in cohort_data:
-            cohort_data[key] = []
-        cohort_data[key] += [username]
-
-    return cohort_data  
-
-
-def get_cohort_size( uri ):
-    cohort_db = _get_cohort_db(uri)
-    return cohort_db.signup_set.filter(leave_date__isnull=True).count()
-
-
-def update_cohort( uri, term=None, signup=None, start_date=None, end_date=None ):
-    cohort_db = _get_cohort_db(uri)
-
-    if term:
-        cohort_db.term = term
-    if signup:
-        cohort_db.signup = signup
-    if start_date:
-        cohort_db.start_date = start_date
-    if end_date:
-        cohort_db.end_date = end_date
-    cohort_db.save()
-    return get_cohort(uri)
-
-
-def user_in_cohort(user_uri, cohort_uri):
-    cohort_db = _get_cohort_db(cohort_uri)
-    return cohort_db.signup_set.filter(
-        user_uri=user_uri, leave_date__isnull=True).exists()
-
-
-def is_cohort_organizer(user_uri, cohort_uri):
-    cohort_db = _get_cohort_db(cohort_uri)
-    return cohort_db.signup_set.filter(
-        user_uri=user_uri, leave_date__isnull=True,
-        role=db.CohortSignup.ORGANIZER).exists()
-
-
-def add_user_to_cohort(cohort_uri, user_uri, role, notify_organizers=False):
-    cohort_db = _get_cohort_db(cohort_uri)
-
-    username = user_uri.strip('/').split('/')[-1]
-    if not User.objects.filter(username=username).exists():
-        raise ResourceNotFoundException(u'User {0} does not exist'.format(user_uri))
-
-    if db.CohortSignup.objects.filter(cohort=cohort_db, user_uri=user_uri, leave_date__isnull=True).exists():
-        return None
-
-    signup_db = db.CohortSignup(
-        cohort=cohort_db,
-        user_uri=user_uri,
-        role=role
-    )
-    signup_db.save()
-
-    if notify_organizers:
-        cohort = get_cohort(cohort_uri)
-        course = get_course(cohort['course_uri'])
-        organizers = User.objects.filter(username__in=cohort['organizers'])
-        context = {
-            'course': course,
-            'new_user': username,
-            'domain': settings.domain,
-        }
-        subject_template = 'courses/emails/course_join_subject.txt'
-        body_template = 'courses/emails/course_join.txt'
-        #notification_model.send_notifications_i18n(
-        #    organizers, subject_template, body_template, context,
-        #    notification_category='course-signup.course-{0}'.format(course['id'])
-        #)
-    
-    signup = {
-        "cohort_uri": cohort_uri,
-        "user_uri": user_uri,
-        "role": role
-    }
-    return signup
-
-
-def remove_user_from_cohort(cohort_uri, user_uri):
-    cohort_db = _get_cohort_db(cohort_uri)
-    try:
-        user_signup_db = cohort_db.signup_set.get(
-            user_uri=user_uri, leave_date__isnull=True
-        )
-    except:
-        return False, _("No such user in cohort")
-
-    organizer_count = cohort_db.signup_set.filter(
-        role=db.CohortSignup.ORGANIZER,
-        leave_date__isnull=True
-    ).count() == 1
-
-    if user_signup_db.role == db.CohortSignup.ORGANIZER and organizer_count == 1:
-        return False, _("Cannot remove last organizer")
-
-    user_signup_db.leave_date = datetime.datetime.utcnow()
-    user_signup_db.save()
-    return True, None
-
-
-def send_course_announcement(course_uri, announcement_text):
-    course = get_course(course_uri)
-    cohort = get_course_cohort(course_uri)
-    users = User.objects.filter(username__in=cohort['users'].keys())
-    #notification_model.send_notifications_i18n(
-    #    users,
-    #    'courses/emails/course_announcement_subject.txt',
-    #    'courses/emails/course_announcement.txt',
-    #    { 
-    #        'course': course,
-    #        'announcement_text': announcement_text,
-    #        'domain': settings.domain
-    #    },
-    #    notification_category='course-announcement.course-{0}'.format(course['id'])
-    #)
+    return course_db.creator_uri == user_uri
diff --git a/courses/templates/courses/course_announcement.html b/courses/templates/courses/course_announcement.html
deleted file mode 100755
index 015767f82..000000000
--- a/courses/templates/courses/course_announcement.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends "courses/course_base.html" %}
-
-{% load i18n %}
-{% load learn_tags %}
-{% load embed %}
-
-{% block tab-pane-content %}
-
-  <span>
-    <p class="alert">{% blocktrans %}Users can opt-out of course announcements and not all users will receive this message. Consider adding the relevant information to the course as content or on the about page{% endblocktrans %}</p>
-  </span>
-  <p>
-    <form action="{% url courses_announcement course_id=course.id %}" method="POST">
-      {% csrf_token %}
-      <p><strong>{% trans 'Subject: ' %}</strong>{% blocktrans with hashtag=course.hashtag %}P2PU Course Announcement #{{ hashtag }}{% endblocktrans %}</p>
-      <label for="id_announcement_text"><strong>{% trans 'Announcement text:' %}</strong></label>
-      <p class="row-fluid"><textarea class="span12" id="id_announcement_test" rows="10" name="announcement_text"/></textarea></p>
-      <button type="submit">{% trans "Send" %}</button>
-    </form>
-  </p>
-{% endblock %}
diff --git a/courses/templates/courses/course_badges.html b/courses/templates/courses/course_badges.html
deleted file mode 100755
index a1df7c7d5..000000000
--- a/courses/templates/courses/course_badges.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% extends "courses/course_base.html" %}
-
-{% load i18n %}
-{% load learn_tags %}
-{% load embed %}
-{% load settings_tags %}
-
-{% block tab-pane-content %}
-    <h2>{% trans 'How to Add a Badge to Your P2PU Course' %}</h2>
-    <div class="badges-content-wrapper">
-        <div class="span3">
-            <h2>{% trans 'Create a Badge' %}</h2>
-            <p>{% blocktrans %}
-                Head on over to
-                <a href="http://badges.p2pu.org" target="_blank">
-                    badges.p2pu.org</a>
-                to create your snappy Badge.
-                {% endblocktrans %}
-            </p>
-            <a class="btn btn-olive" href="http://badges.p2pu.org/badge/create/" target="_blank">
-                {% trans 'Create a Badge' %}
-            </a>
-        </div>
-        <div class="span3">
-            <h2>{% trans 'Insert the URL' %}</h2>
-            <p>{% blocktrans %}
-                Grab the unique URL for your Badge from
-                <a href="http://badges.p2pu.org" target="_blank">
-                    badges.p2pu.org</a>
-                and insert it here.'
-                {% endblocktrans %}
-            </p>
-            <form action="" method="POST">
-                {% csrf_token %}
-            <p>
-                <label for="id_url">{% trans "Badge URL:"%} <a class="form-tip" href="#" rel="tooltip" data-original-title="{% trans "Paste URL from Badge."%}">?</a></label>
-                    {{form.url.errors}}
-                <input type="text" name="url" id="id_url" placeholder="{% trans "Paste URL of the Badge that can be won." %}" value="{{form.url.value|default_if_none:""}}"/>
-                <input type="submit" class="btn btn-olive" value="{% trans 'Add Badge' %}" />
-            </p>
-            </form>
-        </div>
-        <div class="span3">
-            <h2>{% trans 'Manage Your Badge' %}</h2>
-            <p> {% blocktrans %}
-                Navigate over to "Content" and select
-                "Organize and add content". You can move Badges
-                up or down in the order you'd like
-                {% endblocktrans %}
-            </p>
-            <div class="align-center">
-                <img src="{{ STATIC_URL }}images/edit_badges.png" alt="{% trans 'How to manage your Badge' %}"/>
-            </div>
-        </div>
-    </div>
-
-
-{% endblock %}
diff --git a/courses/templates/courses/course_discussion.html b/courses/templates/courses/course_discussion.html
deleted file mode 100755
index c2d7609e3..000000000
--- a/courses/templates/courses/course_discussion.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% extends "courses/course_base.html" %}
-
-{% load i18n %}
-{% load learn_tags %}
-{% load embed %}
-{% load settings_tags %}
-
-{% block tab-pane-content %}
-  <p>{% blocktrans %}This page is for general discussion of the course. Feel free to post questions, comments, ideas.{% endblocktrans %}</p>
-   <br/>
-   <div id="disqus_thread"></div>
-   <script type="text/javascript">
-     var disqus_shortname = '{% settings_value "DISQUS_SHORTNAME" %}';
-     {% if debug %}var disqus_developer = 1;{% endif %}
-     var disqus_identifier = "{{course.id}}";
-     /* * * DON'T EDIT BELOW THIS LINE * * */
-     (function() {
-       var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-       dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
-       (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-     })();
-   </script>
-   <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-   <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
-   <script type="text/javascript">
-      var disqus_config = function() {
-        this.page.remote_auth_s3 = "{{ disqus_sso }}";
-        this.page.api_key = "{{ disqus_public_key }}";
-      };
-      this.sso = {
-        name: "P2PU",
-        button: "https://courses.p2pu.org/static/images/disqus-sso-login-button.png",
-        icon: "https://courses.p2pu.org/static/images/favicon.ico",
-        url: "https://courses.p2pu.org/login/",
-        logout: "https://courses.p2pu.org/logout/",
-        width: "800",
-        height: "400"
-      };
-   </script>
-{% endblock %}
diff --git a/courses/templates/courses/course_people.html b/courses/templates/courses/course_people.html
deleted file mode 100755
index 86cc4fd57..000000000
--- a/courses/templates/courses/course_people.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% extends "courses/course_base.html" %}
-
-{% load i18n %}
-{% load learn_tags %}
-{% load embed %}
-
-{% block tab-pane-content %}
-  <div id="learner-list" class="user-list">
-    <h3>{% trans "Learners" %}</h3>
-    <ul class="thumbnails">
-      {% for user in cohort.users.values %}
-        {% if user.role == "LEARNER" %}
-          {% include "courses/course_user_snip.html" %}
-        {% endif %}
-      {% endfor %}
-    </ul>
-  </div>
-  <div id="learner-list" class="user-list">
-    <h3>{% trans "Organizers" %}</h3>
-    <ul class="thumbnails">
-    {% for user in cohort.users.values %}
-      {% if user.role == "ORGANIZER" %}
-        {% include "courses/course_user_snip.html" %}
-      {% endif %}
-    {% endfor %}
-    </ul>
-  </div>
-  {% if can_edit %}
-    <p>
-      <form action="{% url courses_add_user course_id=course.id %}" method="POST">
-        {% csrf_token %}
-        <p><input type="text" name="username" autocomplete="off"/></p>
-        <button type="submit">{% trans "Add user" %}</button>
-      </form>
-    </p>
-    {% if trusted_user %}
-      <a href="{% url courses_export_emails course_id=course.id %}" target="_blank" class="btn">{% trans 'Export emails' %}</a>
-    {% endif %}
-  {% endif %}
-{% endblock %}
diff --git a/courses/templates/courses/course_user_snip.html b/courses/templates/courses/course_user_snip.html
deleted file mode 100755
index f6f07000a..000000000
--- a/courses/templates/courses/course_user_snip.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-{% load i18n %}
-
-<li class="user-tile">
-  <div><strong>{{user.username}}</strong></div>
-  <a href="{% url users_profile_view username=user.username %}">
-    <img src="{{ user.profile_image_url }}" alt="{{user.username}}">
-  </a>
-
-  <div>
-  {% if can_edit %}
-    <form action="{% url courses_leave course_id=course.id username=user.username %}" method="POST">
-      {% csrf_token %}
-      <button class="btn btn-mini btn-danger" type="submit">{% trans "Remove user" %}</button>
-    </form>
-    {% if user.role == "LEARNER" %}
-      <form action="{% url courses_add_organizer course_id=course.id username=user.username %}" method="POST">
-        {% csrf_token %}
-        <button class="btn btn-mini" type="submit">{% trans "Make organizer" %}</button>
-      </form>
-    {% endif %}
-  {% endif %}
-  </div>
-</li>
diff --git a/courses/templates/courses/emails/course_announcement.txt b/courses/templates/courses/emails/course_announcement.txt
deleted file mode 100755
index 5278aad12..000000000
--- a/courses/templates/courses/emails/course_announcement.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{% load i18n %}
-
-{{ announcement_text|safe }}
-
-{{ _('Manage how often you get these delightful messages at:') }} http://{{domain}}/profile/edit/notifications/
diff --git a/courses/templates/courses/emails/course_announcement_subject.txt b/courses/templates/courses/emails/course_announcement_subject.txt
deleted file mode 100755
index 437ee1890..000000000
--- a/courses/templates/courses/emails/course_announcement_subject.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{% load i18n %}
-
-{% blocktrans with hashtag=course.hashtag %}P2PU Course Announcement #{{ hashtag }}{% endblocktrans %}
diff --git a/courses/templates/courses/emails/course_join.txt b/courses/templates/courses/emails/course_join.txt
deleted file mode 100755
index 1d290a113..000000000
--- a/courses/templates/courses/emails/course_join.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-{% load i18n %}
-
-
-{% trans 'Howdy course organizer!' %}
-
-{% blocktrans with course_title=course.title%}{{new_user}} signed up for {{course_title}}!{% endblocktrans %}
-
-{% blocktrans %}Regards
-The P2PU team{% endblocktrans %}
-{% trans 'Manage how often you get these delightful messages at:' %} http://{{domain}}/profile/edit/notifications/
diff --git a/courses/templates/courses/emails/course_join_subject.txt b/courses/templates/courses/emails/course_join_subject.txt
deleted file mode 100755
index bc3b7da3a..000000000
--- a/courses/templates/courses/emails/course_join_subject.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{% load i18n %}
-
-{% blocktrans with course_title=course.title course_hash=course.hashtag username=new_user %}[{{course_hash}}] {{username}} has signed up for {{course_title}}!{% endblocktrans %}
diff --git a/courses/urls.py b/courses/urls.py
index a66dfd22a..4910c5bb4 100755
--- a/courses/urls.py
+++ b/courses/urls.py
@@ -14,10 +14,6 @@
         views.course_slug_redirect,
         name='courses_slug_redirect'),
 
-    re_path(r'^(?P<course_id>[\d]+)/learn_api_data/$',
-        views.course_learn_api_data,
-        name='courses_learn_api_data'),
-
     re_path(r'^(?P<course_id>[\d]+)/admin_content/$',
         views.course_admin_content,
         name='courses_admin_content'),
diff --git a/courses/utils.py b/courses/utils.py
deleted file mode 100755
index ad36ed76c..000000000
--- a/courses/utils.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import courses.models as course_model
-import content.models as content_model
-from content import utils as content_utils
-
-def import_project(project, hashtag):
-    course = {}
-    course['title'] = project.name
-    course['hashtag'] = hashtag
-    course['description'] = project.short_description
-    course['language'] = project.language
-    user_uri = "/uri/user/{0}".format(project.participations.filter(organizing=True).order_by('joined_on')[0].user.username)
-    course['organizer_uri'] = user_uri
-
-    course = course_model.create_course(**course)
-
-    # update about page
-    about = {
-        "uri": course['about_uri'],
-        "title": "About",
-        "content": project.long_description,
-        "author_uri": user_uri,
-    }
-    content_model.update_content(**about)
-
-    # add other pages to course
-    for page in project.pages.filter(deleted=False, listed=True).order_by('index'):
-        content = {
-            "title": page.title,
-            "content": content_utils.clean_user_content(page.content),
-            "author_uri": "/uri/user/{0}".format(page.author.username),
-        }
-        content = content_model.create_content(**content)
-        course_model.add_course_content(course['uri'], content['uri'])
-
-    return course
diff --git a/courses/views.py b/courses/views.py
index 0e9c8e165..9b97f11cb 100755
--- a/courses/views.py
+++ b/courses/views.py
@@ -24,7 +24,6 @@
 from courses.forms import CourseTermForm
 from courses.forms import CourseImageForm
 from courses.forms import CourseStatusForm
-from courses.forms import CohortSignupForm
 from courses.forms import CourseTagsForm
 from courses.forms import CourseEmbeddedUrlForm
 from courses.decorators import require_organizer
@@ -34,7 +33,6 @@
 from content import models as content_model
 from content.forms import ContentForm
 
-#from learn import models as learn_model
 from media import models as media_model
 
 
@@ -44,10 +42,7 @@
 def _get_course_or_404( course_uri ):
     try:
         course = course_model.get_course(course_uri)
-    #except course_model.ResourceDeletedException:
-    #    raise http.
-    except:
-        # TODO: this masks all exceptions that may happen in get_course!
+    except course_model.ResourceNotFoundException as e:
         raise http.Http404
     return course
 
@@ -63,33 +58,12 @@ def _populate_course_context( request, course_id, context ):
     if 'image_uri' in course:
         context['course']['image'] = media_model.get_image(course['image_uri'])
 
-    #NOTE if performance becomes a problem dont fetch cohort
-    cohort = course_model.get_course_cohort(course_uri)
-    context['cohort'] = cohort
     user_uri = u"/uri/user/{0}".format(request.user.username)
-    context['organizer'] = course_model.is_cohort_organizer(
-        user_uri, cohort['uri']
-    )
+    context['organizer'] = course_model.is_organizer(course_uri, user_uri)
     context['organizer'] |= request.user.is_superuser
     context['admin'] = request.user.is_superuser
     context['can_edit'] = context['organizer'] and not course['status'] == 'archived'
     context['trusted_user'] = request.user.has_perm('users.trusted_user')
-    if course_model.user_in_cohort(user_uri, cohort['uri']):
-        if not context['organizer']:
-            context['show_leave_course'] = True
-        context['learner'] = True
-    elif cohort['signup'] == "OPEN":
-        context['show_signup'] = True
-
-    #try:
-    #    course_lists = learn_model.get_lists_for_course(reverse(
-    #        'courses_slug_redirect',
-    #        kwargs={'course_id': course_id}
-    #    ))
-    #    f = lambda l: l['name'] not in ['drafts', 'listed', 'archived']
-    #    context['lists'] = filter(f, course_lists)
-    #except:
-    #    log.error("Could not get lists for course!")
 
     if 'based_on_uri' in course:
         course['based_on'] = course_model.get_course(course['based_on_uri'])
@@ -158,18 +132,6 @@ def show_course( request, course_id, slug=None ):
     return render(request, 'courses/course.html', context)
 
 
-def course_learn_api_data( request, course_id ):
-    # TODO?
-    """ return data required by the learn API """
-    course_uri = course_model.course_id2uri(course_id)
-    try:
-        course_data = course_model.get_course_learn_api_data(course_uri)
-    except:
-        raise http.Http404
-
-    return http.HttpResponse(json.dumps(course_data), mimetype="application/json")
-
-
 @login_required
 @require_organizer
 def course_admin_content( request, course_id ):
@@ -201,14 +163,6 @@ def course_settings( request, course_id ):
     context['status_form'] = CourseStatusForm(course)
     tags = ", ".join(course_model.get_course_tags(course_uri))
     context['tags_form'] = CourseTagsForm({'tags': tags})
-    if context['cohort']['term'] == 'FIXED':
-        context['term_form'] = CourseTermForm(context['cohort'])
-    else:
-        context['term_form'] = CourseTermForm()
-    context['signup_form'] = CohortSignupForm(
-        initial={'signup': context['cohort']['signup']}
-    )
-
     context['settings_active'] = True
 
     return render(
@@ -274,28 +228,6 @@ def course_content_image_upload( request, course_id ):
     )
 
 
-@login_required
-@require_http_methods(['POST'])
-@require_organizer
-def course_add_organizer( request, course_id, username ):
-    raise Exception('not implemented')
-    cohort_uri = course_model.get_course_cohort_uri(course_id)
-    user_uri = u"/uri/user/{0}".format(request.user.username)
-    is_organizer = course_model.is_cohort_organizer(
-        user_uri, cohort_uri
-    )
-    if not is_organizer and not request.user.is_superuser:
-        messages.error( request, _("Only other organizers can add a new organizer") )
-        return course_slug_redirect( request, course_id)
-    new_organizer_uri = u"/uri/user/{0}".format(username)
-    course_model.remove_user_from_cohort(cohort_uri, new_organizer_uri)
-    course_model.add_user_to_cohort(cohort_uri, new_organizer_uri, "ORGANIZER")
-
-    #TODO
-    redirect_url = reverse('courses_people', kwargs={'course_id': course_id})
-    return http.HttpResponseRedirect(redirect_url)
-
-
 @login_required
 @require_http_methods(['POST'])
 @require_organizer

From 6835b02f7de830243bd682cdd042740167c3fa9c Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 15 Jan 2026 14:07:15 +0200
Subject: [PATCH 26/63] Update tests for courses

---
 courses/tests.py | 75 +++++++++++-------------------------------------
 1 file changed, 16 insertions(+), 59 deletions(-)

diff --git a/courses/tests.py b/courses/tests.py
index 48daf0fcb..d4d37b314 100755
--- a/courses/tests.py
+++ b/courses/tests.py
@@ -1,12 +1,12 @@
 from django.test import Client
+from django.test import TestCase
 from django.contrib.auth.models import User
-from users.models import create_profile
-
-from test_utils import TestCase
 
+from custom_registration.models import create_user
 from courses import models as course_model
 from content import models as content_model
-from mock import patch
+
+from unittest.mock import patch
 
 
 class CourseTests(TestCase):
@@ -27,22 +27,19 @@ def setUp(self):
         self.client = Client()
         self.locale = 'en'
 
-        django_user = User(
-            username=self.test_username,
-            email=self.test_email,
+        self.user = create_user(
+            self.test_email,
+            self.test_username,
+            'lastname',
+            self.test_password
         )
-        self.user = create_profile(django_user)
-        self.user.set_password(self.test_password)
-        self.user.save()
         
-        django_user2 = User(
-            username=self.test_username2,
-            email=self.test_email2,
+        self.user2 = create_user(
+            self.test_email2,
+            self.test_username2,
+            'lastname2',
+            self.test_password2
         )
-        self.user2 = create_profile(django_user2)
-        self.user2.set_password(self.test_password2)
-        self.user2.save()
-
 
         self.course = course_model.create_course(
             **{
@@ -78,15 +75,8 @@ def test_course_creation(self):
         self.assertTrue(not about == None)
         self.assertEqual(about['title'], "About")
 
-        # test that a cohort was created
-        cohort = course_model.get_course_cohort(course['uri'])
-        self.assertTrue(not cohort == None)
-
-        self.assertTrue(
-            course_model.user_in_cohort('/uri/user/testuser', cohort['uri'])
-        )
         self.assertTrue(
-            course_model.is_cohort_organizer('/uri/user/testuser', cohort['uri'])
+            course_model.is_organizer(course['uri'], '/uri/user/testuser')
         )
 
     def test_course_get(self):
@@ -104,37 +94,6 @@ def test_course_get(self):
         self.assertTrue('about_uri' in course)
         self.assertTrue('content' in course)
 
-    def test_add_content(self):
-        pass
-
-    def test_add_user(self):
-        cohort = course_model.get_course_cohort(self.course['uri'])
-        course_model.add_user_to_cohort(
-            cohort['uri'], '/uri/user/bob', 'ORGANIZER')
-        cohort2 = course_model.get_course_cohort(self.course['uri'])
-        self.assertEqual(len(cohort['users']), len(cohort2['users'])-1)
-
-    def test_remove_user(self):
-        pass
-
-    def test_make_organizer(self):
-        pass
-
-    def test_send_course_announcement(self):
-        course = course_model.create_course(
-            **{
-                "title": "A test course",
-                "hashtag": "ATC-1",
-                "description": "This course is all about ABC",
-                "language": "en",
-                "organizer_uri": '/uri/user/testuser/'
-            }
-        )
-        with patch('notifications.models.send_notifications_i18n') as send_notification:
-            course_model.send_course_announcement(course['uri'], 'Notification text')
-            self.assertTrue(send_notification.called)
-            #TODO test parameters sent to send_notification
-
 
     def test_clone_course(self):
         clone = course_model.clone_course(self.course['uri'], '/uri/user/bob/')
@@ -166,9 +125,7 @@ def test_delete_spam_course(self):
             course_model.get_course(course['uri'])
 
     def test_get_courses(self):
-        user = User(username='testuser99', email='99@example.com')
-        user = create_profile(user)
-        user.save()
+        user = create_user('99@example.com', 'testuser99', 'last', 'password')
 
         course = course_model.create_course(
             **{

From 3236e10de65fbf95f12a145016747bf4819fd4c1 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 15 Jan 2026 14:11:36 +0200
Subject: [PATCH 27/63] Remove removed imports

---
 courses/views.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/courses/views.py b/courses/views.py
index 9b97f11cb..71f12b48c 100755
--- a/courses/views.py
+++ b/courses/views.py
@@ -27,8 +27,6 @@
 from courses.forms import CourseTagsForm
 from courses.forms import CourseEmbeddedUrlForm
 from courses.decorators import require_organizer
-from courses.badges_oembed import add_content_from_response
-from courses.badges_oembed import BadgeNotFoundException
 
 from content import models as content_model
 from content.forms import ContentForm

From 01fc5c8584600441e4abbebf2a52a628c8a08dd7 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 15 Jan 2026 14:21:20 +0200
Subject: [PATCH 28/63] Remove next_url functionality

---
 courses/views.py | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/courses/views.py b/courses/views.py
index 71f12b48c..1aec36de5 100755
--- a/courses/views.py
+++ b/courses/views.py
@@ -318,19 +318,15 @@ def create_content( request, course_id ):
             content = content_model.create_content(**content_data)
             course_model.add_course_content(course['uri'], content['uri'])
 
-            redirect_url = request.POST.get('next_url', None)
-            if not redirect_url:
-                redirect_url = reverse('courses_show',
-                    kwargs={'course_id': course['id'], 'slug': course['slug']}
-                )
+            redirect_url = reverse('courses_show',
+                kwargs={'course_id': course['id'], 'slug': course['slug']}
+            )
             return http.HttpResponseRedirect(redirect_url)
     else:
         form = ContentForm()
 
     context = { 'form': form }
     context = _populate_course_context(request, course_id, context)
-    if request.GET.get('next_url', None):
-        context['next_url'] = request.GET.get('next_url', None)
 
     return render(
         request,
@@ -360,11 +356,9 @@ def edit_content( request, course_id, content_id ):
                 content_data['content'], user_uri
             )
             
-            redirect_url = request.POST.get('next_url', None)
-            if not redirect_url:
-                redirect_url = reverse('courses_content_show',
-                    kwargs={'course_id': course_id, 'content_id': content_id}
-                )
+            redirect_url = reverse('courses_content_show',
+                kwargs={'course_id': course_id, 'content_id': content_id}
+            )
             return http.HttpResponseRedirect(redirect_url)
     else:
         form = ContentForm(initial=content)
@@ -374,8 +368,6 @@ def edit_content( request, course_id, content_id ):
         'content': content,
     }
     context = _populate_course_context(request, course_id, context)
-    if request.GET.get('next_url', None):
-        context['next_url'] = request.GET.get('next_url', None)
     return render(
         request,
         'courses/edit_content.html', 

From 2e0c1753ab7be063fcd6e40d13af58314c5ff686 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 15 Jan 2026 14:25:11 +0200
Subject: [PATCH 29/63] Fix tests for content

---
 content/tests.py | 29 ++++++++++++-----------------
 courses/tests.py |  1 -
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/content/tests.py b/content/tests.py
index a026597e1..fe936684d 100755
--- a/content/tests.py
+++ b/content/tests.py
@@ -1,11 +1,8 @@
 from django.test import Client
-from django.contrib.auth.models import User
-from users.models import create_profile
-
-from test_utils import TestCase
+from django.test import TestCase
 
+from custom_registration.models import create_user
 from content import models as content_model
-from mock import patch
 
 
 class CourseTests(TestCase):
@@ -22,21 +19,19 @@ def setUp(self):
         self.client = Client()
         self.locale = 'en'
 
-        django_user = User(
-            username=self.test_username,
-            email=self.test_email,
+        self.user = create_user(
+            self.test_email,
+            self.test_username,
+            'lastname',
+            self.test_password
         )
-        self.user = create_profile(django_user)
-        self.user.set_password(self.test_password)
-        self.user.save()
         
-        django_user2 = User(
-            username=self.test_username2,
-            email=self.test_email2,
+        self.user2 = create_user(
+            self.test_email2,
+            self.test_username2,
+            'lastname2',
+            self.test_password2
         )
-        self.user2 = create_profile(django_user2)
-        self.user2.set_password(self.test_password2)
-        self.user2.save()
 
 
     def test_content_creation(self):
diff --git a/courses/tests.py b/courses/tests.py
index d4d37b314..579e08896 100755
--- a/courses/tests.py
+++ b/courses/tests.py
@@ -1,6 +1,5 @@
 from django.test import Client
 from django.test import TestCase
-from django.contrib.auth.models import User
 
 from custom_registration.models import create_user
 from courses import models as course_model

From 7f469cbe32962d74de087df54dfaa88f13420307 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 16 Jan 2026 10:41:08 +0200
Subject: [PATCH 30/63] Add link to content on facilitator dashboard

---
 courses/db.py                               |  3 +++
 courses/views.py                            |  3 +--
 studygroups/views/facilitate.py             | 11 +++++++++++
 studygroups/views/learner.py                |  9 +++++----
 templates/studygroups/view_study_group.html |  1 +
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/courses/db.py b/courses/db.py
index 786cab6ab..060bd8ba1 100755
--- a/courses/db.py
+++ b/courses/db.py
@@ -13,6 +13,9 @@ class Course(models.Model):
     creator_uri = models.CharField(max_length=256)
     based_on = models.ForeignKey('courses.Course', models.SET_NULL, related_name='derived_courses', blank=True, null=True)
 
+    def __str__(self):
+        return self.title
+
 
 class CourseContent(models.Model):
     course = models.ForeignKey(Course, models.CASCADE, related_name='content')
diff --git a/courses/views.py b/courses/views.py
index 1aec36de5..440f07874 100755
--- a/courses/views.py
+++ b/courses/views.py
@@ -118,8 +118,7 @@ def show_course( request, course_id, slug=None ):
     if slug != course['slug']:
         return course_slug_redirect( request, course_id)
 
-    context = { }
-    context = _populate_course_context(request, course_id, context)
+    context = _populate_course_context(request, course_id, {})
     context['about_active'] = True
 
     if context['organizer']:
diff --git a/studygroups/views/facilitate.py b/studygroups/views/facilitate.py
index 29eb10ae3..6f94a56a6 100644
--- a/studygroups/views/facilitate.py
+++ b/studygroups/views/facilitate.py
@@ -91,6 +91,17 @@ def view_study_group(request, study_group_id):
         context['expand_meeting'] = meeting_number
         context['meeting_rating'] = rating
 
+    if study_group.course_content:
+        import courses.models
+        course_uri = courses.models.course_id2uri(study_group.course_content.pk)
+        sections = courses.models.get_course_content(course_uri)
+        if len(sections) > 1:
+            context['content_link'] = reverse(
+                'studygroups_content_view',
+                args=(study_group.pk, sections[1]['id'],) #TODO skipping nr 0
+            )
+
+
     return render(request, 'studygroups/view_study_group.html', context)
 
 
diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index 6b1361f03..afafdabf1 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -299,10 +299,11 @@ def get(self, request, *args, **kwargs):
             import courses.models
             course_uri = courses.models.course_id2uri(study_group.course_content.pk)
             sections = courses.models.get_course_content(course_uri)
-            context['content_link'] = reverse(
-                'studygroups_content_view',
-                args=(study_group.pk, sections[1]['id'],) #TODO skipping nr 0
-            )
+            if len(sections) > 1:
+                context['content_link'] = reverse(
+                    'studygroups_content_view',
+                    args=(study_group.pk, sections[1]['id'],) #TODO skipping nr 0
+                )
 
 
         meetings = study_group.meeting_set.active().order_by('meeting_date', 'meeting_time')
diff --git a/templates/studygroups/view_study_group.html b/templates/studygroups/view_study_group.html
index a6759c20e..bf190b810 100644
--- a/templates/studygroups/view_study_group.html
+++ b/templates/studygroups/view_study_group.html
@@ -59,6 +59,7 @@ <h1>{% if study_group.draft %}[DRAFT] {% endif %}{{study_group.name}}</h1>
         <div class="col-sm-9 offset-sm-3">
           <a class="p2pu-btn btn btn-primary" href="{% url 'studygroups_edit_study_group' study_group.id %}">{% trans "Edit" %}</a>
           <a class="p2pu-btn btn btn-primary" href="{{ signup_url }}">{% trans "View" %}</a>
+          {% if content_link %}<a class="p2pu-btn btn btn-primary" href="{{ content_link }}">{% trans "View content" %}</a>{% endif %}
           <a class="p2pu-btn btn btn-primary" href="{% url 'studygroups_meeting_create' study_group.id %}">{% trans "Add meeting" %}</a>
           {% if study_group.signup_open %}
           <a class="p2pu-btn btn btn-primary" href="{% url 'studygroups_studygroup_toggle_signup' study_group.id %}">{% trans "Close signup" %}</a>

From 18da9d5280a8063f490522fc8245128ffe50ff90 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 16 Jan 2026 11:01:04 +0200
Subject: [PATCH 31/63] Fix file mode and small updates

---
 content/__init__.py                                       | 0
 content/db.py                                             | 0
 content/forms.py                                          | 0
 content/models.py                                         | 0
 content/templatetags/__init__.py                          | 0
 content/templatetags/content_tags.py                      | 0
 content/tests.py                                          | 1 +
 content/utils.py                                          | 7 +------
 courses/__init__.py                                       | 0
 courses/db.py                                             | 0
 courses/decorators.py                                     | 0
 courses/forms.py                                          | 0
 courses/models.py                                         | 0
 courses/static/css/course.css                             | 6 ++++++
 courses/templates/courses/content.html                    | 0
 courses/templates/courses/content_form_buttons_snip.html  | 0
 courses/templates/courses/content_form_snip.html          | 0
 courses/templates/courses/course.html                     | 0
 courses/templates/courses/course_admin_content.html       | 0
 courses/templates/courses/course_base.html                | 0
 courses/templates/courses/course_comment_snip.html        | 0
 courses/templates/courses/course_delete_confirmation.html | 0
 courses/templates/courses/course_settings.html            | 0
 courses/templates/courses/course_sidebar.html             | 0
 courses/templates/courses/create_content.html             | 0
 courses/templates/courses/create_course.html              | 0
 courses/templates/courses/edit_content.html               | 0
 courses/templates/courses/preview_content_snip.html       | 0
 courses/tests.py                                          | 0
 courses/urls.py                                           | 0
 courses/views.py                                          | 0
 media/__init__.py                                         | 0
 media/admin.py                                            | 6 ++++++
 media/db.py                                               | 0
 media/models.py                                           | 0
 35 files changed, 14 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 content/__init__.py
 mode change 100755 => 100644 content/db.py
 mode change 100755 => 100644 content/forms.py
 mode change 100755 => 100644 content/models.py
 mode change 100755 => 100644 content/templatetags/__init__.py
 mode change 100755 => 100644 content/templatetags/content_tags.py
 mode change 100755 => 100644 content/tests.py
 mode change 100755 => 100644 content/utils.py
 mode change 100755 => 100644 courses/__init__.py
 mode change 100755 => 100644 courses/db.py
 mode change 100755 => 100644 courses/decorators.py
 mode change 100755 => 100644 courses/forms.py
 mode change 100755 => 100644 courses/models.py
 create mode 100644 courses/static/css/course.css
 mode change 100755 => 100644 courses/templates/courses/content.html
 mode change 100755 => 100644 courses/templates/courses/content_form_buttons_snip.html
 mode change 100755 => 100644 courses/templates/courses/content_form_snip.html
 mode change 100755 => 100644 courses/templates/courses/course.html
 mode change 100755 => 100644 courses/templates/courses/course_admin_content.html
 mode change 100755 => 100644 courses/templates/courses/course_base.html
 mode change 100755 => 100644 courses/templates/courses/course_comment_snip.html
 mode change 100755 => 100644 courses/templates/courses/course_delete_confirmation.html
 mode change 100755 => 100644 courses/templates/courses/course_settings.html
 mode change 100755 => 100644 courses/templates/courses/course_sidebar.html
 mode change 100755 => 100644 courses/templates/courses/create_content.html
 mode change 100755 => 100644 courses/templates/courses/create_course.html
 mode change 100755 => 100644 courses/templates/courses/edit_content.html
 mode change 100755 => 100644 courses/templates/courses/preview_content_snip.html
 mode change 100755 => 100644 courses/tests.py
 mode change 100755 => 100644 courses/urls.py
 mode change 100755 => 100644 courses/views.py
 mode change 100755 => 100644 media/__init__.py
 create mode 100644 media/admin.py
 mode change 100755 => 100644 media/db.py
 mode change 100755 => 100644 media/models.py

diff --git a/content/__init__.py b/content/__init__.py
old mode 100755
new mode 100644
diff --git a/content/db.py b/content/db.py
old mode 100755
new mode 100644
diff --git a/content/forms.py b/content/forms.py
old mode 100755
new mode 100644
diff --git a/content/models.py b/content/models.py
old mode 100755
new mode 100644
diff --git a/content/templatetags/__init__.py b/content/templatetags/__init__.py
old mode 100755
new mode 100644
diff --git a/content/templatetags/content_tags.py b/content/templatetags/content_tags.py
old mode 100755
new mode 100644
diff --git a/content/tests.py b/content/tests.py
old mode 100755
new mode 100644
index fe936684d..0db9122d4
--- a/content/tests.py
+++ b/content/tests.py
@@ -45,6 +45,7 @@ def test_content_history(self):
         content_model.update_content(
             content['uri'], 'New title', 'New content', '/uri/users/testuser'
         )
+        # TODO this doesn't test anything?
 
 
     def test_clone_content(self):
diff --git a/content/utils.py b/content/utils.py
old mode 100755
new mode 100644
index 3dbdb0d73..3263ff82d
--- a/content/utils.py
+++ b/content/utils.py
@@ -7,10 +7,5 @@ def clean_user_content(content):
         'strip': True
     }
     content = bleach.clean(content, **config)
-    #TODO
-    return content
-
-def clean_trusted_user_content(content):
-    bleach.clean(content, strip=True)
-    #TODO
+    #TODO ?? no idea why?
     return content
diff --git a/courses/__init__.py b/courses/__init__.py
old mode 100755
new mode 100644
diff --git a/courses/db.py b/courses/db.py
old mode 100755
new mode 100644
diff --git a/courses/decorators.py b/courses/decorators.py
old mode 100755
new mode 100644
diff --git a/courses/forms.py b/courses/forms.py
old mode 100755
new mode 100644
diff --git a/courses/models.py b/courses/models.py
old mode 100755
new mode 100644
diff --git a/courses/static/css/course.css b/courses/static/css/course.css
new file mode 100644
index 000000000..043213ff1
--- /dev/null
+++ b/courses/static/css/course.css
@@ -0,0 +1,6 @@
+.row {
+    display: flex;
+}
+.main {a
+    flex: 1;
+}
diff --git a/courses/templates/courses/content.html b/courses/templates/courses/content.html
old mode 100755
new mode 100644
diff --git a/courses/templates/courses/content_form_buttons_snip.html b/courses/templates/courses/content_form_buttons_snip.html
old mode 100755
new mode 100644
diff --git a/courses/templates/courses/content_form_snip.html b/courses/templates/courses/content_form_snip.html
old mode 100755
new mode 100644
diff --git a/courses/templates/courses/course.html b/courses/templates/courses/course.html
old mode 100755
new mode 100644
diff --git a/courses/templates/courses/course_admin_content.html b/courses/templates/courses/course_admin_content.html
old mode 100755
new mode 100644
diff --git a/courses/templates/courses/course_base.html b/courses/templates/courses/course_base.html
old mode 100755
new mode 100644
diff --git a/courses/templates/courses/course_comment_snip.html b/courses/templates/courses/course_comment_snip.html
old mode 100755
new mode 100644
diff --git a/courses/templates/courses/course_delete_confirmation.html b/courses/templates/courses/course_delete_confirmation.html
old mode 100755
new mode 100644
diff --git a/courses/templates/courses/course_settings.html b/courses/templates/courses/course_settings.html
old mode 100755
new mode 100644
diff --git a/courses/templates/courses/course_sidebar.html b/courses/templates/courses/course_sidebar.html
old mode 100755
new mode 100644
diff --git a/courses/templates/courses/create_content.html b/courses/templates/courses/create_content.html
old mode 100755
new mode 100644
diff --git a/courses/templates/courses/create_course.html b/courses/templates/courses/create_course.html
old mode 100755
new mode 100644
diff --git a/courses/templates/courses/edit_content.html b/courses/templates/courses/edit_content.html
old mode 100755
new mode 100644
diff --git a/courses/templates/courses/preview_content_snip.html b/courses/templates/courses/preview_content_snip.html
old mode 100755
new mode 100644
diff --git a/courses/tests.py b/courses/tests.py
old mode 100755
new mode 100644
diff --git a/courses/urls.py b/courses/urls.py
old mode 100755
new mode 100644
diff --git a/courses/views.py b/courses/views.py
old mode 100755
new mode 100644
diff --git a/media/__init__.py b/media/__init__.py
old mode 100755
new mode 100644
diff --git a/media/admin.py b/media/admin.py
new file mode 100644
index 000000000..9b4d321ce
--- /dev/null
+++ b/media/admin.py
@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+from .db import Image
+
+admin.site.register(Image)
+
diff --git a/media/db.py b/media/db.py
old mode 100755
new mode 100644
diff --git a/media/models.py b/media/models.py
old mode 100755
new mode 100644

From 8995843a0ee92865022ecefc3c61f632036201de Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 16 Jan 2026 11:07:31 +0200
Subject: [PATCH 32/63] Remove unused code

---
 courses/forms.py | 9 ---------
 courses/views.py | 2 --
 2 files changed, 11 deletions(-)

diff --git a/courses/forms.py b/courses/forms.py
index 8b72232dc..e6d622275 100644
--- a/courses/forms.py
+++ b/courses/forms.py
@@ -32,19 +32,10 @@ class CourseImageForm(forms.Form):
     image = forms.ImageField()
 
 
-class CourseTermForm(forms.Form):
-    start_date = forms.DateField()
-    end_date = forms.DateField()
-
-
 class CourseTagsForm(forms.Form):
     tags = forms.CharField(max_length=256)
 
 
-class CourseEmbeddedUrlForm(forms.Form):
-    url = forms.URLField(max_length=300)
-
-
 class CourseStatusForm(forms.Form):
     STATUS_CHOICES = [
         ('draft', _('Draft'), ),
diff --git a/courses/views.py b/courses/views.py
index 440f07874..e36533c09 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -21,11 +21,9 @@
 from courses import models as course_model
 from courses.forms import CourseCreationForm
 from courses.forms import CourseUpdateForm
-from courses.forms import CourseTermForm
 from courses.forms import CourseImageForm
 from courses.forms import CourseStatusForm
 from courses.forms import CourseTagsForm
-from courses.forms import CourseEmbeddedUrlForm
 from courses.decorators import require_organizer
 
 from content import models as content_model

From c4024818271dd61de61a6a4cc6219706683118e3 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 16 Jan 2026 11:09:58 +0200
Subject: [PATCH 33/63] Remove unused code

---
 courses/models.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/courses/models.py b/courses/models.py
index 2c67e9611..82c236048 100644
--- a/courses/models.py
+++ b/courses/models.py
@@ -111,28 +111,6 @@ def get_courses(title=None, hashtag=None, language=None, organizer_uri=None, dra
     return [ get_course(course_id2uri(course_db.id)) for course_db in results ]
 
 
-def get_user_courses(user_uri):
-    """ return courses organized or participated in by an user """
-    raise Exception('not implemented')
-    #signups = db.CohortSignup.objects.filter(user_uri=user_uri, leave_date__isnull=True, cohort__course__archived=False)
-    #courses = []
-    #for signup in signups:
-    #    try:
-    #        course = get_course(course_id2uri(signup.cohort.course.id))
-    #    except ResourceDeletedException:
-    #        continue
-    #    course_data = {
-    #        "id": course['id'],
-    #        "title": course['title'],
-    #        "user_role": signup.role,
-    #        "url": reverse("courses_show", kwargs={"course_id": course["id"], "slug": course["slug"]}),
-    #    }
-    #    if "image_uri" in course:
-    #        course_data["image_url"] = media_model.get_image(course['image_uri'])['url']
-    #    courses += [course_data]
-    #return courses
-
-
 def create_course(title, hashtag, description, language, organizer_uri, based_on_uri=None):
     course_db = db.Course(
         title=title,

From 105ce3e0b39ca12342902122259f52da12ca4f3d Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 16 Jan 2026 11:13:46 +0200
Subject: [PATCH 34/63] Remove unused template

---
 .../courses/course_comment_snip.html          | 41 -------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 courses/templates/courses/course_comment_snip.html

diff --git a/courses/templates/courses/course_comment_snip.html b/courses/templates/courses/course_comment_snip.html
deleted file mode 100644
index 52482d24e..000000000
--- a/courses/templates/courses/course_comment_snip.html
+++ /dev/null
@@ -1,41 +0,0 @@
-        <!--
-        {% for comment in comments %}
-          <div class="comment">
-            <a name="comment-{{comment.id}}"></a>
-            <p>{{comment.content}}</p>
-            {% if comment.replies|length > 0 %}
-              <a data-toggle="collapse" data-target="#comment-{{comment.id}}-replies">
-                {% blocktrans with reply_count=comment.replies|length %}{{reply_count}} replies{% endblocktrans %}
-              </a>
-              <div id="comment-{{comment.id}}-replies" class="collapse">
-                {% for reply in comment.replies %}
-                  <div class="reply">
-                    <a name="comment-{{reply.id}}"></a>
-                    <p>{{reply.content}}</p>
-                  </div>
-                {% endfor %}
-              </div>
-            {% endif %}
-            <a data-toggle="collapse" data-target="#comment-{{comment.id}}-reply"><i class="icon-comment"></i>{% trans 'Reply to comment' %}</a>
-            <div id="comment-{{comment.id}}-reply" class="collapse">
-              <form action="{% url courses_post_comment_reply course_id=course.id content_id=about.id comment_id=comment.id %}" method="POST">
-                {% csrf_token %}
-                <input type="hidden" name="next_url" value="{{course_url}}">
-                <p><textarea id="id_comment" name="comment" cols="40" rows="2"></textarea></p>
-                <input type="submit" value="{% trans "Post comment" %}"/>
-              </form>
-            </div>
-          </div>
-        {% endfor %}
-  
-        <div>
-          <h3>{% trans 'Post new comment' %}</h3>
-          <form action="{% url courses_post_content_comment course_id=course.id content_id=about.id %}" method="POST">
-            {% csrf_token %}
-            <input type="hidden" name="next_url" value="{{course_url}}">
-            <p><textarea id="id_comment" name="comment" cols="40" rows="2"></textarea></p>
-            <input type="submit" value="{% trans "Post comment" %}"/>
-          </form>
-        </div>
-        -->
-

From 9e594a159d74ccf4064a80e26ae1e7b7c367b8a2 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 16 Jan 2026 11:16:07 +0200
Subject: [PATCH 35/63] Remove removed functionality from course sidebar

---
 courses/templates/courses/course_sidebar.html | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/courses/templates/courses/course_sidebar.html b/courses/templates/courses/course_sidebar.html
index 2b034ad80..0ca81be9b 100644
--- a/courses/templates/courses/course_sidebar.html
+++ b/courses/templates/courses/course_sidebar.html
@@ -22,17 +22,6 @@
     <div>{% trans 'Based on '%}<a href="{% url 'courses_show' course_id=course.based_on.id slug=course.based_on.slug %}" itemprop="isBasedOnUrl" >{{course.based_on.title}}</a></div>
     {% endif %}
 
-    {% if lists %}
-      <div>
-        <h2>{% trans 'Featured in:' %}</h2>
-        <ul class="unstyled">
-          {% for list in lists %}
-            <li><a href="{{list.url}}">{{list.title}}</a></li>
-          {% endfor %}
-        </ul>
-      </div>
-    {% endif %}
-
     <div>
       <ul class="nav flex-column">
         <li class="nav-item {% if not content%}active{% endif %}">
@@ -66,19 +55,5 @@ <h2>{% trans 'Featured in:' %}</h2>
       </p>
     {% endif %}
 
-    <p>
-    {% comment %}
-      <form action="{% url 'report_abuse' %}" method="post">
-        {% csrf_token %}
-        <input id="id_url" name="url" type="hidden" value="{{request.get_full_path}}"/>
-        <button type="submit">Report abuse</button>
-      </form>
-      {% endcomment %}
-    </p>
-
-    <!--div id="course-description">
-      <h2>{% trans "Description" %}</h2>
-      <p>{{ course.description }}</p>
-    </div-->
 </div> <!-- /#sidebar -->
 

From 4d3fde5089dacad5c638eba5bd3ce6ecd7d83df7 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 16 Jan 2026 11:24:48 +0200
Subject: [PATCH 36/63] Update foreign key on learning circles to set content
 to null if a course is deleted!

---
 .../migrations/0175_merge_20260115_1437.py    | 14 +++++++++++++
 .../0176_alter_studygroup_course_content.py   | 20 +++++++++++++++++++
 studygroups/models/learningcircle.py          |  2 +-
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 studygroups/migrations/0175_merge_20260115_1437.py
 create mode 100644 studygroups/migrations/0176_alter_studygroup_course_content.py

diff --git a/studygroups/migrations/0175_merge_20260115_1437.py b/studygroups/migrations/0175_merge_20260115_1437.py
new file mode 100644
index 000000000..7fd13cefc
--- /dev/null
+++ b/studygroups/migrations/0175_merge_20260115_1437.py
@@ -0,0 +1,14 @@
+# Generated by Django 4.2.11 on 2026-01-15 14:37
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('studygroups', '0172_studygroup_signup_limit_alter_course_topic_guides_and_more'),
+        ('studygroups', '0174_course_course_content'),
+    ]
+
+    operations = [
+    ]
diff --git a/studygroups/migrations/0176_alter_studygroup_course_content.py b/studygroups/migrations/0176_alter_studygroup_course_content.py
new file mode 100644
index 000000000..f47930ba6
--- /dev/null
+++ b/studygroups/migrations/0176_alter_studygroup_course_content.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.11 on 2026-01-16 09:22
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0002_remove_cohortcomment_cohort_and_more'),
+        ('studygroups', '0175_merge_20260115_1437'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='studygroup',
+            name='course_content',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='courses.course'),
+        ),
+    ]
diff --git a/studygroups/models/learningcircle.py b/studygroups/models/learningcircle.py
index a1d433331..c4a1b2f62 100644
--- a/studygroups/models/learningcircle.py
+++ b/studygroups/models/learningcircle.py
@@ -57,7 +57,7 @@ def published(self):
 class StudyGroup(LifeTimeTrackingModel):
     name = models.CharField(max_length=128, blank=True)
     course = models.ForeignKey(Course, on_delete=models.CASCADE)
-    course_content = models.ForeignKey('courses.Course', on_delete=models.CASCADE, blank=True, null=True)
+    course_content = models.ForeignKey('courses.Course', on_delete=models.SET_NULL, blank=True, null=True)
     description = BleachField(max_length=2000, blank=True, allowed_tags=settings.TINYMCE_DEFAULT_CONFIG.get('valid_elements', '').split(','), allowed_attributes={'a': ['href', 'title', 'rel', 'target']})
     course_description = BleachField(max_length=2000, blank=True, allowed_tags=settings.TINYMCE_DEFAULT_CONFIG.get('valid_elements', '').split(','), allowed_attributes={'a': ['href', 'title', 'rel', 'target']})
     venue_name = models.CharField(max_length=256)

From eb12a213a95fa71af78c78ae807025c6cd8a06a9 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 16 Jan 2026 11:27:08 +0200
Subject: [PATCH 37/63] Update foreign key on studygroups.Course to avoid
 CASCADE deletion

---
 .../0177_alter_course_course_content.py       | 20 +++++++++++++++++++
 studygroups/models/course.py                  |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 studygroups/migrations/0177_alter_course_course_content.py

diff --git a/studygroups/migrations/0177_alter_course_course_content.py b/studygroups/migrations/0177_alter_course_course_content.py
new file mode 100644
index 000000000..6b98f830a
--- /dev/null
+++ b/studygroups/migrations/0177_alter_course_course_content.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.11 on 2026-01-16 09:26
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0002_remove_cohortcomment_cohort_and_more'),
+        ('studygroups', '0176_alter_studygroup_course_content'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='course',
+            name='course_content',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='courses.course'),
+        ),
+    ]
diff --git a/studygroups/models/course.py b/studygroups/models/course.py
index 2a4c86c74..b0cb4fc2b 100644
--- a/studygroups/models/course.py
+++ b/studygroups/models/course.py
@@ -56,7 +56,7 @@ class Course(LifeTimeTrackingModel):
     rating_step_counts = models.TextField(default="{}") # JSON value             # TODO
     discourse_topic_url = models.URLField(blank=True)
 
-    course_content = models.ForeignKey('courses.Course', on_delete=models.CASCADE, blank=True, null=True)
+    course_content = models.ForeignKey('courses.Course', on_delete=models.SET_NULL, blank=True, null=True)
 
     def __str__(self):
         return self.title

From 7ce6d724a048080a763be95eea90410c19dd0eee Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 16 Jan 2026 14:40:42 +0200
Subject: [PATCH 38/63] First take at capturing granular attendance for
 learning circles

---
 frontend/components/meeting-feedback.jsx      | 36 ++++++++++++++++++-
 .../0178_feedback_granular_attendance.py      | 18 ++++++++++
 studygroups/models/learningcircle.py          |  6 +++-
 studygroups/views/drf.py                      |  2 +-
 templates/studygroups/view_study_group.html   | 18 ++++++++++
 5 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 studygroups/migrations/0178_feedback_granular_attendance.py

diff --git a/frontend/components/meeting-feedback.jsx b/frontend/components/meeting-feedback.jsx
index 157d037df..c454754cd 100644
--- a/frontend/components/meeting-feedback.jsx
+++ b/frontend/components/meeting-feedback.jsx
@@ -4,6 +4,35 @@ import RatingInput from './manage/meeting-rating-input';
 import MeetingReflectionInput from './manage/meeting-reflection-input';
 import DelayedPostForm from './manage/delayed-post-form';
 
+const GranularAttendanceInput = ({value, onChange, learners}) => {
+
+  var parsedValue = JSON.parse(value)
+
+  const handleCheck = userId => {
+    if (parsedValue[userId]) {
+      delete parsedValue[userId]
+    } else {
+      parsedValue[userId] = true
+    }
+    onChange({"granular_attendance": JSON.stringify(parsedValue)})
+  }
+
+  return (
+    <div id="div_id_granular_attendance" className="form-group">
+      <label htmlFor="id_granular_attendance" className="col-form-label">Who attended?</label> 
+      {
+        learners.map(user => (
+          <div className="form-check" key={user.id}>
+            <input className="form-check-input" type="checkbox" value="" id="checkChecked" checked={parsedValue[user.id]} onChange={e => handleCheck(user.id)}/>
+            <label className="form-check-label" htmlFor="checkChecked">
+              {`${user.name} <${user.email || user.mobile}>`}
+            </label>
+          </div>
+        ))
+      }
+    </div>
+  );
+}
 
 const AttendanceInput = ({value, onChange}) => 
   <div id="div_id_attendance" className="form-group">
@@ -19,6 +48,11 @@ const MeetingFeedbackForm = props => {
   return (
     <form>
       <RatingInput value={formData.rating} onChange={updateForm}/>
+      <GranularAttendanceInput 
+        value={formData.granular_attendance}
+        onChange={updateForm}
+        learners={window.learners}
+      />
       <AttendanceInput value={formData.attendance} onChange={updateForm}/>
       <MeetingReflectionInput value={formData.reflection} onChange={updateForm} />
     </form>
@@ -37,6 +71,7 @@ const MeetingFeedback = props => {
   let initialFormValues = {
     rating: props.rating,
     attendance: props.attendance,
+    granular_attendance: props.granularAttendance,
     reflection: props.reflection,
     study_group_meeting: props.meetingId,
   };
@@ -70,4 +105,3 @@ const MeetingFeedback = props => {
 };
 
 export default MeetingFeedback;
-
diff --git a/studygroups/migrations/0178_feedback_granular_attendance.py b/studygroups/migrations/0178_feedback_granular_attendance.py
new file mode 100644
index 000000000..7d2feee24
--- /dev/null
+++ b/studygroups/migrations/0178_feedback_granular_attendance.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2026-01-16 09:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('studygroups', '0177_alter_course_course_content'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='feedback',
+            name='granular_attendance',
+            field=models.JSONField(default=dict),
+        ),
+    ]
diff --git a/studygroups/models/learningcircle.py b/studygroups/models/learningcircle.py
index c4a1b2f62..28d95409e 100644
--- a/studygroups/models/learningcircle.py
+++ b/studygroups/models/learningcircle.py
@@ -581,12 +581,16 @@ class Feedback(LifeTimeTrackingModel):
         (AWFUL, _('Awful')),
     ]
 
-    study_group_meeting = models.ForeignKey('studygroups.Meeting', on_delete=models.CASCADE) # TODO should this be a OneToOneField?
+    study_group_meeting = models.ForeignKey('studygroups.Meeting', on_delete=models.CASCADE)
     feedback = models.TextField(blank=True) # Shared with learners. This is being deprecated, but kept for retaining past data.
     attendance = models.PositiveIntegerField(blank=True, null=True)
+    granular_attendance = models.JSONField(default=dict)
     reflection = models.TextField(blank=True) # Shared with team and P2PU
     rating = models.CharField(choices=RATING, max_length=16, blank=True)
 
+
+
+
     def reflection_json(self):
         if self.reflection:
             return json.loads(self.reflection)
diff --git a/studygroups/views/drf.py b/studygroups/views/drf.py
index 9ec8422d0..c278cac69 100644
--- a/studygroups/views/drf.py
+++ b/studygroups/views/drf.py
@@ -27,7 +27,7 @@ def get_url(self, obj):
 
     class Meta:
         model = Feedback
-        fields = ['rating', 'attendance', 'reflection', 'study_group_meeting', 'url']
+        fields = ['rating', 'attendance', 'granular_attendance', 'reflection', 'study_group_meeting', 'url']
 
 
 class IsGroupFacilitator(permissions.BasePermission):
diff --git a/templates/studygroups/view_study_group.html b/templates/studygroups/view_study_group.html
index bf190b810..cc199fea6 100644
--- a/templates/studygroups/view_study_group.html
+++ b/templates/studygroups/view_study_group.html
@@ -157,6 +157,7 @@ <h1>{% if study_group.draft %}[DRAFT] {% endif %}{{study_group.name}}</h1>
                   {% if feedback.rating %}data-rating="{{feedback.rating}}"{% endif %}
                   {% if feedback.attendance %}data-attendance="{{feedback.attendance}}"{% endif %}
                   {% if feedback.reflection%}data-reflection="{{feedback.reflection}}"{% endif %}
+                  data-granular-attendance="{% if feedback.granular_attendance %}{{feedback.granular_attendance}}{% else %}{}{% endif %}"
                   data-action-url="{% url 'feedback-detail' feedback.id %}"
                 {% else %}
                   data-action-url="{% url 'feedback-list'%}"
@@ -358,6 +359,23 @@ <h1>{% if study_group.draft %}[DRAFT] {% endif %}{{study_group.name}}</h1>
 {% endblock %}
 {% block scripts %}
 
+<script>
+ // erm, hacky data sharing with feedback widget
+
+window.learners = [
+  {% for learner in study_group.application_set.active %}
+      {% if learner.anonymized %}{% else %}
+      {
+        "id": "{{ learner.id }}",
+        "name": "{{ learner.name }}",
+        {% if learner.email %}"email": "{{learner.email}}",{% endif %}
+        {% if learner.mobile %}"mobile": "{{learner.mobile}}",{% endif %}
+      },
+      {% endif %}
+  {% endfor %}
+];
+
+</script>
 {% render_bundle 'learning-circle-manage' %}
 <script>
 $(document).ready(function () {

From 58a25c6dcb3156b6b59218b0bc71d15c2b856e1d Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 19 Jan 2026 11:55:12 +0200
Subject: [PATCH 39/63] Implement UX switch between summarized and granular
 attendance data. Split component into separate file

---
 .../manage/meeting-attendance-input.jsx       | 74 +++++++++++++++++++
 frontend/components/meeting-feedback.jsx      | 46 +-----------
 2 files changed, 76 insertions(+), 44 deletions(-)
 create mode 100644 frontend/components/manage/meeting-attendance-input.jsx

diff --git a/frontend/components/manage/meeting-attendance-input.jsx b/frontend/components/manage/meeting-attendance-input.jsx
new file mode 100644
index 000000000..6d1d41076
--- /dev/null
+++ b/frontend/components/manage/meeting-attendance-input.jsx
@@ -0,0 +1,74 @@
+import React, { useState } from 'react'
+
+const SummarizedAttendanceInput  = ({value, onChange}) => 
+  <div id="div_id_attendance" className="form-group">
+    <label htmlFor="id_attendance" className="col-form-label">How many people attended?</label> 
+    <div>
+      <input type="number" name="attendance" min="0" className="numberinput form-control form-control form-control" value={value} onChange={e => onChange({'attendance': e.target.value})} id="id_attendance" /> 
+    </div> 
+  </div>;
+
+
+const GranularAttendanceInput = ({value, onChange, learners}) => {
+  var parsedValue = JSON.parse(value || '{}')
+
+  const handleCheck = userId => {
+    if (parsedValue[userId]) {
+      delete parsedValue[userId]
+    } else {
+      parsedValue[userId] = true
+    }
+    onChange({"granular_attendance": JSON.stringify(parsedValue)})
+  }
+
+  return (
+    <div id="div_id_granular_attendance" className="form-group">
+      <label htmlFor="id_granular_attendance" className="col-form-label">Who attended?</label> 
+      {
+        learners.map(user => (
+          <div className="form-check" key={user.id}>
+            <input className="form-check-input" type="checkbox" value="" id="checkChecked" checked={parsedValue[user.id]} onChange={e => handleCheck(user.id)}/>
+            <label className="form-check-label" htmlFor="checkChecked">
+              {`${user.name} <${user.email || user.mobile}>`}
+            </label>
+          </div>
+        ))
+      }
+    </div>
+  );
+}
+
+const AttendanceInput = ({formData, onChange}) => {
+
+  const [summarizedInput, setSummarizedInput] = useState(
+    !(formData.granular_attendance && formData.granular_attendance.length > 2)
+  )
+
+  const toggle = (e) => {
+    e.preventDefault()
+    setSummarizedInput(!summarizedInput)
+  }
+
+  return (
+    <>
+      { summarizedInput && (
+        <>
+        <SummarizedAttendanceInput value={formData.attendance} onChange={onChange} /> 
+        <p>(<a href="#" onClick={toggle} >Record per learner attendance</a>)</p>
+        </>
+      )}
+      { !summarizedInput && (
+        <>
+        <GranularAttendanceInput 
+          value={formData.granular_attendance}
+          onChange={onChange}
+          learners={window.learners}
+        />
+        <p>(<a href="#" onClick={toggle} >Record summarized attendance</a>)</p>
+      </>
+      )}
+    </>
+  );
+}
+
+export default AttendanceInput;
diff --git a/frontend/components/meeting-feedback.jsx b/frontend/components/meeting-feedback.jsx
index c454754cd..2adfa8ff7 100644
--- a/frontend/components/meeting-feedback.jsx
+++ b/frontend/components/meeting-feedback.jsx
@@ -2,58 +2,16 @@ import React, { useState } from 'react'
 
 import RatingInput from './manage/meeting-rating-input';
 import MeetingReflectionInput from './manage/meeting-reflection-input';
+import AttendanceInput from './manage/meeting-attendance-input';
 import DelayedPostForm from './manage/delayed-post-form';
 
-const GranularAttendanceInput = ({value, onChange, learners}) => {
-
-  var parsedValue = JSON.parse(value)
-
-  const handleCheck = userId => {
-    if (parsedValue[userId]) {
-      delete parsedValue[userId]
-    } else {
-      parsedValue[userId] = true
-    }
-    onChange({"granular_attendance": JSON.stringify(parsedValue)})
-  }
-
-  return (
-    <div id="div_id_granular_attendance" className="form-group">
-      <label htmlFor="id_granular_attendance" className="col-form-label">Who attended?</label> 
-      {
-        learners.map(user => (
-          <div className="form-check" key={user.id}>
-            <input className="form-check-input" type="checkbox" value="" id="checkChecked" checked={parsedValue[user.id]} onChange={e => handleCheck(user.id)}/>
-            <label className="form-check-label" htmlFor="checkChecked">
-              {`${user.name} <${user.email || user.mobile}>`}
-            </label>
-          </div>
-        ))
-      }
-    </div>
-  );
-}
-
-const AttendanceInput = ({value, onChange}) => 
-  <div id="div_id_attendance" className="form-group">
-    <label htmlFor="id_attendance" className="col-form-label">How many people attended?</label> 
-    <div>
-      <input type="number" name="attendance" min="0" className="numberinput form-control form-control form-control" value={value} onChange={e => onChange({'attendance': e.target.value})} id="id_attendance" /> 
-    </div> 
-  </div>;
-
 
 const MeetingFeedbackForm = props => {
   const {formData, updateForm} = props;
   return (
     <form>
       <RatingInput value={formData.rating} onChange={updateForm}/>
-      <GranularAttendanceInput 
-        value={formData.granular_attendance}
-        onChange={updateForm}
-        learners={window.learners}
-      />
-      <AttendanceInput value={formData.attendance} onChange={updateForm}/>
+      <AttendanceInput formData={formData} onChange={updateForm}/>
       <MeetingReflectionInput value={formData.reflection} onChange={updateForm} />
     </form>
   )

From f8d1f5f24478a008900365ab3b8715c59ed3242a Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 19 Jan 2026 22:23:20 +0200
Subject: [PATCH 40/63] Add template view as placeholder for program agreement
 form

---
 frontend/components/participant-dash.jsx      |  14 +-
 studygroups/urls.py                           |   3 +
 .../studygroups/dd_device_agreement.html      | 184 ++++++++++++++++++
 3 files changed, 200 insertions(+), 1 deletion(-)
 create mode 100644 templates/studygroups/dd_device_agreement.html

diff --git a/frontend/components/participant-dash.jsx b/frontend/components/participant-dash.jsx
index 712a31dfb..0671e8d60 100644
--- a/frontend/components/participant-dash.jsx
+++ b/frontend/components/participant-dash.jsx
@@ -217,7 +217,6 @@ const CuCreditPrompt = props => {
   return (
     <div className="item credit" id="info">
       <div className="icon"></div>
-
       <div className="card">
         <p>Participants in this learning circle have the option to earn college credit from College Unbound. In order to earn credit, you must complete a learning journal while participating in the learning circle. For more information, <a href="https://docs.p2pu.org/frequently-asked-questions#credit-bearing-faqs">refer to the FAQs</a>.</p>
       </div>
@@ -226,6 +225,18 @@ const CuCreditPrompt = props => {
 }
 
 
+const DDDeviceForm = props => {
+  return (
+    <div className="item todo" id="device-form">
+      <div className="icon"></div>
+      <div className="card">
+        <p>This enrollment form serves as your authorization to receive a device from Digital Skills Detroit. Please complete within your first 2 Digital Skills Detroit sessions to be considered for your device upon program completion.</p>
+        <p><a href="#" className="p2pu-btn btn btn-primary">Complete enrollment form</a></p>
+      </div>
+    </div>
+  );
+}
+
 
 const ParticipantDash = props => {
   const {meetings, messages, signup_message, survey_link, survey_completed} = props;
@@ -258,6 +269,7 @@ const ParticipantDash = props => {
     <div className="lc-timeline">
       <InfoCard {...props} />
       { props.cu_credit && <CuCreditPrompt {...props}/>}
+      <DDDeviceForm {...props} />
       { 
         items.map( (item, i) => {
           return <item.component {...item.data} key={i} id={i} />
diff --git a/studygroups/urls.py b/studygroups/urls.py
index 5cacdc070..81f98dd51 100644
--- a/studygroups/urls.py
+++ b/studygroups/urls.py
@@ -67,6 +67,9 @@
     re_path(r'^studygroup/create/legacy/$', StudyGroupCreateLegacy.as_view(), name='studygroups_studygroup_create_legacy'),
     re_path(r'^studygroup/(?P<study_group_id>[\d]+)/$', views.view_study_group, name='studygroups_view_study_group'),
     re_path(r'^studygroup/(?P<study_group_id>[\d]+)/learn/$', views.StudyGroupParticipantView.as_view(), name='studygroups_view_learning_circle_participant'),
+
+    re_path(r'^studygroup/(?P<study_group_id>[\d]+)/device_agreement/$', TemplateView.as_view(template_name='studygroups/dd_device_agreement.html'), name='studygroups_device_agreement'),
+
     re_path(r'^studygroup/(?P<study_group_id>[\d]+)/edit/$', StudyGroupUpdate.as_view(), name='studygroups_edit_study_group'),
     re_path(r'^studygroup/(?P<study_group_id>[\d]+)/edit/legacy/$', StudyGroupUpdateLegacy.as_view(), name='studygroups_studygroup_edit_legacy'),
     re_path(r'^studygroup/(?P<study_group_id>[\d]+)/delete/$', StudyGroupDelete.as_view(), name='studygroups_studygroup_delete'),
diff --git a/templates/studygroups/dd_device_agreement.html b/templates/studygroups/dd_device_agreement.html
new file mode 100644
index 000000000..c0208a920
--- /dev/null
+++ b/templates/studygroups/dd_device_agreement.html
@@ -0,0 +1,184 @@
+{% extends 'base.html' %}
+{% load render_bundle from webpack_loader %}
+{% load crispy_forms_tags %}
+{% load static %}
+{% load i18n %}
+{% load tz %}
+
+{% block page_title %}
+  {{study_group.name}}
+{% endblock %}
+
+
+{% block content %}
+
+<style>
+        .form-container {
+            width: 8.5in;
+            min-height: 11in;
+            margin: 0 auto;
+            background: white;
+            padding: 0.75in;
+            box-shadow: 0 4px 8px rgba(0,0,0,0.3);
+        }
+        .section-title {
+            color: #0d6efd;
+            border-bottom: 2px solid #0d6efd;
+            padding-bottom: 10px;
+            margin: 30px 0 20px;
+            text-align: left;
+        }
+        .header {
+            text-align: center;
+            margin-bottom: 30px;
+        }
+        .required-field::after {
+            content: " *";
+            color: red;
+        }
+        @media print {
+            body {
+                background: white;
+                padding: 0;
+            }
+            .form-container {
+                box-shadow: none;
+                margin: 0;
+            }
+        }
+</style>
+
+
+    <div class="container mt-5">
+        <div class="form-container">
+            <div class="header">
+                <h2 class="text-primary">Digital Skills Detroit</h2>
+                <h4>Enrollment Form</h4>
+                <p class="text-muted">This enrollment form serves as your authorization to receive a device from Digital Skills Detroit. Please complete within your first 2 Digital Skills Detroit sessions to be considered for your device upon program completion.</p>
+            </div>
+
+            <form id="enrollmentForm">
+                <!-- Learner Contact Information -->
+                <h5 class="section-title">Learner Contact Information</h5>
+                
+                <div class="row mb-3">
+                    <div class="col-md-12">
+                        <label for="firstName" class="form-label required-field">First Name</label>
+                        <input type="text" class="form-control" id="firstName" required>
+                    </div>
+                    <div class="col-md-12">
+                        <label for="lastName" class="form-label required-field">Last Name</label>
+                        <input type="text" class="form-control" id="lastName" required>
+                    </div>
+                </div>
+
+                <div class="row mb-3">
+                    <div class="col-md-12">
+                        <label for="dob" class="form-label required-field">Date of Birth</label>
+                        <input type="date" class="form-control" id="dob" required>
+                    </div>
+                    <div class="col-md-12">
+                        <label for="phone" class="form-label required-field">Phone Number</label>
+                        <input type="tel" class="form-control" id="phone" placeholder="(123) 456-7890" required>
+                    </div>
+                </div>
+
+                <div class="mb-3">
+                    <label for="email" class="form-label required-field">Email Address</label>
+                    <input type="email" class="form-control" id="email" required>
+                </div>
+
+                <div class="mb-3">
+                    <label for="address" class="form-label required-field">Home Address</label>
+                    <textarea class="form-control" id="address" rows="2" required></textarea>
+                </div>
+
+                <!-- Demographic Information -->
+                <h5 class="section-title">Demographic Information</h5>
+                <p class="text-muted">Optional</p>
+                
+                <div class="mb-3">
+                    <label for="gender" class="form-label">Gender</label>
+                    <select class="form-select" id="gender">
+                        <option value="">Select...</option>
+                        <option value="male">Male</option>
+                        <option value="female">Female</option>
+                        <option value="non-binary">Non-binary</option>
+                        <option value="prefer-not-to-say">Prefer not to say</option>
+                        <option value="other">Other</option>
+                    </select>
+                </div>
+
+                <!-- Agreement -->
+                <h5 class="section-title">Agreement</h5>
+                <p>By signing below, I acknowledge and agree to the following:</p>
+                
+                <ul>
+                  <li>I understand that I will be eligible to receive a device after the completion of  15 hours of digital literacy training through the Digital Skills Detroit program.</li>
+                  <li>I understand that Human-I-T will provide support services related to my device, including troubleshooting and technical assistance.</li>
+                  <li>I understand that my contact information (as provided above) may be shared with Human-I-T and the Detroit Housing Network solely for the purposes of distributing devices to participants who complete the training and providing housing resources and opportunities by the Detroit housing network.</li>
+                </ul>
+
+                <!-- Consent -->
+                <h5 class="section-title">Consent</h5>
+                <p class="required-field">Please select one of the following</p>
+                
+                <div class="mb-3">
+                    <div class="form-check">
+                        <input class="form-check-input" type="radio" name="consent" id="consentNo" value="no" required>
+                        <label class="form-check-label" for="consentNo">
+                            I do not consent to being contacted by the Detroit Housing Network to learn more about additional housing resources and opportunities that may benefit me.
+                        </label>
+                    </div>
+                    <div class="form-check">
+                        <input class="form-check-input" type="radio" name="consent" id="consentYes" value="yes" required>
+                        <label class="form-check-label" for="consentYes">
+                            I consent to being contacted by the Detroit Housing Network to learn more about additional housing resources and opportunities that may benefit me.
+                        </label>
+                    </div>
+                </div>
+
+                <!-- Disclosures and Privacy Policy -->
+                <h5 class="section-title">Disclosures and Privacy Policy</h5>
+                
+                <div class="mb-3">
+                    <div class="form-check">
+                        <input class="form-check-input" type="checkbox" id="disclosure" required>
+                        <label class="form-check-label" for="disclosure">
+                            By submitting your information you are certifying that all information is correct to the best of your knowledge and that you reviewed the Disclosures and Detroit Housing Network (DHN) Privacy Policy.
+                        </label>
+                    </div>
+                </div>
+
+                <!-- Learner Signature -->
+                <h5 class="section-title">Learner Signature</h5>
+                
+                <div class="mb-3">
+                    <div class="form-check">
+                        <input class="form-check-input" type="checkbox" id="signatureAck" required>
+                        <label class="form-check-label required-field" for="signatureAck">
+                            I have read and understood the terms of this agreement.
+                        </label>
+                    </div>
+                </div>
+
+                <div class="row mb-3">
+                    <div class="col-md-8">
+                        <label for="signature" class="form-label required-field">Signature</label>
+                        <input type="text" class="form-control" id="signature" placeholder="Type your full name" required>
+                    </div>
+                    <div class="col-md-4">
+                        <label for="signatureDate" class="form-label required-field">Date</label>
+                        <input type="date" class="form-control" id="signatureDate" required>
+                    </div>
+                </div>
+
+                <div class="d-grid gap-2 mt-4 mb-4">
+                    <button type="submit" class="btn btn-primary btn-lg">Submit Enrollment</button>
+                </div>
+            </form>
+        </div>
+    </div>
+
+{% endblock %}
+

From 7b12de2ac1e30de48894de190e36574767120c94 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 19 Jan 2026 22:47:04 +0200
Subject: [PATCH 41/63] Pass URL for device agreement to frontend

---
 frontend/components/participant-dash.jsx | 4 ++--
 studygroups/views/learner.py             | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/components/participant-dash.jsx b/frontend/components/participant-dash.jsx
index 0671e8d60..6a5ec2d34 100644
--- a/frontend/components/participant-dash.jsx
+++ b/frontend/components/participant-dash.jsx
@@ -231,7 +231,7 @@ const DDDeviceForm = props => {
       <div className="icon"></div>
       <div className="card">
         <p>This enrollment form serves as your authorization to receive a device from Digital Skills Detroit. Please complete within your first 2 Digital Skills Detroit sessions to be considered for your device upon program completion.</p>
-        <p><a href="#" className="p2pu-btn btn btn-primary">Complete enrollment form</a></p>
+        <p><a href={props.device_agreement_url} className="p2pu-btn btn btn-primary">Complete enrollment form</a></p>
       </div>
     </div>
   );
@@ -269,7 +269,7 @@ const ParticipantDash = props => {
     <div className="lc-timeline">
       <InfoCard {...props} />
       { props.cu_credit && <CuCreditPrompt {...props}/>}
-      <DDDeviceForm {...props} />
+      { props.device_agreement_url && <DDDeviceForm {...props} /> }
       { 
         items.map( (item, i) => {
           return <item.component {...item.data} key={i} id={i} />
diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index afafdabf1..7ddb25f12 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -371,6 +371,10 @@ def _message_to_dict(message):
                 'email': application.email,
             }
         }
+
+        # TODO check if learning circle meets requirements for devices
+        react_data['device_agreement_url'] = reverse('studygroups_device_agreement', args=(study_group.pk,))
+
         context['react_data'] = react_data
 
         return render(request, self.template_name, context)

From a3a2399cb8a18e0481be47f8e9f5cd62069d43b4 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 22 Jan 2026 14:19:10 +0200
Subject: [PATCH 42/63] Add django form and save data

---
 studygroups/forms.py                          | 90 +++++++++++++++++++
 studygroups/urls.py                           |  3 +-
 studygroups/views/learner.py                  | 66 ++++++++++++++
 .../studygroups/dd_device_agreement.html      | 41 ++++-----
 4 files changed, 176 insertions(+), 24 deletions(-)

diff --git a/studygroups/forms.py b/studygroups/forms.py
index 845ecb03b..2f6561a60 100644
--- a/studygroups/forms.py
+++ b/studygroups/forms.py
@@ -498,3 +498,93 @@ class Meta:
             'intro_text': TinyMCE()
         }
 
+
+class DigitalSkillsEnrollmentForm(forms.Form):
+    GENDER_CHOICES = [
+        ('', 'Select...'),
+        ('male', 'Male'),
+        ('female', 'Female'),
+        ('non-binary', 'Non-binary'),
+        ('prefer-not-to-say', 'Prefer not to say'),
+        ('other', 'Other'),
+    ]
+    
+    CONSENT_CHOICES = [
+        ('no', 'I do not consent to being contacted by the Detroit Housing Network to learn more about additional housing resources and opportunities that may benefit me.'),
+        ('yes', 'I consent to being contacted by the Detroit Housing Network to learn more about additional housing resources and opportunities that may benefit me.'),
+    ]
+    
+    # Learner Contact Information
+    first_name = forms.CharField(
+        max_length=100,
+        required=True,
+        widget=forms.TextInput(attrs={'class': 'form-control'})
+    )
+    
+    last_name = forms.CharField(
+        max_length=100,
+        required=True,
+        widget=forms.TextInput(attrs={'class': 'form-control'})
+    )
+    
+    date_of_birth = forms.DateField(
+        required=True,
+        widget=forms.DateInput(attrs={'class': 'form-control', 'type': 'date'})
+    )
+    
+    phone_number = forms.CharField(
+        max_length=15,
+        required=True,
+        widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': '(123) 456-7890'})
+    )
+    
+    email_address = forms.EmailField(
+        required=True,
+        widget=forms.EmailInput(attrs={'class': 'form-control'})
+    )
+    
+    home_address = forms.CharField(
+        required=True,
+        widget=forms.Textarea(attrs={'class': 'form-control', 'rows': 2})
+    )
+    
+    # Demographic Information (Optional)
+    gender = forms.ChoiceField(
+        choices=GENDER_CHOICES,
+        required=False,
+        widget=forms.Select(attrs={'class': 'form-select'})
+    )
+    
+    # Consent
+    housing_network_consent = forms.ChoiceField(
+        choices=CONSENT_CHOICES,
+        required=True,
+        widget=forms.RadioSelect(attrs={'class': 'form-check-input'})
+    )
+    
+    # Disclosures and Privacy Policy
+    disclosure_certification = forms.BooleanField(
+        required=True,
+        label='By submitting your information you are certifying that all information is correct to the best of your knowledge and that you reviewed the Disclosures and Detroit Housing Network (DHN) Privacy Policy.',
+        widget=forms.CheckboxInput(attrs={'class': 'form-check-input'})
+    )
+    
+    # Learner Signature
+    signature_acknowledgment = forms.BooleanField(
+        required=True,
+        label='I have read and understood the terms of this agreement.',
+        widget=forms.CheckboxInput(attrs={'class': 'form-check-input'})
+    )
+    
+    signature = forms.CharField(
+        max_length=200,
+        required=True,
+        label='Signature (Type your full name)',
+        widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'Type your full name'})
+    )
+    
+    signature_date = forms.DateField(
+        required=True,
+        widget=forms.DateInput(attrs={'class': 'form-control', 'type': 'date'})
+    )
+
diff --git a/studygroups/urls.py b/studygroups/urls.py
index 81f98dd51..f7be7803d 100644
--- a/studygroups/urls.py
+++ b/studygroups/urls.py
@@ -48,6 +48,7 @@
 from studygroups.views import MeetingRecap
 from studygroups.views import MeetingRecapDismiss
 from studygroups.views import ContentView
+from studygroups.views.learner import DeviceAgreementView
 
 from . import views
 
@@ -68,7 +69,7 @@
     re_path(r'^studygroup/(?P<study_group_id>[\d]+)/$', views.view_study_group, name='studygroups_view_study_group'),
     re_path(r'^studygroup/(?P<study_group_id>[\d]+)/learn/$', views.StudyGroupParticipantView.as_view(), name='studygroups_view_learning_circle_participant'),
 
-    re_path(r'^studygroup/(?P<study_group_id>[\d]+)/device_agreement/$', TemplateView.as_view(template_name='studygroups/dd_device_agreement.html'), name='studygroups_device_agreement'),
+    re_path(r'^studygroup/(?P<study_group_id>[\d]+)/device_agreement/$', views.DeviceAgreementView.as_view(), name='studygroups_device_agreement'),
 
     re_path(r'^studygroup/(?P<study_group_id>[\d]+)/edit/$', StudyGroupUpdate.as_view(), name='studygroups_edit_study_group'),
     re_path(r'^studygroup/(?P<study_group_id>[\d]+)/edit/legacy/$', StudyGroupUpdateLegacy.as_view(), name='studygroups_studygroup_edit_legacy'),
diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index 7ddb25f12..f2a1c1fb7 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -6,6 +6,7 @@
 from studygroups.utils import render_to_string_ctx
 from django.urls import reverse, reverse_lazy
 from django.core.mail import EmailMultiAlternatives
+from django.core.serializers.json import DjangoJSONEncoder
 from django.contrib import messages
 from django.conf import settings
 from django import http
@@ -36,6 +37,7 @@
 from studygroups.forms import ApplicationForm
 from studygroups.forms import OptOutForm
 from studygroups.forms import OptOutConfirmationForm
+from studygroups.forms import DigitalSkillsEnrollmentForm
 from studygroups.utils import check_rsvp_signature
 from studygroups.utils import check_unsubscribe_signature
 from studygroups.views.api import serialize_learning_circle
@@ -147,6 +149,67 @@ def conditions():
         return http.HttpResponseRedirect(url)
 
 
+@method_decorator(login_required, name="dispatch")
+class DeviceAgreementView(FormView):
+    template_name = 'studygroups/dd_device_agreement.html'
+    form_class = DigitalSkillsEnrollmentForm
+
+    def dispatch(self, request, *args, **kwargs):
+        study_group_id = self.kwargs.get('study_group_id')
+        study_group = get_object_or_404(StudyGroup, pk=study_group_id)
+
+        # TODO ensure learning circle meets criteria
+
+        # ensure viewer is signed up
+        if not study_group.application_set.active().filter(email=self.request.user.email).exists():
+            url = reverse('studygroups_facilitator')
+            return http.HttpResponseRedirect(url)
+
+        return super().dispatch(request, *args, **kwargs)
+
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        study_group_id = self.kwargs.get('study_group_id')
+        study_group = get_object_or_404(StudyGroup, pk=study_group_id)
+        context['study_group'] = study_group
+        return context
+
+
+    def get_initial(self):
+        study_group_id = self.kwargs.get('study_group_id')
+        study_group = get_object_or_404(StudyGroup, pk=study_group_id)
+        application = study_group.application_set.active().filter(email=self.request.user.email).first()
+        # TODO load initial from signup_questions
+        initial = {
+            "email_address": application.email,
+            "first_name": application.name,
+        }
+        if application.mobile:
+            initial["phone_number"] = mobile
+        return initial
+
+
+    def form_valid(self, form):
+        study_group_id = self.kwargs.get('study_group_id')
+        study_group = get_object_or_404(StudyGroup, pk=study_group_id)
+
+        # save data in Application.signup_questions as json field
+        application = study_group.application_set.active().filter(
+            email=self.request.user.email
+        ).first()
+        application_data = json.loads(application.signup_questions)
+        application_data['device_agreement'] = form.cleaned_data
+        application.signup_questions = json.dumps(application_data, cls=DjangoJSONEncoder)
+        application.save()
+
+        redirect_url = reverse(
+            'studygroups_view_learning_circle_participant',
+            args=(study_group.id,)
+        )
+        return http.HttpResponseRedirect(redirect_url)
+
+
 class OptOutView(FormView):
     template_name = 'studygroups/optout.html'
     form_class = OptOutForm
@@ -374,6 +437,9 @@ def _message_to_dict(message):
 
         # TODO check if learning circle meets requirements for devices
         react_data['device_agreement_url'] = reverse('studygroups_device_agreement', args=(study_group.pk,))
+        application_data = json.loads(application.signup_questions)
+        if application_data.get('device_agreement'):
+            react_data['device_agreement_completed'] = True
 
         context['react_data'] = react_data
 
diff --git a/templates/studygroups/dd_device_agreement.html b/templates/studygroups/dd_device_agreement.html
index c0208a920..0a45f0527 100644
--- a/templates/studygroups/dd_device_agreement.html
+++ b/templates/studygroups/dd_device_agreement.html
@@ -12,6 +12,8 @@
 
 {% block content %}
 
+
+
 <style>
         .form-container {
             width: 8.5in;
@@ -48,8 +50,8 @@
         }
 </style>
 
-
     <div class="container mt-5">
+      <a href="{% url 'studygroups_view_learning_circle_participant' study_group.id %}">{% trans "Back" %}</a>
         <div class="form-container">
             <div class="header">
                 <h2 class="text-primary">Digital Skills Detroit</h2>
@@ -57,40 +59,40 @@ <h4>Enrollment Form</h4>
                 <p class="text-muted">This enrollment form serves as your authorization to receive a device from Digital Skills Detroit. Please complete within your first 2 Digital Skills Detroit sessions to be considered for your device upon program completion.</p>
             </div>
 
-            <form id="enrollmentForm">
-                <!-- Learner Contact Information -->
+            <form id="enrollmentForm" method="POST">
+              {% csrf_token %}
                 <h5 class="section-title">Learner Contact Information</h5>
                 
                 <div class="row mb-3">
                     <div class="col-md-12">
                         <label for="firstName" class="form-label required-field">First Name</label>
-                        <input type="text" class="form-control" id="firstName" required>
+                        {{ form.first_name }}
                     </div>
                     <div class="col-md-12">
                         <label for="lastName" class="form-label required-field">Last Name</label>
-                        <input type="text" class="form-control" id="lastName" required>
+                        {{ form.last_name }}
                     </div>
                 </div>
 
                 <div class="row mb-3">
                     <div class="col-md-12">
                         <label for="dob" class="form-label required-field">Date of Birth</label>
-                        <input type="date" class="form-control" id="dob" required>
+                        {{ form.date_of_birth }}
                     </div>
                     <div class="col-md-12">
                         <label for="phone" class="form-label required-field">Phone Number</label>
-                        <input type="tel" class="form-control" id="phone" placeholder="(123) 456-7890" required>
+                        {{ form.phone_number }}
                     </div>
                 </div>
 
                 <div class="mb-3">
                     <label for="email" class="form-label required-field">Email Address</label>
-                    <input type="email" class="form-control" id="email" required>
+                    {{ form.email_address }}
                 </div>
 
                 <div class="mb-3">
                     <label for="address" class="form-label required-field">Home Address</label>
-                    <textarea class="form-control" id="address" rows="2" required></textarea>
+                    <textarea class="form-control" id="address" rows="2" name="home_address" required></textarea>
                 </div>
 
                 <!-- Demographic Information -->
@@ -99,14 +101,7 @@ <h5 class="section-title">Demographic Information</h5>
                 
                 <div class="mb-3">
                     <label for="gender" class="form-label">Gender</label>
-                    <select class="form-select" id="gender">
-                        <option value="">Select...</option>
-                        <option value="male">Male</option>
-                        <option value="female">Female</option>
-                        <option value="non-binary">Non-binary</option>
-                        <option value="prefer-not-to-say">Prefer not to say</option>
-                        <option value="other">Other</option>
-                    </select>
+                    {{ form.gender }}
                 </div>
 
                 <!-- Agreement -->
@@ -125,13 +120,13 @@ <h5 class="section-title">Consent</h5>
                 
                 <div class="mb-3">
                     <div class="form-check">
-                        <input class="form-check-input" type="radio" name="consent" id="consentNo" value="no" required>
+                        <input name="housing_network_consent" class="form-check-input" type="radio" name="consent" id="consentNo" value="no" required>
                         <label class="form-check-label" for="consentNo">
                             I do not consent to being contacted by the Detroit Housing Network to learn more about additional housing resources and opportunities that may benefit me.
                         </label>
                     </div>
                     <div class="form-check">
-                        <input class="form-check-input" type="radio" name="consent" id="consentYes" value="yes" required>
+                        <input name="housing_network_consent" class="form-check-input" type="radio" name="consent" id="consentYes" value="yes" required>
                         <label class="form-check-label" for="consentYes">
                             I consent to being contacted by the Detroit Housing Network to learn more about additional housing resources and opportunities that may benefit me.
                         </label>
@@ -143,7 +138,7 @@ <h5 class="section-title">Disclosures and Privacy Policy</h5>
                 
                 <div class="mb-3">
                     <div class="form-check">
-                        <input class="form-check-input" type="checkbox" id="disclosure" required>
+                        <input name="disclosure_certification" class="form-check-input" type="checkbox" id="disclosure" required>
                         <label class="form-check-label" for="disclosure">
                             By submitting your information you are certifying that all information is correct to the best of your knowledge and that you reviewed the Disclosures and Detroit Housing Network (DHN) Privacy Policy.
                         </label>
@@ -155,7 +150,7 @@ <h5 class="section-title">Learner Signature</h5>
                 
                 <div class="mb-3">
                     <div class="form-check">
-                        <input class="form-check-input" type="checkbox" id="signatureAck" required>
+                        <input name="signature_acknowledgment" class="form-check-input" type="checkbox" id="signatureAck" required>
                         <label class="form-check-label required-field" for="signatureAck">
                             I have read and understood the terms of this agreement.
                         </label>
@@ -165,11 +160,11 @@ <h5 class="section-title">Learner Signature</h5>
                 <div class="row mb-3">
                     <div class="col-md-8">
                         <label for="signature" class="form-label required-field">Signature</label>
-                        <input type="text" class="form-control" id="signature" placeholder="Type your full name" required>
+                        <input name="signature" type="text" class="form-control" id="signature" placeholder="Type your full name" required>
                     </div>
                     <div class="col-md-4">
                         <label for="signatureDate" class="form-label required-field">Date</label>
-                        <input type="date" class="form-control" id="signatureDate" required>
+                        <input name="signature_date" type="date" class="form-control" id="signatureDate" required>
                     </div>
                 </div>
 

From 610b59013b47fea09de2e75859869fa66ec18d55 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 22 Jan 2026 14:20:39 +0200
Subject: [PATCH 43/63] Update frontend UX for device agreement to be collapsed
 and show different text if the form is already completed

---
 frontend/components/participant-dash.jsx |  33 +++-
 static/images/icons/device-white.svg     | 188 +++++++++++++++++++++++
 static/sass/_lc-manage.scss              |  12 ++
 3 files changed, 228 insertions(+), 5 deletions(-)
 create mode 100644 static/images/icons/device-white.svg

diff --git a/frontend/components/participant-dash.jsx b/frontend/components/participant-dash.jsx
index 6a5ec2d34..d2f3ade2f 100644
--- a/frontend/components/participant-dash.jsx
+++ b/frontend/components/participant-dash.jsx
@@ -28,7 +28,7 @@ const RsvpForm = ({formData, updateForm}) => {
           onChange={handleChange}
           checked={formData.rsvp}
         />
-        <label className="form-check-label" for="rsvpYes">Yes</label>
+        <label className="form-check-label" htmlFor="rsvpYes">Yes</label>
       </div>
       <div className="form-check">
         <input 
@@ -37,7 +37,7 @@ const RsvpForm = ({formData, updateForm}) => {
           onChange={handleChange}
           checked={formData.rsvp === false}
         />
-        <label className="form-check-label" for="rsvpNo">No</label>
+        <label className="form-check-label" htmlFor="rsvpNo">No</label>
       </div>
     </form>
   );
@@ -226,15 +226,38 @@ const CuCreditPrompt = props => {
 
 
 const DDDeviceForm = props => {
+  const done = props.device_agreement_completed
   return (
-    <div className="item todo" id="device-form">
+    <div className={`item device-form ${done?'done':'todo'}`} id="device-form">
       <div className="icon"></div>
       <div className="card">
-        <p>This enrollment form serves as your authorization to receive a device from Digital Skills Detroit. Please complete within your first 2 Digital Skills Detroit sessions to be considered for your device upon program completion.</p>
-        <p><a href={props.device_agreement_url} className="p2pu-btn btn btn-primary">Complete enrollment form</a></p>
+        <button
+          className={`card-collapse-toggle ${done?' collapsed':''}`}
+          data-bs-toggle="collapse"
+          data-bs-target="#collapse-device-agreement"
+          type="button"
+          aria-expanded={!done} 
+          aria-controls="collapse-device-agreement"
+        >
+          <i className="fa fa-chevron-down"></i>
+        </button>
+        <div className="card-title">Device Agreement</div>
+        { done &&
+          <div className="collapse" id="collapse-device-agreement">
+            <p>Thank you for completing your device agreement form.</p>
+            <p><a href={props.device_agreement_url} className="p2pu-btn btn btn-primary">Update details</a></p>
+          </div>
+        }
+        { !done &&
+          <div className="collapse show" id="collapse-device-agreement">
+            <p>This enrollment form serves as your authorization to receive a device from Digital Skills Detroit. Please complete within your first 2 Digital Skills Detroit sessions to be considered for your device upon program completion.</p> 
+            <p><a href={props.device_agreement_url} className="p2pu-btn btn btn-primary">Complete enrollment form</a></p>
+          </div>
+        }
       </div>
     </div>
   );
+
 }
 
 
diff --git a/static/images/icons/device-white.svg b/static/images/icons/device-white.svg
new file mode 100644
index 000000000..b05af819b
--- /dev/null
+++ b/static/images/icons/device-white.svg
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="150"
+   height="150"
+   viewBox="0 0 39.687499 39.687499"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   sodipodi:docname="device-white.svg"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
+     id="defs2" /><sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="180"
+     inkscape:cy="109.64286"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1854"
+     inkscape:window-height="1011"
+     inkscape:window-x="66"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="px"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"><sodipodi:guide
+       position="19.844762,45.235366"
+       orientation="1,0"
+       id="guide822"
+       inkscape:locked="false" /><sodipodi:guide
+       position="-28.330569,19.777945"
+       orientation="0,1"
+       id="guide824"
+       inkscape:locked="false" /></sodipodi:namedview><metadata
+     id="metadata5"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-39.32143,-85.321427)"><path
+       style="fill:none;stroke:#ffffff;stroke-width:4.23333323;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 46.469743,108.91331 c -0.203621,0.70138 -0.787252,1.28182 -0.754954,2.04957 -0.116344,0.76487 -0.627234,1.40472 -0.726704,2.17241 -0.133146,0.48495 -0.414973,0.90855 -0.68302,1.32756 -0.06129,0.47837 -0.576167,0.69667 -0.745572,1.12706 -0.335928,0.52274 -0.650703,1.05888 -0.915424,1.62071 -0.306174,0.37503 -0.401654,0.84072 -0.524257,1.29397 -0.167315,0.37547 -0.0037,0.98042 0.506758,0.76064 0.87616,-0.0602 1.758078,-0.0182 2.632337,0.039 0.716782,0.12328 1.442158,0.24881 2.171589,0.17548 1.215644,-0.005 2.431006,0.0617 3.645616,0.0867 1.158293,0.1181 2.297305,0.44567 3.470145,0.39475 1.135389,0.0234 2.266709,0.14791 3.380392,0.36861 1.073877,0.17476 2.160687,0.26637 3.247743,0.28439 0.950337,0.0973 1.905629,0.004 2.858078,0.0336 1.961254,-0.58387 4.023629,-0.14448 6.025176,-0.37304 1.418222,-0.0129 2.834489,-0.12987 4.253389,-0.0874 0.471315,-3.9e-4 0.942631,-5.7e-4 1.413946,-3.7e-4 -0.294841,-1.53584 -1.047416,-2.94249 -1.314147,-4.48544 -0.56863,-1.22265 -0.0544,-2.62787 -0.532375,-3.87327 -0.187633,-0.67111 -0.1821,-1.40771 -0.51446,-2.0305 -0.442186,-0.44602 -1.099755,-0.13314 -1.63282,-0.0911 -0.558233,0.0675 -1.119722,9.9e-4 -1.678565,0.0687 -1.200414,0.0844 -2.404084,0.0975 -3.606522,0.0654 -2.359324,-0.006 -4.721298,0.0582 -7.078668,-0.0483 -1.357538,-0.18271 -2.735577,-0.13123 -4.090849,-0.33776 -1.180637,-0.0722 -2.367529,0.078 -3.545181,-0.0742 -0.658318,-0.10187 -1.326692,-0.057 -1.982862,-0.17381 -0.405869,-0.0744 -0.822325,-0.0551 -1.227903,-0.0974 -0.665129,-0.14831 -1.378676,-0.52811 -2.050886,-0.19597 z"
+       id="path1288" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:4.23333323;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 48.230892,89.36795 c -0.647643,2.093812 -0.499362,4.31464 -0.823857,6.461438 -0.21342,3.398303 -0.05753,6.814742 -0.429632,10.203862 0.02893,0.72715 -0.244836,1.52925 0.173489,2.1918 0.519022,0.5192 1.304279,0.32115 1.944899,0.22273 1.016786,-0.13247 2.044366,0.12186 3.061136,-0.0424 2.188902,-0.20093 4.364666,-0.70703 6.574266,-0.55253 3.299538,-0.0176 6.635922,-0.0889 9.882331,0.59832 1.530184,0.21923 3.075266,0.68331 4.629841,0.40327 0.577932,-0.48281 0.466225,-1.30473 0.373313,-1.96543 -0.149068,-1.27609 0.150366,-2.54668 0.317903,-3.80634 0.1372,-0.87886 0.210289,-1.76871 0.157025,-2.65767 0.0061,-1.458751 0.196053,-2.911133 0.159863,-4.371234 -0.0062,-1.511361 -0.03712,-3.024578 -0.02545,-4.534736 -0.07251,-0.497485 0.150243,-1.020972 -0.04497,-1.500359 -0.409581,-0.249427 -1.022771,-0.01705 -1.513811,-0.08028 -3.071192,0.04326 -6.14425,-0.05235 -9.210853,-0.197488 -1.192977,-0.206528 -2.418181,-0.02569 -3.607631,-0.269223 -2.023024,-0.274631 -4.067621,-0.269072 -6.104731,-0.261932 -1.553662,-0.0015 -3.107321,0.01265 -4.660978,0.0039 -0.252907,0.187175 -0.597801,-0.02866 -0.852157,0.154236 z"
+       id="path1290" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 48.70341,111.97949 c -0.289458,-0.0714 -0.54984,0.13077 -0.107905,0.0215 0.236168,-0.028 0.504455,-0.0257 0.107905,-0.0215 z"
+       id="path1292" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 51.345686,112.16738 c -0.27269,0.014 -1.213214,-0.39745 -0.870837,0.16798 0.450472,0.45844 0.49073,-0.16617 0.870837,-0.16798 z"
+       id="path1294" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 53.454022,111.50582 c -0.149723,0.37029 -0.40243,1.16922 0.223016,1.20036 0.48727,-0.10082 0.467198,-0.74392 -0.07775,-0.67918 -0.0975,-0.0182 -0.195814,-0.0313 -0.293785,-0.0466"
+       id="path1296" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 55.739811,112.04107 c -0.370363,0.37405 0.05602,1.04208 0.480943,0.59469 0.232188,-0.43502 0.207741,-0.7606 -0.480943,-0.59469 z"
+       id="path1298" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 58.316546,111.50279 c -0.205215,0.31174 -0.413329,1.03686 0.160177,1.05965 0.487162,-0.0544 1.029868,-0.61371 0.843966,-1.11853 -0.21432,-0.29426 -0.761164,-0.11572 -1.004143,0.0589 z"
+       id="path1300" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 60.968695,111.58491 c -0.334758,0.22554 -0.824787,1.03638 -0.166491,1.12855 0.421113,-0.009 0.822761,-0.74862 0.408774,-0.97507 -0.08563,-0.0419 -0.17806,-0.0793 -0.242283,-0.15348 z"
+       id="path1302" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 63.240189,111.6135 c -0.08582,0.33601 -0.379788,1.21717 0.218381,1.13351 0.570312,-0.26378 0.701481,-1.11652 -0.09175,-1.07547 l -0.0662,-0.0262 -0.06043,-0.0319 z"
+       id="path1304" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 65.840407,111.58911 c -0.356041,0.35661 0.03598,0.94908 0.504353,0.76558 0.345469,-0.0516 0.15945,-0.83211 -0.03774,-0.50895"
+       id="path1306" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 68.731715,111.70541 c -0.512745,-0.0835 -0.527948,0.54619 -0.04685,0.61028 0.41324,0.10182 0.192699,-0.47421 0.04685,-0.61028 z"
+       id="path1308" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 71.640083,111.56747 c -0.451394,-0.17273 -1.191587,0.2709 -0.570873,0.6449 0.192216,0.2148 0.996211,-0.14375 0.35817,-0.18238"
+       id="path1310" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 72.399063,113.94112 c -0.299404,-0.15427 -1.121463,0.19625 -0.714034,0.44674 0.298419,6e-5 0.556741,-0.20795 0.714034,-0.44674 z"
+       id="path1312" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 72.822759,115.55165 c -0.303028,-0.22623 -0.860041,0.13282 -0.242832,0.22675 0.279715,0.0598 0.384701,-0.36445 0.04843,-0.22722 0.183107,0.064 0.83135,0.38596 0.689824,2e-4 -0.162764,-0.0602 -0.333325,0.067 -0.495425,2.7e-4 z"
+       id="path1314" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 73.807707,117.60964 c -0.364864,0.5095 -1.073317,-0.097 -0.486211,-0.45989 0.425078,-0.27696 1.003096,-0.0557 0.486211,0.45989 z"
+       id="path1316" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 71.480594,117.81203 c -0.365757,-0.27375 -1.092138,-0.72778 -1.303614,-0.74955 0.499671,-0.0505 1.022362,8.1e-4 1.457966,0.2529 0.03335,0.18102 -0.276745,0.2532 -0.154352,0.49665 z"
+       id="path1318" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 70.548123,115.69235 c 0.111623,-0.67308 -1.265004,-0.34855 -0.579307,0.13383 0.229663,0.0312 0.707681,0.38231 0.579307,-0.13383 z"
+       id="path1320" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 69.480438,113.55458 c -0.39944,-0.0568 -0.892292,0.54043 -0.228924,0.55382 0.343912,0.20691 1.265416,0.14493 0.771959,-0.40934 -0.144925,-0.13399 -0.352668,-0.17093 -0.543035,-0.14448 z"
+       id="path1322" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 66.352476,113.42785 c -0.354205,-0.0992 -0.838919,0.54235 -0.230026,0.43423 0.184474,0.0496 1.359798,0.0634 0.775414,-0.3408"
+       id="path1324" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 67.0556,115.18388 c -0.359592,0.44959 0.492861,0.8365 0.808511,0.68298 0.147732,-0.0862 -0.242437,-0.85574 -0.308673,-0.55558"
+       id="path1326" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 68.186281,117.02927 c -0.366529,-0.0558 -1.284203,-0.0557 -0.777111,0.52663 0.301957,0.35384 0.849107,0.5415 1.286796,0.40632 0.234011,-0.33306 -0.129512,-0.91009 -0.509685,-0.93295 z"
+       id="path1328" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 64.480084,113.55103 c -0.314097,-0.0472 -1.295119,0.0225 -0.982958,0.42374 0.307768,0.26252 1.190725,0.0257 0.982958,-0.42374 z"
+       id="path1330" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 64.541256,115.08155 c -0.53623,-0.2241 -0.720403,0.52481 -0.168459,0.63092 0.339519,0.24491 1.267452,-0.0618 0.599693,-0.43061 -0.141763,-0.0711 -0.300126,-0.10834 -0.431234,-0.20031 z"
+       id="path1332" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 64.661806,117.07718 c 0.06279,0.35868 -0.660933,-0.34436 -0.354289,0.19184 0.265735,0.22584 0.974797,0.48027 1.136138,0.0985 -0.109058,-0.31797 -0.540767,-0.21422 -0.781849,-0.29031 z"
+       id="path1334" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 61.236183,113.34545 c -0.446517,0.10379 -0.906023,0.9548 -0.137771,0.8166 0.553929,-0.21309 0.456801,-0.47622 0.137771,-0.8166 z"
+       id="path1336" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 61.442238,115.09257 c -0.10167,0.40322 0.101148,1.1054 0.622649,0.76461 0.321496,-0.47606 -0.06288,-0.9787 -0.622649,-0.76461 z"
+       id="path1338" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 61.377325,117.00672 c 0.03598,0.46205 0.685993,0.61806 0.675621,1.08453 0.215779,-0.33324 0.125939,-0.96043 -0.241651,-1.18397 -0.127846,-0.021 -0.26515,0.15938 -0.43397,0.0994 z"
+       id="path1340" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 58.689884,113.76012 c -0.354174,0.26714 -0.04387,1.24844 0.364198,0.73908 0.232173,-0.35809 0.234016,-0.98379 -0.364198,-0.73908 z"
+       id="path1342" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 58.399781,115.25204 c -0.119792,0.46512 0.125753,1.13603 0.690284,0.76365 0.55263,-0.35103 -0.07612,-0.65668 -0.461107,-0.61425 -0.08893,-0.0257 -0.170838,-0.077 -0.229177,-0.1494 z"
+       id="path1344" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 58.32741,117.25758 c -0.315699,0.44982 0.789708,0.56435 0.287047,0.0946 -0.09021,-0.0472 -0.191613,-0.0622 -0.287047,-0.0946 z"
+       id="path1346" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 56.248925,113.73496 c -0.30706,-0.20537 -1.178893,0.13377 -0.74023,0.48077 0.309758,0.1397 0.833679,-0.0853 0.74023,-0.48077 z"
+       id="path1348" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 55.621575,115.33032 c -0.270647,0.26402 0.190062,0.98422 0.260236,0.41467 -0.05236,-0.15851 -0.200533,-0.26005 -0.260236,-0.41467 z"
+       id="path1350" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 54.99377,117.33146 c -0.286893,0.53616 0.809,0.85795 0.644792,0.14978 -0.166176,-0.28597 -0.371939,-0.44882 -0.644792,-0.14978 z"
+       id="path1352" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 53.11876,113.53263 c -0.546614,-0.32369 -0.691232,0.53095 -0.15952,0.63132 0.214091,-0.0771 0.05025,-0.44718 0.15952,-0.63132 z"
+       id="path1354" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 52.705545,115.29099 c 0.134751,0.31492 -0.550999,-0.20953 -0.337054,0.28827 0.135583,0.43829 0.812625,-0.0436 0.337054,-0.28827 z"
+       id="path1356" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 52.443699,117.15624 c -0.298219,-0.13637 -1.006177,0.22608 -0.435239,0.40675 0.253003,0.0391 0.310637,-0.25836 0.435239,-0.40675 z"
+       id="path1358" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 50.022639,115.16788 c -0.406964,-0.196 -1.194781,0.5039 -0.426226,0.45969 0.219643,-0.0386 0.435382,-0.22112 0.426226,-0.45969 z"
+       id="path1360" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 50.205182,113.4306 c -0.149492,0.20555 -0.888682,0.52063 -0.29047,0.68155 0.305933,-0.008 0.802836,-0.53999 0.29047,-0.68155 z"
+       id="path1362" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 47.532037,113.59654 c -0.510638,0.35252 0.172958,0.95408 0.433859,0.35517 0.180329,-0.28306 -0.03457,-0.41166 -0.290377,-0.3173"
+       id="path1364" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 47.11578,115.31708 c -0.551656,0.0232 0.123269,0.90293 0.166859,0.22833 0.0568,-0.13759 0.0589,-0.48427 -0.166859,-0.22833 z"
+       id="path1366" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 45.906623,117.02731 c -0.696082,0.27267 0.224522,1.0287 0.467084,0.4099 0.11883,-0.42285 -0.286621,-0.25297 -0.467084,-0.4099 z"
+       id="path1368" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 48.786995,117.23446 c -0.419546,-0.31428 -0.70584,0.62894 -0.128529,0.37976 0.31909,0.10194 0.240838,-0.22493 0.128529,-0.37976 z"
+       id="path1370" /></g></svg>
diff --git a/static/sass/_lc-manage.scss b/static/sass/_lc-manage.scss
index f6c18ce08..a0603abe3 100644
--- a/static/sass/_lc-manage.scss
+++ b/static/sass/_lc-manage.scss
@@ -195,6 +195,18 @@ button.card-collapse-toggle {
   background: url("../images/icons/credit-white.svg") center center / 0.8em 0.8em no-repeat, $p2pu-blue;
 }
 
+.lc-timeline .item.device-form.todo .icon::before{
+  @include timeline-item;
+  content: '';
+  background: url("../images/icons/device-white.svg") center center / 0.8em 0.8em no-repeat, $p2pu-yellow;
+}
+
+
+.lc-timeline .item.device-form .icon::before{
+  @include timeline-item;
+  content: '';
+  background: url("../images/icons/device-white.svg") center center / 0.8em 0.8em no-repeat, $p2pu-blue;
+}
 
 
 

From 8cafaf471318b3909811a364b5a1ebefafc72e3d Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 22 Jan 2026 14:24:50 +0200
Subject: [PATCH 44/63] Add previously completed data to device form when
 editing/updating info

---
 studygroups/views/learner.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index f2a1c1fb7..ae59d535f 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -180,13 +180,18 @@ def get_initial(self):
         study_group_id = self.kwargs.get('study_group_id')
         study_group = get_object_or_404(StudyGroup, pk=study_group_id)
         application = study_group.application_set.active().filter(email=self.request.user.email).first()
-        # TODO load initial from signup_questions
         initial = {
             "email_address": application.email,
             "first_name": application.name,
         }
+
         if application.mobile:
             initial["phone_number"] = mobile
+
+        application_data = json.loads(application.signup_questions)
+        if 'device_agreement' in application_data:
+            initial.update(application_data.get('device_agreement'))
+
         return initial
 
 

From 4e2b352f598cb4ad9e6788c76bff678c0324943a Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 22 Jan 2026 15:43:17 +0200
Subject: [PATCH 45/63] Update form to use Django form definition and
 crispyforms for rendering

---
 studygroups/forms.py                          |  5 +-
 .../studygroups/dd_device_agreement.html      | 66 ++++++-------------
 2 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/studygroups/forms.py b/studygroups/forms.py
index 2f6561a60..e469dcebd 100644
--- a/studygroups/forms.py
+++ b/studygroups/forms.py
@@ -559,7 +559,8 @@ class DigitalSkillsEnrollmentForm(forms.Form):
     housing_network_consent = forms.ChoiceField(
         choices=CONSENT_CHOICES,
         required=True,
-        widget=forms.RadioSelect(attrs={'class': 'form-check-input'})
+        widget=forms.RadioSelect(attrs={'class': 'form-check-input'}),
+        label=""
     )
     
     # Disclosures and Privacy Policy
@@ -579,12 +580,12 @@ class DigitalSkillsEnrollmentForm(forms.Form):
     signature = forms.CharField(
         max_length=200,
         required=True,
-        label='Signature (Type your full name)',
         widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'Type your full name'})
     )
     
     signature_date = forms.DateField(
         required=True,
+        label='Date',
         widget=forms.DateInput(attrs={'class': 'form-control', 'type': 'date'})
     )
 
diff --git a/templates/studygroups/dd_device_agreement.html b/templates/studygroups/dd_device_agreement.html
index 0a45f0527..ee9fe40ac 100644
--- a/templates/studygroups/dd_device_agreement.html
+++ b/templates/studygroups/dd_device_agreement.html
@@ -34,9 +34,13 @@
             text-align: center;
             margin-bottom: 30px;
         }
-        .required-field::after {
-            content: " *";
-            color: red;
+
+        .asteriskField {
+          margin-left: 6px;
+          color: red;
+        }
+        .form-label {
+          text-transform: capitalize;
         }
         @media print {
             body {
@@ -65,34 +69,28 @@ <h5 class="section-title">Learner Contact Information</h5>
                 
                 <div class="row mb-3">
                     <div class="col-md-12">
-                        <label for="firstName" class="form-label required-field">First Name</label>
-                        {{ form.first_name }}
+                        {{ form.first_name | as_crispy_field }}
                     </div>
                     <div class="col-md-12">
-                        <label for="lastName" class="form-label required-field">Last Name</label>
-                        {{ form.last_name }}
+                        {{ form.last_name | as_crispy_field }}
                     </div>
                 </div>
 
                 <div class="row mb-3">
                     <div class="col-md-12">
-                        <label for="dob" class="form-label required-field">Date of Birth</label>
-                        {{ form.date_of_birth }}
+                        {{ form.date_of_birth | as_crispy_field }}
                     </div>
                     <div class="col-md-12">
-                        <label for="phone" class="form-label required-field">Phone Number</label>
-                        {{ form.phone_number }}
+                        {{ form.phone_number | as_crispy_field }}
                     </div>
                 </div>
 
                 <div class="mb-3">
-                    <label for="email" class="form-label required-field">Email Address</label>
-                    {{ form.email_address }}
+                    {{ form.email_address | as_crispy_field }}
                 </div>
 
                 <div class="mb-3">
-                    <label for="address" class="form-label required-field">Home Address</label>
-                    <textarea class="form-control" id="address" rows="2" name="home_address" required></textarea>
+                    {{ form.home_address | as_crispy_field }}
                 </div>
 
                 <!-- Demographic Information -->
@@ -100,8 +98,7 @@ <h5 class="section-title">Demographic Information</h5>
                 <p class="text-muted">Optional</p>
                 
                 <div class="mb-3">
-                    <label for="gender" class="form-label">Gender</label>
-                    {{ form.gender }}
+                    {{ form.gender | as_crispy_field }}
                 </div>
 
                 <!-- Agreement -->
@@ -116,55 +113,32 @@ <h5 class="section-title">Agreement</h5>
 
                 <!-- Consent -->
                 <h5 class="section-title">Consent</h5>
-                <p class="required-field">Please select one of the following</p>
+                <p class="requiredField">Please select one of the following:</p>
                 
                 <div class="mb-3">
-                    <div class="form-check">
-                        <input name="housing_network_consent" class="form-check-input" type="radio" name="consent" id="consentNo" value="no" required>
-                        <label class="form-check-label" for="consentNo">
-                            I do not consent to being contacted by the Detroit Housing Network to learn more about additional housing resources and opportunities that may benefit me.
-                        </label>
-                    </div>
-                    <div class="form-check">
-                        <input name="housing_network_consent" class="form-check-input" type="radio" name="consent" id="consentYes" value="yes" required>
-                        <label class="form-check-label" for="consentYes">
-                            I consent to being contacted by the Detroit Housing Network to learn more about additional housing resources and opportunities that may benefit me.
-                        </label>
-                    </div>
+                    {{ form.housing_network_consent | as_crispy_field }}
                 </div>
 
                 <!-- Disclosures and Privacy Policy -->
                 <h5 class="section-title">Disclosures and Privacy Policy</h5>
                 
                 <div class="mb-3">
-                    <div class="form-check">
-                        <input name="disclosure_certification" class="form-check-input" type="checkbox" id="disclosure" required>
-                        <label class="form-check-label" for="disclosure">
-                            By submitting your information you are certifying that all information is correct to the best of your knowledge and that you reviewed the Disclosures and Detroit Housing Network (DHN) Privacy Policy.
-                        </label>
-                    </div>
+                      {{ form.disclosure_certification | as_crispy_field }}
                 </div>
 
                 <!-- Learner Signature -->
                 <h5 class="section-title">Learner Signature</h5>
                 
                 <div class="mb-3">
-                    <div class="form-check">
-                        <input name="signature_acknowledgment" class="form-check-input" type="checkbox" id="signatureAck" required>
-                        <label class="form-check-label required-field" for="signatureAck">
-                            I have read and understood the terms of this agreement.
-                        </label>
-                    </div>
+                    {{ form.signature_acknowledgment | as_crispy_field}}
                 </div>
 
                 <div class="row mb-3">
                     <div class="col-md-8">
-                        <label for="signature" class="form-label required-field">Signature</label>
-                        <input name="signature" type="text" class="form-control" id="signature" placeholder="Type your full name" required>
+                        {{ form.signature | as_crispy_field }}
                     </div>
                     <div class="col-md-4">
-                        <label for="signatureDate" class="form-label required-field">Date</label>
-                        <input name="signature_date" type="date" class="form-control" id="signatureDate" required>
+                        {{ form.signature_date | as_crispy_field }}
                     </div>
                 </div>
 

From 5063f48d5b72c86eb80ba6a0205e3da1e04ada6d Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 23 Jan 2026 13:34:40 +0200
Subject: [PATCH 46/63] Use phonenumber field on Django form to validate phone
 numbers

---
 studygroups/forms.py         | 3 ++-
 studygroups/views/learner.py | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/studygroups/forms.py b/studygroups/forms.py
index e469dcebd..129566471 100644
--- a/studygroups/forms.py
+++ b/studygroups/forms.py
@@ -532,9 +532,10 @@ class DigitalSkillsEnrollmentForm(forms.Form):
         widget=forms.DateInput(attrs={'class': 'form-control', 'type': 'date'})
     )
     
-    phone_number = forms.CharField(
+    phone_number = PhoneNumberField(
         max_length=15,
         required=True,
+        region="US",
         widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': '(123) 456-7890'})
     )
     
diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index ae59d535f..db2925172 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -204,6 +204,7 @@ def form_valid(self, form):
             email=self.request.user.email
         ).first()
         application_data = json.loads(application.signup_questions)
+        form.cleaned_data['phone_number'] = str(form.cleaned_data['phone_number'])
         application_data['device_agreement'] = form.cleaned_data
         application.signup_questions = json.dumps(application_data, cls=DjangoJSONEncoder)
         application.save()

From e2c004f9fd2105af4cc58cb59d450134ab71b111 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 29 Jan 2026 11:44:51 +0200
Subject: [PATCH 47/63] Only show device agreement forms to learning circles
 that qualify

---
 studygroups/views/learner.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index db2925172..e2f2e4d67 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -441,11 +441,17 @@ def _message_to_dict(message):
             }
         }
 
-        # TODO check if learning circle meets requirements for devices
-        react_data['device_agreement_url'] = reverse('studygroups_device_agreement', args=(study_group.pk,))
-        application_data = json.loads(application.signup_questions)
-        if application_data.get('device_agreement'):
-            react_data['device_agreement_completed'] = True
+        # check if learning circle meets requirements for devices
+        def device_agreement_conditions():
+            yield study_group.team
+            yield study_group.team.page_slug == 'digital-detroit'
+            yield study_group.start_date > datetime.date(2026,1,1)
+
+        if all(device_agreement_conditions()):
+            react_data['device_agreement_url'] = reverse('studygroups_device_agreement', args=(study_group.pk,))
+            application_data = json.loads(application.signup_questions)
+            if application_data.get('device_agreement'):
+                react_data['device_agreement_completed'] = True
 
         context['react_data'] = react_data
 

From 2d5211878c0d669cd5f833fd3293dafc1c69740b Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 29 Jan 2026 13:33:02 +0200
Subject: [PATCH 48/63] Consistently use device agreement terminology

---
 frontend/components/participant-dash.jsx       | 4 ++--
 studygroups/forms.py                           | 3 ++-
 studygroups/views/learner.py                   | 6 +++---
 templates/studygroups/dd_device_agreement.html | 6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/frontend/components/participant-dash.jsx b/frontend/components/participant-dash.jsx
index d2f3ade2f..a70a48bfa 100644
--- a/frontend/components/participant-dash.jsx
+++ b/frontend/components/participant-dash.jsx
@@ -250,8 +250,8 @@ const DDDeviceForm = props => {
         }
         { !done &&
           <div className="collapse show" id="collapse-device-agreement">
-            <p>This enrollment form serves as your authorization to receive a device from Digital Skills Detroit. Please complete within your first 2 Digital Skills Detroit sessions to be considered for your device upon program completion.</p> 
-            <p><a href={props.device_agreement_url} className="p2pu-btn btn btn-primary">Complete enrollment form</a></p>
+            <p>This form serves as your authorization to receive a device from Digital Skills Detroit. Please complete within your first 2 Digital Skills Detroit sessions to be considered for your device upon program completion.</p> 
+            <p><a href={props.device_agreement_url} className="p2pu-btn btn btn-primary">Complete device agreement</a></p>
           </div>
         }
       </div>
diff --git a/studygroups/forms.py b/studygroups/forms.py
index 129566471..62a9a7556 100644
--- a/studygroups/forms.py
+++ b/studygroups/forms.py
@@ -499,7 +499,8 @@ class Meta:
         }
 
 
-class DigitalSkillsEnrollmentForm(forms.Form):
+class DeviceAgreementForm(forms.Form):
+    """ Form for Digital Detroit project device distribution """
     GENDER_CHOICES = [
         ('', 'Select...'),
         ('male', 'Male'),
diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index e2f2e4d67..c7a21970a 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -37,7 +37,7 @@
 from studygroups.forms import ApplicationForm
 from studygroups.forms import OptOutForm
 from studygroups.forms import OptOutConfirmationForm
-from studygroups.forms import DigitalSkillsEnrollmentForm
+from studygroups.forms import DeviceAgreementForm
 from studygroups.utils import check_rsvp_signature
 from studygroups.utils import check_unsubscribe_signature
 from studygroups.views.api import serialize_learning_circle
@@ -152,7 +152,7 @@ def conditions():
 @method_decorator(login_required, name="dispatch")
 class DeviceAgreementView(FormView):
     template_name = 'studygroups/dd_device_agreement.html'
-    form_class = DigitalSkillsEnrollmentForm
+    form_class = DeviceAgreementForm
 
     def dispatch(self, request, *args, **kwargs):
         study_group_id = self.kwargs.get('study_group_id')
@@ -186,7 +186,7 @@ def get_initial(self):
         }
 
         if application.mobile:
-            initial["phone_number"] = mobile
+            initial["phone_number"] = application.mobile
 
         application_data = json.loads(application.signup_questions)
         if 'device_agreement' in application_data:
diff --git a/templates/studygroups/dd_device_agreement.html b/templates/studygroups/dd_device_agreement.html
index ee9fe40ac..930dc0cb9 100644
--- a/templates/studygroups/dd_device_agreement.html
+++ b/templates/studygroups/dd_device_agreement.html
@@ -59,11 +59,11 @@
         <div class="form-container">
             <div class="header">
                 <h2 class="text-primary">Digital Skills Detroit</h2>
-                <h4>Enrollment Form</h4>
-                <p class="text-muted">This enrollment form serves as your authorization to receive a device from Digital Skills Detroit. Please complete within your first 2 Digital Skills Detroit sessions to be considered for your device upon program completion.</p>
+                <h4>Device Agreement</h4>
+                <p class="text-muted">This agreement serves as your authorization to receive a device from Digital Skills Detroit. Please complete within your first 2 Digital Skills Detroit sessions to be considered for your device upon program completion.</p>
             </div>
 
-            <form id="enrollmentForm" method="POST">
+            <form id="device-agreement-form" method="POST">
               {% csrf_token %}
                 <h5 class="section-title">Learner Contact Information</h5>
                 

From 6241b890e2ad5cfff1feedd20a63614ece86a781 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 29 Jan 2026 13:41:16 +0200
Subject: [PATCH 49/63] Check conditions on device agreement form view

---
 studygroups/views/learner.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index c7a21970a..8885167e1 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -158,10 +158,8 @@ def dispatch(self, request, *args, **kwargs):
         study_group_id = self.kwargs.get('study_group_id')
         study_group = get_object_or_404(StudyGroup, pk=study_group_id)
 
-        # TODO ensure learning circle meets criteria
-
-        # ensure viewer is signed up
-        if not study_group.application_set.active().filter(email=self.request.user.email).exists():
+        # ensure viewer is signed up and learning circle meets criteria
+        if not study_group.application_set.active().filter(email=self.request.user.email).exists() or not all(show_device_agreement(study_group)):
             url = reverse('studygroups_facilitator')
             return http.HttpResponseRedirect(url)
 
@@ -340,6 +338,13 @@ def receive_sms(request):
     return http.HttpResponse(status=200)
 
 
+# check if learning circle meets requirements for devices
+def show_device_agreement(study_group):
+    yield study_group.team
+    yield study_group.team.page_slug == 'digital-detroit'
+    yield study_group.start_date > datetime.date(2026,1,1)
+
+
 @method_decorator(login_required, name="dispatch")
 class StudyGroupParticipantView(TemplateView):
     template_name = 'studygroups/learning_circle_participant.html'
@@ -441,13 +446,7 @@ def _message_to_dict(message):
             }
         }
 
-        # check if learning circle meets requirements for devices
-        def device_agreement_conditions():
-            yield study_group.team
-            yield study_group.team.page_slug == 'digital-detroit'
-            yield study_group.start_date > datetime.date(2026,1,1)
-
-        if all(device_agreement_conditions()):
+        if all(show_device_agreement(study_group)):
             react_data['device_agreement_url'] = reverse('studygroups_device_agreement', args=(study_group.pk,))
             application_data = json.loads(application.signup_questions)
             if application_data.get('device_agreement'):

From 80b2f7a13a0d284abd9cc7bc2db46422914a265e Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Thu, 29 Jan 2026 17:12:04 +0200
Subject: [PATCH 50/63] Display task for facilitators about device agreement
 forms

---
 static/sass/_lc-manage.scss                 | 25 ++++++++++++++++
 studygroups/models/learningcircle.py        | 18 ++++++++++++
 studygroups/views/learner.py                | 11 ++-----
 templates/studygroups/view_study_group.html | 32 +++++++++++++++++++++
 4 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/static/sass/_lc-manage.scss b/static/sass/_lc-manage.scss
index a0603abe3..5edff5176 100644
--- a/static/sass/_lc-manage.scss
+++ b/static/sass/_lc-manage.scss
@@ -265,6 +265,31 @@ button.card-collapse-toggle {
   }
 }
 
+
+.device-agreements {
+  padding: 1em;
+  background: $gray-light;
+
+  ul {
+    margin: 0;
+  }
+
+  li.pending::before {
+    @include rsvp-li;
+    content: '';
+    background: url("../images/icons/clock.svg") left center / 1em 1em no-repeat;
+  }
+
+  li.done::before {
+    @include rsvp-li;
+    content: '';
+    background: url("../images/icons/rsvp-yes.svg") left center / 1em 1em no-repeat;
+  }
+
+
+}
+
+
 .card-collapse-toggle {
   position: absolute;
   top: 20px;
diff --git a/studygroups/models/learningcircle.py b/studygroups/models/learningcircle.py
index 28d95409e..e7e805c1d 100644
--- a/studygroups/models/learningcircle.py
+++ b/studygroups/models/learningcircle.py
@@ -222,6 +222,19 @@ def at_capacity(self):
         return signup_count >= self.signup_limit
 
 
+    # check if learning circle meets requirements for devices
+    def show_device_agreement(self):
+        def conditions():
+            yield self.team
+            yield self.team.page_slug == 'digital-detroit'
+            yield self.start_date > datetime.date(2026,1,1)
+        return all(conditions())
+
+
+    def device_forms_completed(self):
+        return all([a.device_agreement_completed() for a in self.application_set.active()])
+
+
     def to_dict(self):
         sg = self  # TODO - this logic is repeated in the API class
         facilitators = [f.user.first_name for f in sg.facilitator_set.all()]
@@ -346,6 +359,11 @@ def digital_literacy_for_display(self):
         answers = json.loads(self.signup_questions)
         return { q: {'question_text': text, 'answer': answers.get(q), 'answer_text': dict(self.DIGITAL_LITERACY_CHOICES).get(answers.get(q)) if q in answers else ''} for q, text in list(self.DIGITAL_LITERACY_QUESTIONS.items()) if answers.get(q) }
 
+    def device_agreement_completed(self):
+        application_data = json.loads(self.signup_questions)
+        return len(application_data.get('device_agreement', '')) > 3
+
+
 
 class Meeting(LifeTimeTrackingModel):
     study_group = models.ForeignKey('studygroups.StudyGroup', on_delete=models.CASCADE)
diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index 8885167e1..e0237b21b 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -159,7 +159,7 @@ def dispatch(self, request, *args, **kwargs):
         study_group = get_object_or_404(StudyGroup, pk=study_group_id)
 
         # ensure viewer is signed up and learning circle meets criteria
-        if not study_group.application_set.active().filter(email=self.request.user.email).exists() or not all(show_device_agreement(study_group)):
+        if not study_group.application_set.active().filter(email=self.request.user.email).exists() or not study_group.show_device_agreement():
             url = reverse('studygroups_facilitator')
             return http.HttpResponseRedirect(url)
 
@@ -338,13 +338,6 @@ def receive_sms(request):
     return http.HttpResponse(status=200)
 
 
-# check if learning circle meets requirements for devices
-def show_device_agreement(study_group):
-    yield study_group.team
-    yield study_group.team.page_slug == 'digital-detroit'
-    yield study_group.start_date > datetime.date(2026,1,1)
-
-
 @method_decorator(login_required, name="dispatch")
 class StudyGroupParticipantView(TemplateView):
     template_name = 'studygroups/learning_circle_participant.html'
@@ -446,7 +439,7 @@ def _message_to_dict(message):
             }
         }
 
-        if all(show_device_agreement(study_group)):
+        if study_group.show_device_agreement():
             react_data['device_agreement_url'] = reverse('studygroups_device_agreement', args=(study_group.pk,))
             application_data = json.loads(application.signup_questions)
             if application_data.get('device_agreement'):
diff --git a/templates/studygroups/view_study_group.html b/templates/studygroups/view_study_group.html
index cc199fea6..e57709c03 100644
--- a/templates/studygroups/view_study_group.html
+++ b/templates/studygroups/view_study_group.html
@@ -97,6 +97,38 @@ <h1>{% if study_group.draft %}[DRAFT] {% endif %}{{study_group.name}}</h1>
           </div>
         </div>
       </div>
+
+      {% if study_group.show_device_agreement %}
+
+      <div class="item {% if study_group.device_forms_completed %}done{% else %}todo{% endif %}">
+        <div class="icon"></div>
+        <div class="card">
+          <a class="card-collapse-toggle {% if study_group.device_forms_completed %}collapsed{% endif %}" data-bs-toggle="collapse" href="#collapse-device-agreement" role="button" aria-expanded="true" aria-controls="collapse-device-agreement"><i class="fa fa-chevron-down"></i></a>
+          <div class="card-title">Gather device agreement forms</div>
+          <div class="collapse{% if not study_group.device_forms_completed %}.show{% endif %}" id="collapse-device-agreement">
+            {% if not study_group.device_forms_completed %}
+              <!--div class="meeting-item todo"-->
+                <p>Some learners still need to complete their device agreement form</p>
+                <div class="device-agreements">
+                  <ul class="list-unstyled">
+                    {% for learner in study_group.application_set.active %}
+                      <li class="{% if learner.device_agreement_completed %}done{% else %}pending{% endif %}">{{learner.name}} &lt;{{learner.email}}&gt;{% if learner.mobile %}{{learner.mobile}}{% endif %}</li>
+                    {% endfor %}
+                  </ul>
+                </div>
+              <!--/div-->
+            {% else %}
+              <div class="meeting-item done">
+                <p>All learners completed their device agreement form!</p>
+                </p>
+              </div>
+            {% endif %}
+          </div>
+        </div>
+      </div>
+      {% endif %}
+
+
       {% for meeting in study_group.meetings %}
       {% with meeting_status=meeting.status feedback=meeting.feedback_set.first %}
       <div class="item {{ meeting_status }}" id="meeting-{{forloop.counter}}">

From 29f42d692c5361160be7e81a4520e600ed84401b Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 30 Jan 2026 11:28:04 +0200
Subject: [PATCH 51/63] Update copy and tweak markup for facilitator device
 agreement prompt

---
 templates/studygroups/view_study_group.html | 25 ++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/templates/studygroups/view_study_group.html b/templates/studygroups/view_study_group.html
index e57709c03..32f620dff 100644
--- a/templates/studygroups/view_study_group.html
+++ b/templates/studygroups/view_study_group.html
@@ -103,24 +103,23 @@ <h1>{% if study_group.draft %}[DRAFT] {% endif %}{{study_group.name}}</h1>
       <div class="item {% if study_group.device_forms_completed %}done{% else %}todo{% endif %}">
         <div class="icon"></div>
         <div class="card">
-          <a class="card-collapse-toggle {% if study_group.device_forms_completed %}collapsed{% endif %}" data-bs-toggle="collapse" href="#collapse-device-agreement" role="button" aria-expanded="true" aria-controls="collapse-device-agreement"><i class="fa fa-chevron-down"></i></a>
+          <a class="card-collapse-toggle {% if study_group.device_forms_completed %}collapsed{% endif %}" data-bs-toggle="collapse" href="#collapse-device-agreement" role="button" aria-expanded="{% if study_group.device_forms_completed %}false{% else %}true{% endif %}" aria-controls="collapse-device-agreement"><i class="fa fa-chevron-down"></i></a>
           <div class="card-title">Gather device agreement forms</div>
-          <div class="collapse{% if not study_group.device_forms_completed %}.show{% endif %}" id="collapse-device-agreement">
+          <div class="collapse{% if not study_group.device_forms_completed %} show{% endif %}" id="collapse-device-agreement">
             {% if not study_group.device_forms_completed %}
-              <!--div class="meeting-item todo"-->
-                <p>Some learners still need to complete their device agreement form</p>
-                <div class="device-agreements">
-                  <ul class="list-unstyled">
-                    {% for learner in study_group.application_set.active %}
-                      <li class="{% if learner.device_agreement_completed %}done{% else %}pending{% endif %}">{{learner.name}} &lt;{{learner.email}}&gt;{% if learner.mobile %}{{learner.mobile}}{% endif %}</li>
-                    {% endfor %}
-                  </ul>
-                </div>
-              <!--/div-->
+              <p>Please help the following learners to complete their device agreement form.</p>
+              <div class="device-agreements">
+                <ul class="list-unstyled">
+                  {% for learner in study_group.application_set.active %}
+                    {% if not learner.device_agreement_completed %}
+                      <li class="pending">{{learner.name}} &lt;{{learner.email}}&gt;{% if learner.mobile %} {{learner.mobile}}{% endif %}</li>
+                    {% endif %}
+                  {% endfor %}
+                </ul>
+              </div>
             {% else %}
               <div class="meeting-item done">
                 <p>All learners completed their device agreement form!</p>
-                </p>
               </div>
             {% endif %}
           </div>

From 4139f3b1b712d1af2e964c7f12fa12729a7cb206 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 30 Jan 2026 11:37:40 +0200
Subject: [PATCH 52/63] Remove unused CSS since only displaying learners with
 outstanding device agreement forms

---
 static/sass/_lc-manage.scss | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/static/sass/_lc-manage.scss b/static/sass/_lc-manage.scss
index 5edff5176..f9f62fd1c 100644
--- a/static/sass/_lc-manage.scss
+++ b/static/sass/_lc-manage.scss
@@ -280,13 +280,6 @@ button.card-collapse-toggle {
     background: url("../images/icons/clock.svg") left center / 1em 1em no-repeat;
   }
 
-  li.done::before {
-    @include rsvp-li;
-    content: '';
-    background: url("../images/icons/rsvp-yes.svg") left center / 1em 1em no-repeat;
-  }
-
-
 }
 
 

From ce88613f8de808fdb3b6cb0b404152370c67b439 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 30 Jan 2026 11:40:28 +0200
Subject: [PATCH 53/63] change list to generator

---
 studygroups/models/learningcircle.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/studygroups/models/learningcircle.py b/studygroups/models/learningcircle.py
index e7e805c1d..e46674ca7 100644
--- a/studygroups/models/learningcircle.py
+++ b/studygroups/models/learningcircle.py
@@ -232,7 +232,7 @@ def conditions():
 
 
     def device_forms_completed(self):
-        return all([a.device_agreement_completed() for a in self.application_set.active()])
+        return all((a.device_agreement_completed() for a in self.application_set.active()))
 
 
     def to_dict(self):

From 75491033f4049995b19aec22ee7a3685bb0d4864 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Fri, 30 Jan 2026 15:58:17 +0200
Subject: [PATCH 54/63] Basic model and logic for managing device allocations

---
 studygroups/admin.py                          |  7 +++
 .../migrations/0179_deviceallocation.py       | 26 ++++++++++
 studygroups/models/__init__.py                |  1 +
 studygroups/models/device_allocation.py       | 51 +++++++++++++++++++
 4 files changed, 85 insertions(+)
 create mode 100644 studygroups/migrations/0179_deviceallocation.py
 create mode 100644 studygroups/models/device_allocation.py

diff --git a/studygroups/admin.py b/studygroups/admin.py
index 6286918c1..9d49c2a3d 100644
--- a/studygroups/admin.py
+++ b/studygroups/admin.py
@@ -16,6 +16,7 @@
 from studygroups.models import TeamInvitation
 from studygroups.models import Announcement
 from studygroups.models import FacilitatorGuide
+from studygroups.models import DeviceAllocation
 
 
 class ApplicationInline(admin.TabularInline):
@@ -173,6 +174,11 @@ class MeetingAdmin(admin.ModelAdmin):
     raw_id_fields = ['study_group']
     exclude = []
 
+class DeviceAllocationAdmin(admin.ModelAdmin):
+    list_display = ['user', 'amount', 'start_date', 'cutoff_date']
+    raw_id_fields = ['user']
+    exclude = []
+
 
 admin.site.register(Course, CourseAdmin)
 admin.site.register(CourseList, CourseListAdmin)
@@ -186,3 +192,4 @@ class MeetingAdmin(admin.ModelAdmin):
 admin.site.register(Profile, ProfileAdmin)
 admin.site.register(Announcement)
 admin.site.register(FacilitatorGuide, FacilitatorGuideAdmin)
+admin.site.register(DeviceAllocation, DeviceAllocationAdmin)
diff --git a/studygroups/migrations/0179_deviceallocation.py b/studygroups/migrations/0179_deviceallocation.py
new file mode 100644
index 000000000..09920192b
--- /dev/null
+++ b/studygroups/migrations/0179_deviceallocation.py
@@ -0,0 +1,26 @@
+# Generated by Django 4.2.11 on 2026-01-30 13:13
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('studygroups', '0178_feedback_granular_attendance'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DeviceAllocation',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('start_date', models.DateField()),
+                ('cutoff_date', models.DateField()),
+                ('amount', models.PositiveIntegerField(default=0)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
diff --git a/studygroups/models/__init__.py b/studygroups/models/__init__.py
index d07386674..fab4391d8 100644
--- a/studygroups/models/__init__.py
+++ b/studygroups/models/__init__.py
@@ -27,6 +27,7 @@
 from .learningcircle import Rsvp
 from .learningcircle import Feedback
 from .facilitator_guide import FacilitatorGuide
+from .device_allocation import DeviceAllocation
 
 import datetime
 import pytz
diff --git a/studygroups/models/device_allocation.py b/studygroups/models/device_allocation.py
new file mode 100644
index 000000000..19ce6853c
--- /dev/null
+++ b/studygroups/models/device_allocation.py
@@ -0,0 +1,51 @@
+# coding=utf-8
+from django.contrib.auth.models import User
+
+from django.db import models
+
+from studygroups.models import Facilitator
+from studygroups.models import StudyGroup
+
+
+
+# this is the model we use
+class DeviceAllocation(models.Model):
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    start_date = models.DateField()
+    cutoff_date = models.DateField()
+    amount = models.PositiveIntegerField(default=0)
+
+    def __str__(self):
+        return f'{self.user.first_name} - {self.amount} device(s)'
+
+
+def devices_available(learning_circle):
+    facilitator_user_ids = learning_circle.facilitator_set.all().values_list('user_id')
+    study_group_ids = Facilitator.objects.all().filter(user_id__in=facilitator_user_ids).values_list('study_group_id')
+
+    device_allocations = DeviceAllocation.objects.filter(user_id__in=facilitator_user_ids)
+
+    # Get min of start_date for device allocations
+    first_date = min([da.start_date for da in device_allocations])
+    # Get max of cutoff_date for device allocations
+    cutoff_date = max([da.cutoff_date for da in device_allocations])
+
+    amount = sum([da.amount for da in device_allocations])
+
+    other_lcs = StudyGroup.objects.active().filter(
+        pk__in=study_group_ids,
+        start_date__gte=first_date,
+        end_date__lt=cutoff_date,
+    )
+    other_lcs = other_lcs.exclude(pk=learning_circle.pk)
+
+    # count limits for other learning circles
+    # TODO ensure there are no unlimted signups for other learning circles!
+    total = sum(filter(lambda x: x, [lc.signup_limit for lc in other_lcs]))
+    if amount > total:
+        return amount-total
+    return 0
+
+
+
+

From a77c651c84eff32e9a071ddb2cd42d6f1ede8d98 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 2 Feb 2026 11:57:51 +0200
Subject: [PATCH 55/63] Add checks on API endpoints for signup limits

---
 studygroups/models/device_allocation.py | 45 +++++++++++++++++++++----
 studygroups/models/learningcircle.py    |  4 +--
 studygroups/views/api.py                | 30 +++++++++++++++--
 3 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/studygroups/models/device_allocation.py b/studygroups/models/device_allocation.py
index 19ce6853c..43b284e8d 100644
--- a/studygroups/models/device_allocation.py
+++ b/studygroups/models/device_allocation.py
@@ -7,8 +7,9 @@
 from studygroups.models import StudyGroup
 
 
+# NOTE: the current method is probably not suited to manage multiple overlapping device allocations. That is most likely fine for the current use case. But if the use case is expanded in the future, requirements should be clearly defined and the implementation should be adapted accordingly
+
 
-# this is the model we use
 class DeviceAllocation(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     start_date = models.DateField()
@@ -19,11 +20,47 @@ def __str__(self):
         return f'{self.user.first_name} - {self.amount} device(s)'
 
 
+def check_user_device_allocation(user, date):
+    """ check number of devices available to a facilitator """
+
+    device_allocations = DeviceAllocation.objects.filter(
+        user=user,
+        start_date__lte=date,
+        cutoff_date__gte=date
+    )
+    # TODO assert that only one allocation is active for a date period?
+    allocated_amount = sum([da.amount for da in device_allocations])
+
+    # Get min of start_date for device allocations
+    first_date = min([da.start_date for da in device_allocations])
+    # Get max of cutoff_date for device allocations
+    cutoff_date = max([da.cutoff_date for da in device_allocations])
+
+    # Find any learning circles in the device allocation time period
+    study_groups = StudyGroup.objects.active().filter(
+        facilitator__user=user,
+        start_date__gte=first_date,
+        end_date__lt=cutoff_date,
+    )
+
+    used_allocation = sum(
+        filter(lambda x: x is not None, [lc.signup_limit for lc in study_groups])
+    )
+
+    return max(allocated_amount - used_allocation, 0)
+
+
 def devices_available(learning_circle):
+    """ check maximum number of devices available for learning circle """
+   
     facilitator_user_ids = learning_circle.facilitator_set.all().values_list('user_id')
     study_group_ids = Facilitator.objects.all().filter(user_id__in=facilitator_user_ids).values_list('study_group_id')
 
-    device_allocations = DeviceAllocation.objects.filter(user_id__in=facilitator_user_ids)
+    device_allocations = DeviceAllocation.objects.filter(
+        user_id__in=facilitator_user_ids,
+        start_date__lte=learning_circle.start_date,
+        cutoff_date__gte=learning_circle.start_date
+    )
 
     # Get min of start_date for device allocations
     first_date = min([da.start_date for da in device_allocations])
@@ -45,7 +82,3 @@ def devices_available(learning_circle):
     if amount > total:
         return amount-total
     return 0
-
-
-
-
diff --git a/studygroups/models/learningcircle.py b/studygroups/models/learningcircle.py
index e46674ca7..428871f40 100644
--- a/studygroups/models/learningcircle.py
+++ b/studygroups/models/learningcircle.py
@@ -216,7 +216,7 @@ def weeks(self):
 
     @property
     def at_capacity(self):
-        if not self.signup_limit:
+        if self.signup_limit is None:
             return False
         signup_count = self.application_set.active().count()
         return signup_count >= self.signup_limit
@@ -279,7 +279,7 @@ def to_dict(self):
             "facilitator_goal": sg.facilitator_goal,
             "facilitator_concerns": sg.facilitator_concerns,
             "draft": sg.draft,
-            "signup_limit": sg.signup_limit or 0,
+            "signup_limit": sg.signup_limit or None,
             "signup_count": sg.application_set.active().count(),
             "signup_url": reverse('studygroups_signup', args=(slugify(sg.venue_name, allow_unicode=True), sg.id,)),
         }
diff --git a/studygroups/views/api.py b/studygroups/views/api.py
index 267f09ba0..d0d71ce02 100644
--- a/studygroups/views/api.py
+++ b/studygroups/views/api.py
@@ -46,6 +46,8 @@
 from studygroups.models.team import eligible_team_by_email_domain
 from studygroups.models.team import get_team_users
 from studygroups.models.learningcircle import generate_meeting_reminder
+from studygroups.models.device_allocation import devices_available
+from studygroups.models.device_allocation import check_user_device_allocation
 from studygroups.tasks import send_cofacilitator_email
 from studygroups.tasks import send_cofacilitator_removed_email
 
@@ -139,7 +141,7 @@ def serialize_learning_circle(sg):
         "report_url": sg.report_url(),
         "studygroup_path": reverse('studygroups_view_study_group', args=(sg.id,)),
         "draft": sg.draft,
-        "signup_limit": sg.signup_limit or 0,
+        "signup_limit": sg.signup_limit or None,
         "signup_count": sg.application_set.active().count(), # should this be serialized for public API endpionts?
         "signup_open": sg.signup_open and sg.end_date > datetime.date.today(),
     }
@@ -751,6 +753,7 @@ def post(self, request):
             if not team_membership:
                 errors = { 'facilitators': ['Facilitator not part of a team']}
                 return json_response(request, {"status": "error", "errors": errors})
+
             team = TeamMembership.objects.active().filter(user=request.user).first().team
             team_list = team.teammembership_set.active().values_list('user', flat=True)
             if not all(item in team_list for item in data.get('facilitators', [])):
@@ -762,6 +765,17 @@ def post(self, request):
         start_date = data.get('meetings')[0].get('meeting_date')
         end_date = data.get('meetings')[-1].get('meeting_date')
 
+
+        # check if learning circle is part of digital detroit project
+        if team and team.page_slug == 'digital-detroit':
+            # if signup limit exceeds device allocation return error
+            signup_limit = data.get('signup_limit', None)
+            available_devices = check_user_device_allocation(request.user, start_date)
+            if signup_limit is None or signup_limit > available_devices:
+                errors = { 'signup_limit': [f'You need to specify a signup limit for this learning circle less than or equal to {available_devices}']}
+                return json_response(request, {"status": "error", "errors": errors})
+
+
         # create learning circle
         study_group = StudyGroup(
             name=data.get('name', None),
@@ -792,7 +806,7 @@ def post(self, request):
             signup_question=data.get('signup_question', ''),
             facilitator_goal=data.get('facilitator_goal', ''),
             facilitator_concerns=data.get('facilitator_concerns', ''),
-            signup_limit=data.get('signup_limit', 0)
+            signup_limit=data.get('signup_limit', None)
         )
 
         # use course.caption if course_description is not set
@@ -851,6 +865,16 @@ def post(self, request, *args, **kwargs):
                 errors = { 'facilitators': ['Facilitators not part of the same team']}
                 return json_response(request, {"status": "error", "errors": errors})
 
+
+        # if part of digital detroit project
+        if study_group.show_device_agreement():
+            signup_limit = data.get('signup_limit', None)
+            max_limit = devices_available(study_group)
+            if signup_limit is None or signup_limit > max_limit:
+                errors = { 'signup_limit': [f'You need to specify a signup limit for this learning circle less than or equal to {max_limit}']}
+                return json_response(request, {"status": "error", "errors": errors})
+
+
         # determine if meeting reminders should be regenerated
         regenerate_reminders = any([
             study_group.name != data.get('name'),
@@ -892,7 +916,7 @@ def post(self, request, *args, **kwargs):
         study_group.timezone = data.get('timezone')
         study_group.image = data.get('image_url')
         study_group.signup_question = data.get('signup_question', '')
-        study_group.signup_limit = data.get('signup_limit', 0)
+        study_group.signup_limit = data.get('signup_limit', None)
         study_group.facilitator_goal = data.get('facilitator_goal', '')
         study_group.facilitator_concerns = data.get('facilitator_concerns', '')
 

From 60f796dc898975b544cb648ae7be559953a50336 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 2 Feb 2026 13:44:16 +0200
Subject: [PATCH 56/63] Fix error using team where it is not defined

---
 studygroups/views/api.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/studygroups/views/api.py b/studygroups/views/api.py
index d0d71ce02..4c97bf2ea 100644
--- a/studygroups/views/api.py
+++ b/studygroups/views/api.py
@@ -767,7 +767,8 @@ def post(self, request):
 
 
         # check if learning circle is part of digital detroit project
-        if team and team.page_slug == 'digital-detroit':
+        if TeamMembership.objects.active().filter(user=request.user).exists() and \
+            TeamMembership.objects.active().filter(user=request.user).first().team.page_slug == 'digital-detroit':
             # if signup limit exceeds device allocation return error
             signup_limit = data.get('signup_limit', None)
             available_devices = check_user_device_allocation(request.user, start_date)

From 3f3cbe7686be5a3b5d0e75c4854bb8a64c92d1f9 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 2 Feb 2026 18:11:01 +0200
Subject: [PATCH 57/63] Add signup_limit field to list with fields for tabs so
 that error gets correctly assigned

---
 frontend/components/learning_circle_form/FormTabs.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/learning_circle_form/FormTabs.jsx b/frontend/components/learning_circle_form/FormTabs.jsx
index 88c1d719e..2a53c5b1c 100644
--- a/frontend/components/learning_circle_form/FormTabs.jsx
+++ b/frontend/components/learning_circle_form/FormTabs.jsx
@@ -32,7 +32,7 @@ export default class FormTabs extends React.Component{
       ['city', 'region', 'country', 'venue_name', 'venue_details', 'venue_address', 'language'],
       ['start_date', 'meeting_time', 'timezone'],
       ['name', 'description', 'course_description', 'signup_question', 'venue_website'],
-      ['facilitator_goal', 'facilitator_concerns', 'facilitators'],
+      ['facilitator_goal', 'facilitator_concerns', 'facilitators', 'signup_limit'],
     ];
     const tabErrors = tabFields.map( tab => Object.keys(errors).filter(e => tab.indexOf(e) != -1));
 

From e460ecb5a2f327b187222a5084c850a119783aea Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 2 Feb 2026 18:11:49 +0200
Subject: [PATCH 58/63] Remove initial value of 0 for signup_limit. 0 now means
 zero and undefined implies no limit

---
 frontend/helpers/constants.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/helpers/constants.js b/frontend/helpers/constants.js
index 3f9ba07ad..4aee5426d 100644
--- a/frontend/helpers/constants.js
+++ b/frontend/helpers/constants.js
@@ -87,7 +87,6 @@ export const LC_DEFAULTS = {
   online: false,
   draft: true,
   language: 'en',
-  signup_limit: 0,
   meetings: [],
 };
 

From 561bb5d77b3fb4aca26a1f50f261e6e3b6078abf Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Mon, 2 Feb 2026 18:15:07 +0200
Subject: [PATCH 59/63] Update UX for signup limit. Use seperate swich input UI
 to change between limited and unlimited signups rather than relying on the
 value 0 implying unlimited signups.

---
 .../learning_circle_form/FinalizeSection.jsx  | 65 +++++++++++++++----
 templates/studygroups/studygroup_form.html    |  1 +
 2 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/frontend/components/learning_circle_form/FinalizeSection.jsx b/frontend/components/learning_circle_form/FinalizeSection.jsx
index 97954d505..84f08cf64 100644
--- a/frontend/components/learning_circle_form/FinalizeSection.jsx
+++ b/frontend/components/learning_circle_form/FinalizeSection.jsx
@@ -1,5 +1,54 @@
 import React, { useState } from 'react'
-import { TextareaWithLabel, SelectWithLabel, InputWithLabel } from 'p2pu-components'
+import { TextareaWithLabel, SelectWithLabel, InputWithLabel, SwitchWithLabels } from 'p2pu-components'
+
+const SignupLimit = (props) => {
+
+  let maxSignups = null;
+  let defaultLimit = 20;
+  if (window.maxSignups){
+    maxSignups = window.maxSignups
+    defaultLimit = maxSignups
+  }
+
+  const handleSwitch = ({enableLimit}) => {
+    if (enableLimit) {
+      props.updateFormData({'signup_limit': defaultLimit})
+    } else {
+      props.updateFormData({'signup_limit': undefined})
+    }
+  }
+
+  return (
+    <>
+      { !maxSignups && 
+        <SwitchWithLabels
+          label={'Do you want to limit the number of signups?'}
+          trueLabel='Yes'
+          falseLabel='No'
+          handleChange={handleSwitch}
+          name='enableLimit'
+          value={props.learningCircle.signup_limit !== undefined}
+        />
+      }
+      { (props.learningCircle.signup_limit !== undefined || maxSignups) &&
+        <InputWithLabel
+          label={'What is the maximum number of signups?'}
+          type='number'
+          value={props.learningCircle.signup_limit || defaultLimit}
+          handleChange={props.updateFormData}
+          name='signup_limit'
+          id='id_signup_limit'
+          errorMessage={props.errors.signup_limit}
+          min={0}
+          max={maxSignups}
+        />
+      }
+      <div>
+        <a href="https://docs.p2pu.org/tools-and-resources/tools-for-learning-circles/managing-learning-circles#limiting-learning-circle-signups">More info about signup limits</a>
+      </div>
+    </>
+  )
+}
 
 const FinalizeSection = (props) => {
 
@@ -54,19 +103,9 @@ const FinalizeSection = (props) => {
       id={'id_facilitator_concerns'}
       errorMessage={props.errors.facilitator_concerns}
     />
-    <InputWithLabel
-      label={'Limit the number of people that can sign up'}
-      helpText='0 means unlimited'
-      type='number'
-      value={props.learningCircle.signup_limit}
-      handleChange={props.updateFormData}
-      name='signup_limit'
-      id='id_signup_limit'
-      errorMessage={props.errors.signup_limit}
+    <SignupLimit
+      {...props}
     />
-    <div>
-      <a href="https://docs.p2pu.org/tools-and-resources/tools-for-learning-circles/managing-learning-circles#limiting-learning-circle-signups">More info about signup limits</a>
-    </div>
     <div className='lc-co-facilitator-input'>
       <SelectWithLabel
         options={populateTeamOptions(props.team)}
diff --git a/templates/studygroups/studygroup_form.html b/templates/studygroups/studygroup_form.html
index 79fc82b34..1b630a21d 100644
--- a/templates/studygroups/studygroup_form.html
+++ b/templates/studygroups/studygroup_form.html
@@ -29,6 +29,7 @@
   window.team = team;
   window.currentUserId = {% if user.id %}{{user.id|safe}}{% else %}undefined{% endif %};
   window.teamCourseList = {% if team_course_list %}true{% else %}false{% endif %};
+  {% if max_signups %}window.maxSignups = {{max_signups}};{% endif %}
 </script>
 {% if object.pk %}
 <script>

From ec1850bb2cc58c61a6028a94c3e200f1095bccbc Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Tue, 3 Feb 2026 11:27:34 +0200
Subject: [PATCH 60/63] Simplify calculation of available signup slots for
 learning circles with device allocations

---
 studygroups/models/device_allocation.py | 59 +++++++------------------
 studygroups/views/api.py                |  4 +-
 studygroups/views/facilitate.py         |  8 ++++
 3 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/studygroups/models/device_allocation.py b/studygroups/models/device_allocation.py
index 43b284e8d..ed7c88c11 100644
--- a/studygroups/models/device_allocation.py
+++ b/studygroups/models/device_allocation.py
@@ -5,12 +5,16 @@
 
 from studygroups.models import Facilitator
 from studygroups.models import StudyGroup
+import logging
+
+logger = logging.getLogger(__name__)
 
 
 # NOTE: the current method is probably not suited to manage multiple overlapping device allocations. That is most likely fine for the current use case. But if the use case is expanded in the future, requirements should be clearly defined and the implementation should be adapted accordingly
 
 
 class DeviceAllocation(models.Model):
+    """ date range applies to start date """
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     start_date = models.DateField()
     cutoff_date = models.DateField()
@@ -28,57 +32,26 @@ def check_user_device_allocation(user, date):
         start_date__lte=date,
         cutoff_date__gte=date
     )
-    # TODO assert that only one allocation is active for a date period?
-    allocated_amount = sum([da.amount for da in device_allocations])
 
-    # Get min of start_date for device allocations
-    first_date = min([da.start_date for da in device_allocations])
-    # Get max of cutoff_date for device allocations
-    cutoff_date = max([da.cutoff_date for da in device_allocations])
+    if device_allocations.count() == 0:
+        logger.warning('No active DeviceAllocation for user')
+        return 0
+
+    if device_allocations.count() > 1:
+        logger.warning('Multiple overlapping DeviceAllocations for user')
+
+    # should just be one device allocation
+    device_allocation = device_allocations.first()
 
     # Find any learning circles in the device allocation time period
     study_groups = StudyGroup.objects.active().filter(
         facilitator__user=user,
-        start_date__gte=first_date,
-        end_date__lt=cutoff_date,
+        start_date__gte=device_allocation.start_date,
+        start_date__lt=device_allocation.cutoff_date,
     )
 
     used_allocation = sum(
         filter(lambda x: x is not None, [lc.signup_limit for lc in study_groups])
     )
 
-    return max(allocated_amount - used_allocation, 0)
-
-
-def devices_available(learning_circle):
-    """ check maximum number of devices available for learning circle """
-   
-    facilitator_user_ids = learning_circle.facilitator_set.all().values_list('user_id')
-    study_group_ids = Facilitator.objects.all().filter(user_id__in=facilitator_user_ids).values_list('study_group_id')
-
-    device_allocations = DeviceAllocation.objects.filter(
-        user_id__in=facilitator_user_ids,
-        start_date__lte=learning_circle.start_date,
-        cutoff_date__gte=learning_circle.start_date
-    )
-
-    # Get min of start_date for device allocations
-    first_date = min([da.start_date for da in device_allocations])
-    # Get max of cutoff_date for device allocations
-    cutoff_date = max([da.cutoff_date for da in device_allocations])
-
-    amount = sum([da.amount for da in device_allocations])
-
-    other_lcs = StudyGroup.objects.active().filter(
-        pk__in=study_group_ids,
-        start_date__gte=first_date,
-        end_date__lt=cutoff_date,
-    )
-    other_lcs = other_lcs.exclude(pk=learning_circle.pk)
-
-    # count limits for other learning circles
-    # TODO ensure there are no unlimted signups for other learning circles!
-    total = sum(filter(lambda x: x, [lc.signup_limit for lc in other_lcs]))
-    if amount > total:
-        return amount-total
-    return 0
+    return max(device_allocation.amount - used_allocation, 0)
diff --git a/studygroups/views/api.py b/studygroups/views/api.py
index 4c97bf2ea..bba5ab438 100644
--- a/studygroups/views/api.py
+++ b/studygroups/views/api.py
@@ -46,7 +46,6 @@
 from studygroups.models.team import eligible_team_by_email_domain
 from studygroups.models.team import get_team_users
 from studygroups.models.learningcircle import generate_meeting_reminder
-from studygroups.models.device_allocation import devices_available
 from studygroups.models.device_allocation import check_user_device_allocation
 from studygroups.tasks import send_cofacilitator_email
 from studygroups.tasks import send_cofacilitator_removed_email
@@ -869,8 +868,9 @@ def post(self, request, *args, **kwargs):
 
         # if part of digital detroit project
         if study_group.show_device_agreement():
+            devices = check_user_device_allocation(request.user, study_group.start_date)
+            max_limit = study_group.signup_limit + devices
             signup_limit = data.get('signup_limit', None)
-            max_limit = devices_available(study_group)
             if signup_limit is None or signup_limit > max_limit:
                 errors = { 'signup_limit': [f'You need to specify a signup limit for this learning circle less than or equal to {max_limit}']}
                 return json_response(request, {"status": "error", "errors": errors})
diff --git a/studygroups/views/facilitate.py b/studygroups/views/facilitate.py
index 6f94a56a6..2ee6581cb 100644
--- a/studygroups/views/facilitate.py
+++ b/studygroups/views/facilitate.py
@@ -61,6 +61,7 @@
 from studygroups.views.api import serialize_learning_circle
 from studygroups.models.team import eligible_team_by_email_domain
 from studygroups.models import weekly_update_data
+from studygroups.models.device_allocation import check_user_device_allocation
 
 logger = logging.getLogger(__name__)
 
@@ -295,6 +296,10 @@ def get_context_data(self, **kwargs):
             context['team'] = json.dumps([t.to_dict() for t in team.teammembership_set.active()])
             if Course.objects.active().filter(courselist__team=team).exists():
                 context['team_course_list'] = True
+
+            if team.page_slug == 'digital-detroit':
+                context['max_signups'] = check_user_device_allocation(self.request.user, datetime.datetime.today())
+
         return context
 
 
@@ -342,6 +347,9 @@ def get_context_data(self, **kwargs):
         if Reminder.objects.filter(study_group=self.object, edited_by_facilitator=True, sent_at__isnull=True).exists():
             context['reminders_edited'] = True
             messages.warning(self.request, _('You have edited meeting reminders for meetings in the future. Update the learning circle description or venue information will cause the reminders to be regenerated and your updates to be lost'))
+        if self.object.team and self.object.team.page_slug == 'digital-detroit':
+            context['max_signups'] = check_user_device_allocation(self.request.user, datetime.datetime.today())
+
         return context
 
 

From d9324b8aea979a2cf8407e873e27dc48c6bb508f Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Tue, 3 Feb 2026 13:30:27 +0200
Subject: [PATCH 61/63] Calcuate correct maximum signup limit for exising
 learning circle

---
 studygroups/views/facilitate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/studygroups/views/facilitate.py b/studygroups/views/facilitate.py
index 2ee6581cb..c8aa16423 100644
--- a/studygroups/views/facilitate.py
+++ b/studygroups/views/facilitate.py
@@ -348,7 +348,7 @@ def get_context_data(self, **kwargs):
             context['reminders_edited'] = True
             messages.warning(self.request, _('You have edited meeting reminders for meetings in the future. Update the learning circle description or venue information will cause the reminders to be regenerated and your updates to be lost'))
         if self.object.team and self.object.team.page_slug == 'digital-detroit':
-            context['max_signups'] = check_user_device_allocation(self.request.user, datetime.datetime.today())
+            context['max_signups'] = self.object.signup_limit + check_user_device_allocation(self.request.user, datetime.datetime.today())
 
         return context
 

From 9332c61fdade8629757734c4ee6739305a702544 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Tue, 3 Feb 2026 14:09:19 +0200
Subject: [PATCH 62/63] Add tests for device allocation

---
 studygroups/tests/test_device_allocation.py | 188 ++++++++++++++++++++
 1 file changed, 188 insertions(+)
 create mode 100644 studygroups/tests/test_device_allocation.py

diff --git a/studygroups/tests/test_device_allocation.py b/studygroups/tests/test_device_allocation.py
new file mode 100644
index 000000000..08f23ddfd
--- /dev/null
+++ b/studygroups/tests/test_device_allocation.py
@@ -0,0 +1,188 @@
+# coding: utf-8
+from django.test import TestCase, override_settings
+from django.test import Client
+from django.core import mail
+from django.contrib.auth.models import User, Group
+from django.utils import timezone
+from django.utils.translation import get_language
+from django.urls import reverse
+from django.conf import settings
+
+from unittest.mock import patch
+from freezegun import freeze_time
+
+from studygroups.models import StudyGroup
+from studygroups.models import Team
+from studygroups.models import TeamMembership
+from studygroups.models.device_allocation import DeviceAllocation
+from studygroups.models.device_allocation import check_user_device_allocation
+from custom_registration.models import create_user
+
+import datetime
+import urllib.request, urllib.parse, urllib.error
+import json
+
+
+
+"""
+Tests for when facilitators interact with the system
+"""
+class TestFacilitatorViews(TestCase):
+
+    fixtures = ['test_teams.json', 'test_courses.json', 'test_studygroups.json']
+
+    def setUp(self):
+        with patch('custom_registration.signals.send_email_confirm_email'):
+            user = create_user('bob@example.net', 'bob', 'test', 'password')
+            # Assign user to team
+            team = Team.objects.create(name='test team', page_slug='digital-detroit')
+            TeamMembership.objects.create(team=team, user=user, role=TeamMembership.MEMBER)
+            self.facilitator = user
+
+        mailchimp_patcher = patch('studygroups.models.profile.update_mailchimp_subscription')
+        self.mock_maichimp = mailchimp_patcher.start()
+        self.addCleanup(mailchimp_patcher.stop)
+
+
+    def test_create_study_group_with_limit(self):
+        c = Client()
+        c.login(username='bob@example.net', password='password')
+        data = {
+            "name": "Test learning circle",
+            "course": 3,
+            "description": "Lets learn something",
+            "course_description": "A real great course",
+            "venue_name": "75 Harrington",
+            "venue_details": "top floor",
+            "venue_address": "75 Harrington",
+            "city": "Cape Town",
+            "country": "South Africa",
+            "country_en": "South Africa",
+            "region": "Western Cape",
+            "latitude": 3.1,
+            "longitude": "1.3",
+            "place_id": "1",
+            "online": "false",
+            "language": "en",
+            "meetings": [
+                { "meeting_date": "2026-02-12", "meeting_time": "17:01" },
+                { "meeting_date": "2026-02-19", "meeting_time": "17:01" },
+            ],
+            "meeting_time": "17:01",
+            "duration": 50,
+            "timezone": "UTC",
+            "image": "/media/image.png",
+            "facilitator_concerns": "blah blah",
+        }
+        url = '/api/learning-circle/'
+        self.assertEqual(StudyGroup.objects.all().count(), 4)
+
+        resp = c.post(url, data=json.dumps(data), content_type='application/json')
+        self.assertEqual(resp.status_code, 200)
+
+        self.assertEqual(resp.json(), {
+            "status": "error",
+            'errors': {
+                'signup_limit': [
+                    'You need to specify a signup limit for this learning circle less than or equal to 0',
+                ],
+            },
+        })
+
+        DeviceAllocation.objects.create(user=self.facilitator, start_date=datetime.date(2026,1,1), cutoff_date=datetime.date(2027,1,1), amount=20)
+        resp = c.post(url, data=json.dumps(data), content_type='application/json')
+        self.assertEqual(resp.status_code, 200)
+
+
+        self.assertEqual(resp.json(), {
+            "status": "error",
+            'errors': {
+                'signup_limit': [
+                    'You need to specify a signup limit for this learning circle less than or equal to 20',
+                ],
+            },
+        })
+
+        data['signup_limit'] = 12
+        resp = c.post(url, data=json.dumps(data), content_type='application/json')
+
+        lc = StudyGroup.objects.all().last()
+        self.assertEqual(resp.status_code, 200)
+        self.assertEqual(resp.json(), {
+            "status": "created",
+            "studygroup_url": "{}://{}/en/studygroup/{}/".format(settings.PROTOCOL, settings.DOMAIN, lc.pk)
+        })
+
+        self.assertEqual(StudyGroup.objects.all().count(), 5)
+
+        self.assertEqual(check_user_device_allocation(self.facilitator, datetime.date(2026,2,2)), 8)
+
+
+    def test_update_learning_circle(self):
+        self.facilitator.profile.email_confirmed_at = timezone.now()
+        self.facilitator.profile.save()
+
+        c = Client()
+        c.login(username='bob@example.net', password='password')
+        data = {
+            "course": 3,
+            "description": "Lets learn something",
+            "course_description": "A real great course",
+            "venue_name": "75 Harrington",
+            "venue_details": "top floor",
+            "venue_address": "75 Harrington",
+            "city": "Cape Town",
+            "country": "South Africa",
+            "country_en": "South Africa",
+            "region": "Western Cape",
+            "latitude": 3.1,
+            "longitude": "1.3",
+            "place_id": "4",
+            "online": "false",
+            "language": "en",
+            "meeting_time": "17:01",
+            "duration": 50,
+            "timezone": "UTC",
+            "image": "/media/image.png",
+            "draft": False,
+            "meetings": [
+                { "meeting_date": "2026-02-12", "meeting_time": "17:01" },
+                { "meeting_date": "2026-02-19", "meeting_time": "17:01" },
+            ],
+            "signup_limit": 20,
+        }
+        url = '/api/learning-circle/'
+        self.assertEqual(StudyGroup.objects.all().count(), 4)
+        DeviceAllocation.objects.create(user=self.facilitator, start_date=datetime.date(2026,1,1), cutoff_date=datetime.date(2027,1,1), amount=20)
+
+
+        resp = c.post(url, data=json.dumps(data), content_type='application/json')
+        self.assertEqual(resp.status_code, 200)
+        lc = StudyGroup.objects.all().last()
+        self.assertEqual(resp.json(), {
+            "status": "created",
+            "studygroup_url": "{}://{}/en/studygroup/{}/".format(settings.PROTOCOL, settings.DOMAIN, lc.pk)
+        })
+        self.assertEqual(StudyGroup.objects.all().count(), 5)
+        self.assertEqual(check_user_device_allocation(self.facilitator, datetime.date(2026,2,2)), 0)
+
+        # Update learning circle
+        lc = StudyGroup.objects.all().last()
+        self.assertFalse(lc.draft)
+        url = '/api/learning-circle/{}/'.format(lc.pk)
+        data["facilitators"] = [f.user_id for f in lc.facilitator_set.all()]
+        data["signup_limit"] = 21
+
+        resp = c.post(url, data=json.dumps(data), content_type='application/json')
+        self.assertEqual(resp.status_code, 200)
+        self.assertEqual(resp.json()['status'], 'error')
+
+        data["signup_limit"] = 19
+        resp = c.post(url, data=json.dumps(data), content_type='application/json')
+        self.assertEqual(resp.status_code, 200)
+        self.assertEqual(resp.json(), {
+            "status": "updated",
+            "studygroup_url": "{}://{}/en/studygroup/{}/".format(settings.PROTOCOL, settings.DOMAIN, lc.pk)
+        })
+        self.assertEqual(check_user_device_allocation(self.facilitator, datetime.date(2026,2,2)), 1)
+

From 41f5635926dd2408f73c3bed6eb5f2770f356bb7 Mon Sep 17 00:00:00 2001
From: Dirk Uys <dirkcuys@gmail.com>
Date: Tue, 3 Feb 2026 16:41:44 +0200
Subject: [PATCH 63/63] Add permission checks for course content

---
 studygroups/views/learner.py | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/studygroups/views/learner.py b/studygroups/views/learner.py
index e0237b21b..fb37de194 100644
--- a/studygroups/views/learner.py
+++ b/studygroups/views/learner.py
@@ -504,22 +504,36 @@ def get(self, request, *args, **kwargs):
         return render(request, self.template_name, context)
 
 
-# TODO protect view behind signup 
 @method_decorator(login_required, name="dispatch")
 class ContentView(TemplateView):
     template_name = 'studygroups/content_view.html'
 
     def get(self, request, *args, **kwargs):
         study_group = get_object_or_404(StudyGroup, pk=kwargs.get('study_group_id'))
+        if study_group.course_content is None:
+            raise http.Http404(_("Content for this learning circle not found."))
 
-        # TODO check if content is part of study_group.course_content
+        # check user permissions
+        application = Application.objects.active().filter(
+            email__iexact=self.request.user.email,
+            study_group=study_group
+        ).first()
+        if not ( application or self.request.user in study_group.facilitator_set.all() or self.request.user.is_staff):
+            redirect_url = reverse(
+                'studygroups_signup',
+                args=(slugify(study_group.venue_name, allow_unicode=True), study_group.id)
+            )
+            return HttpResponseRedirect(redirect_url)
 
         import content.db
-        content = content.db.Content.objects.get(pk=kwargs.get('pk'))
-        
         import courses.models
+        content = content.db.Content.objects.get(pk=kwargs.get('pk'))
         course_uri = courses.models.course_id2uri(study_group.course_content.pk)
-        sections = courses.models.get_course_content(course_uri)[1:] #TODO 
+        sections = courses.models.get_course_content(course_uri)[1:] #TODO
+
+        # TODO check if content is part of study_group.course_content
+        if content.id not in [s['id'] for s in sections]:
+            return HttpResponseRedirect('/')
 
         markdown_content = content.latest.content
         h1_headings = re.findall(r'^\s*#(?!#)\s+(.+)$', markdown_content, flags=re.MULTILINE)
@@ -534,4 +548,3 @@ def get(self, request, *args, **kwargs):
         }
 
         return render(request, self.template_name, context)
-