From 3e1c9788e72981a963fc47f17f504c1981c2cbc3 Mon Sep 17 00:00:00 2001
From: Miguel Barão <mjsb@uevora.pt>
Date: Wed, 8 Jan 2020 23:43:17 +0000
Subject: [PATCH] updated maintopics-table.html

---
 aprendizations/templates/maintopics-table.html | 34 ++++++++++++++++++++--------------
 aprendizations/tools.py                        |  2 +-
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/aprendizations/templates/maintopics-table.html b/aprendizations/templates/maintopics-table.html
index 7b7b2a6..f764a79 100644
--- a/aprendizations/templates/maintopics-table.html
+++ b/aprendizations/templates/maintopics-table.html
@@ -63,7 +63,7 @@
   <h4>{{ course_title }}</h4>
 
   <table class="table table-hover">
-    <thead>
+    <thead class="">
       <tr>
         <th>Tópico</th>
         <th class="text-center">Nível</th>
@@ -71,15 +71,22 @@
     </thead>
     <tbody>
       {% for t in state %}
+        <!-- ------------------------------------------------------------- -->
         {% if t['level'] is None %}
-          <tr class="table-primary">
+          <tr class="table-secondary">
             <td>
               {% if t['type']=='chapter' %}
                 <div class="text-muted lead">
                   {{ t['name'] }}
                 </div>
+              {% elif t['type']=='learn' %}
+                <div class="text-muted">
+                  <i class="fas fa-book"></i>&nbsp;
+                  {{ t['name'] }}
+                </div>
               {% else %}
                 <div class="text-muted">
+                  <i class="fas fa-pencil-alt"></i>&nbsp;
                   {{ t['name'] }}
                 </div>
               {% end %}
@@ -90,12 +97,14 @@
           </tr>
 
         {% else %}
-          <tr class="clickable-row" data-href="/topic/{{t['ref']}}">
+
+          <tr class="clickable-row " data-href="/topic/{{t['ref']}}">
             <td class="text-primary">
               {% if t['type']=='chapter' %}
-                <div class="lead">
+                <h5>
+                  <i class="fas fa-flag-checkered"></i>&nbsp;
                   {{ t['name'] }}
-                </div>
+                </h5>
               {% elif t['type']=='learn' %}
                 <i class="fas fa-book"></i>&nbsp;
                 {{ t['name'] }}
@@ -104,25 +113,22 @@
                 {{ t['name'] }}
               {% end %}
             </td>
+
             <td class="text-center">
               {% if t['level'] < 0.01 %}
                 <i class="fas fa-lock-open text-success"></i>
               {% elif t['type']=='chapter' %}
-                <div class="text-xs-right">
-                  <i class="fas fa-trophy fa-lg text-warning"></i>
-                  <!-- <i class="fas fa-award fa-lg text-warning"></i> -->
-                </div>
+                <h5><i class="fas fa-award text-warning"></i></h5>
               {% else %}
-                <div class="text-xs-right">
                 <span class="text-nowrap text-warning" data-toggle="tooltip" data-placement="bottom" title="{{round(t['level']*5, 2)}}">
                   {{int(t['level']*5+0.25)*'<i class="fas fa-star"></i>'}}{% if int(t['level']*5+0.25) < 5 %}{{'<i class="fas fa-star-half-alt"></i>' if 0.25 <= t['level']*5-int(t['level']*5) < 0.75 else '<i class="far fa-star"></i>'}}{% end %}{{(4-int(t['level']*5+0.25))*'<i class="far fa-star"></i>' }}
                 </span>
-                </div>
-              {% end %}
+              {% end %} <!-- if -->
             </td>
           </tr>
-        {% end %}
-      {% end %}
+        {% end %} <!-- if level is none -->
+        <!-- ------------------------------------------------------------- -->
+      {% end %} <!-- for -->
     </tbody>
   </table>
 </div>
diff --git a/aprendizations/tools.py b/aprendizations/tools.py
index 0ec43f3..0073f51 100644
--- a/aprendizations/tools.py
+++ b/aprendizations/tools.py
@@ -184,7 +184,7 @@ def run_script(script: str,
                            input=stdin,
                            stdout=subprocess.PIPE,
                            stderr=subprocess.STDOUT,
-                           universal_newlines=True,
+                           text=True,  # same as universal_newlines=True
                            timeout=timeout,
                            )
     except FileNotFoundError:
--
libgit2 0.21.2