More work on learning platform

Author: singerng

core/static/css/theme.css

@@ -9,6 +9,7 @@ html, body {
     padding: 0;
     width: 100%;
     height: 100%;
+    line-height: 155%;
 }
 
 .block {

learn/management/commands/updatelearn.py

@@ -31,7 +31,7 @@ def parse(dir, name, parent):
                 module.title = data['title']
 
                 file = open(os.path.join(dir, 'contents.md'))
-                module.text = markdown2.markdown(file.read())
+                module.text = markdown2.markdown(file.read(), extras=['code-friendly', 'tables'])
                 file.close()
 
                 module.parent = parent

learn/static/css/learn.css

@@ -8,24 +8,28 @@ nav.module-nav {
 nav.module-nav > ol {
     margin-top: 1em;
     margin-bottom: 1em;
-    padding: 0;
+    padding-left: 0!important;
+}
+
+nav.module-nav ol {
+    list-style-type: none;
+    padding-left: 1em;
 }
 
 nav.module-nav #active {
-    color: #95a5a6;
+    color: #2c3e50;
 }
 
 div.module {
     padding-left: 3em;
 }
 
-ol {
-    counter-reset: section;
-    list-style-type: none;
-    padding-left: 1em;
+/* This part will hopefully be unnecessary with Bootstrap 4 */
+figure {
+    padding-top: 2em;
+    padding-bottom: 2em;
 }
 
-li::before {
-    counter-increment: section;
-    content: counters(section,".") " ";
+figure > figcaption.figure-caption {
+    font-style: italic;
 }

learn/templates/module.html

@@ -22,25 +22,34 @@ <h1></h1>
 
     <div class="row">
         <nav class="col-xs-12 col-sm-3 module-nav">
+            <h3>Contents</h3>
+
             {% module_tree root %}
         </nav>
         <div class="col-xs-12 col-sm-9 module">
             <header class="page-title">
-                <div class="container">
-                    <h1>{{ module.title }}</h1>
-                </div>
+                <h1>{{ module.title }}</h1>
             </header>
 
-            {{ contents|safe|linebreaks }}
+            <hr/>
+
+            {{ contents|safe }}
 
-            <div style="float: right;">
-                {% if module.first_child %}
-                    Next: <a href="{% url 'learn:module' module.first_child.name %}">{{ module.first_child.title }} &raquo;</a>
-                {% elif module.next %}
-                    Next: <a href="{% url 'learn:module' module.next.name %}">{{ module.next.title }} &raquo;</a>
-                {% endif %}
-            </div>
+            {% if module.children.count > 0 %}
+                <h3>Section Contents</h3>
 
+                <ol>
+                    {% for child in module.children.all %}
+                        <li><a href="{%  url 'learn:module' child.name %}">{{ child.title }}</a></li>
+                    {% endfor %}
+                </ol>
+            {% endif %}
+
+            {% if next %}
+                <div style="float: right;">
+                    Next: <a href="{% url 'learn:module' next.name %}">{{ next.title }} &raquo;</a>
+                </div>
+            {% endif %}
         </div>
     </div>
 {% endblock %}

learn/views.py

@@ -10,8 +10,23 @@ def module(request, module_name):
 
     template = Template(module.text)
 
+    next = None
+
+    if module.first_child:
+        next = module.first_child
+
+    current = module
+
+    while current:
+        if current.next:
+            next = current.next
+            break
+
+        current = current.parent
+
     return render(request, "module.html", {
         'module': module,
         'root': root,
-        'contents': template.render(Context())
+        'contents': template.render(Context()),
+        'next': next
     })