Use a macro for list items with materials

Author: encukou

naucse/templates/_macros.html

@@ -11,3 +11,17 @@
         {{- bytesize_icon('link') -}}
     {%- endif -%}
 {%- endmacro -%}
+
+{%- macro material_li(material) %}
+    <li>
+        {% if material.type == "page" %}
+            {% set url=lesson_url(lesson=material.page.lesson, page=material.page.slug) %}
+        {% else %}
+            {% set url=material.url %}
+        {% endif %}
+        <a href="{{ url }}">
+            {{- icon_for_material(material) -}}
+            {{- material.title -}}
+        </a>
+    </li>
+{%- endmacro -%}

naucse/templates/backpage.html

@@ -1,5 +1,5 @@
 {% extends "_base.html" %}
-{% from "_macros.html" import icon_for_material %}
+{% from "_macros.html" import material_li %}
 
 {% block content %}
 
@@ -25,14 +25,7 @@ <h2>Domácí projekty</h2>
             <ul>
             {% for mat in session.materials %}
                 {% if mat.url_type == "homework" %}
-                <li>
-                    <div>
-                        <a href="{{ mat.url }}">
-                            {{ icon_for_material(mat) }}
-                            {{ mat.title }}
-                        </a>
-                    </div>
-                </li>
+                    {{ material_li(mat) }}
                 {% endif %}
             {% endfor %}
             </ul>
@@ -44,14 +37,7 @@ <h2>Zajímavé odkazy</h2>
             <ul>
             {% for mat in session.materials %}
                 {% if mat.url_type == "link" %}
-                <li>
-                    <div>
-                        <a href="{{ mat.url }}">
-                            {{ icon_for_material(mat) }}
-                            {{ mat.title }}
-                        </a>
-                    </div>
-                </li>
+                    {{ material_li(mat) }}
                 {% endif %}
             {% endfor %}
             </ul>

naucse/templates/course.html

@@ -1,5 +1,5 @@
 {% extends "_base.html" %}
-{% from "_macros.html" import icon_for_material %}
+{% from "_macros.html" import material_li %}
 
 {% macro session_heading(session, index, plan) %}
     {% if plan|length > 1 %}
@@ -46,21 +46,11 @@ <h4>
                         {{ session_heading(session, loop.index, plan) }}
                         </a>
                     </h4>
-                    {% for mat in session.materials %}
-                        <div>
-                            {% if mat.type == "page" %}
-                                <a href="{{ lesson_url(lesson=mat.page.lesson, page=mat.page.slug) }}">
-                                    {{ icon_for_material(mat) }}
-                                    {{ mat.title }}
-                                </a>
-                            {% else %}
-                                <a href="{{ mat.url }}">
-                                    {{ icon_for_material(mat) }}
-                                    {{ mat.title }}
-                                </a>
-                            {% endif %}
-                        </div>
-                    {% endfor %}
+                    <ul>
+                        {% for mat in session.materials %}
+                            {{ material_li(mat) }}
+                        {% endfor %}
+                    </ul>
                 </div>
                 {% endfor %}
 

naucse/templates/coverpage.html

@@ -1,5 +1,5 @@
 {% extends "_base.html" %}
-{% from "_macros.html" import icon_for_material %}
+{% from "_macros.html" import material_li %}
 
 {% block content %}
 
@@ -32,21 +32,7 @@ <h2>Materiály</h2>
         <ul>
         {% for mat in session.materials %}
             {% if mat.url_type == "lesson" %}
-            <li>
-                <div>
-                    {% if mat.type == "page" %}
-                        <a href="{{ lesson_url(lesson=mat.page.lesson, page=mat.page.slug) }}">
-                            {{ icon_for_material(mat) }}
-                            {{ mat.title }}
-                        </a>
-                    {% else %}
-                        <a href="{{ mat.url }}">
-                            {{ icon_for_material(mat) }}
-                            {{ mat.title }}
-                        </a>
-                    {% endif %}
-                </div>
-            </li>
+                {{ material_li(mat) }}
             {% endif %}
         {% endfor %}
         </ul>
@@ -57,14 +43,7 @@ <h2>Taháky</h2>
             <ul>
             {% for mat in session.materials %}
                 {% if mat.url_type == "cheatsheet" %}
-                <li>
-                    <div>
-                        <a href="{{ mat.url }}">
-                            {{ icon_for_material(mat) }}
-                            {{ mat.title }}
-                        </a>
-                    </div>
-                </li>
+                    {{ material_li(mat) }}
                 {% endif %}
             {% endfor %}
             </ul>