From dde5be86570399a2b3dc4fbcf2da96ccd9f5af87 Mon Sep 17 00:00:00 2001
From: Miguel Barão <mjsb@uevora.pt>
Date: Tue, 31 Dec 2019 00:28:00 +0000
Subject: [PATCH] - add sticky-footer with link to bugs/suggestions

---
 aprendizations/__init__.py                         |  2 +-
 aprendizations/static/css/sticky-footer-navbar.css | 19 +++++++++++++++++++
 aprendizations/templates/courses.html              | 19 +++++++++++++++----
 aprendizations/templates/topic.html                |  2 +-
 package-lock.json                                  | 70 +++++++++-------------------------------------------------------------
 package.json                                       |  7 +++----
 6 files changed, 48 insertions(+), 71 deletions(-)
 create mode 100644 aprendizations/static/css/sticky-footer-navbar.css

diff --git a/aprendizations/__init__.py b/aprendizations/__init__.py
index 4055c85..2dc286e 100644
--- a/aprendizations/__init__.py
+++ b/aprendizations/__init__.py
@@ -30,7 +30,7 @@ are progressively uncovered as the students progress.
 '''
 
 APP_NAME = 'aprendizations'
-APP_VERSION = '2019.12.dev2'
+APP_VERSION = '2019.12.dev3'
 APP_DESCRIPTION = __doc__
 
 __author__ = 'Miguel Barão'
diff --git a/aprendizations/static/css/sticky-footer-navbar.css b/aprendizations/static/css/sticky-footer-navbar.css
new file mode 100644
index 0000000..487619f
--- /dev/null
+++ b/aprendizations/static/css/sticky-footer-navbar.css
@@ -0,0 +1,19 @@
+/* Sticky footer styles */
+
+html {
+  position: relative;
+  min-height: 100%;
+}
+
+body {
+  margin-bottom: 60px;
+}
+
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 30px;      /* Set the fixed height of the footer here */
+  line-height: 30px; /* Vertically center the text there */
+  background-color: #f5f5f5;
+}
diff --git a/aprendizations/templates/courses.html b/aprendizations/templates/courses.html
index 73898be..3a91567 100644
--- a/aprendizations/templates/courses.html
+++ b/aprendizations/templates/courses.html
@@ -12,6 +12,7 @@
     <link rel="stylesheet" href="/static/mdbootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/static/mdbootstrap/css/mdb.min.css">
     <link rel="stylesheet" href="/static/css/maintopics.css">
+    <link rel="stylesheet" href="/static/css/sticky-footer-navbar.css">
     <!-- Scripts -->
     <script defer src="/static/mdbootstrap/js/jquery.min.js"></script>
     <script defer src="/static/mdbootstrap/js/popper.min.js"></script>
@@ -53,8 +54,8 @@
     <!-- ===== page ====================================================== -->
     <div class="container">
         <div id="notifications"></div>
-        <div class="row justify-content-center">
-                {% for k,v in courses.items() %}
+        <div class="row justify-content-left">
+            {% for k,v in courses.items() %}
             <div class="card-deck col-md-4">
                 <a href="/course/{{k}}" class="card mb-3">
                     <!-- text-dark mb-3" style="width: 18rem;" -->
@@ -64,10 +65,20 @@
                     </div>
                 </a>
             </div>
-                {% end %}
+            {% end %} <!-- for -->
         </div>
     </div>
-    <!-- for -->
+
+    <footer class="footer">
+        <div class="container">
+            <small class="text-muted">
+                <a href="mailto:mjsb@uevora.pt?subject=Encontrei um erro&body=Descreva detalhadamente a situação na qual encontrou o erro. Indique qual o curso, tópico e pergunta. No caso de problemas técnicos indique também qual o seu sistema operativo e browser.">Reportar erro</a>
+                &nbsp;/&nbsp;
+                <a href="mailto:mjsb@uevora.pt?subject=Sugestões">Enviar sugestões</a>
+            </small>
+        </div>
+    </footer>
+
     <!-- === Change Password Modal =========================================== -->
     <div id="password_modal" class="modal fade" tabindex="-1" role="dialog">
         <div class="modal-dialog" role="document">
diff --git a/aprendizations/templates/topic.html b/aprendizations/templates/topic.html
index 4576b33..44fe4ea 100644
--- a/aprendizations/templates/topic.html
+++ b/aprendizations/templates/topic.html
@@ -71,7 +71,7 @@
     </nav>
     <!-- ===================================================================== -->
     <div class="progress">
-        <div class="progress-bar bg-primary" id="topic_progress" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="min-width: 1em;width: 0%"></div>
+        <div class="progress-bar bg-warning" id="topic_progress" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="min-width: 1em;width: 0%"></div>
     </div>
     <!-- ===================================================================== -->
     <!-- main panel with questions -->
diff --git a/package-lock.json b/package-lock.json
index a62318f..dd8aefb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3,71 +3,19 @@
     "lockfileVersion": 1,
     "dependencies": {
         "@fortawesome/fontawesome-free": {
-            "version": "5.11.2",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.11.2.tgz",
-            "integrity": "sha512-XiUPoS79r1G7PcpnNtq85TJ7inJWe0v+b5oZJZKb0pGHNIV6+UiNeQWiFGmuQ0aj7GEhnD/v9iqxIsjuRKtEnQ=="
+            "version": "5.12.0",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.0.tgz",
+            "integrity": "sha512-vKDJUuE2GAdBERaQWmmtsciAMzjwNrROXA5KTGSZvayAsmuTGjam5z6QNqNPCwDfVljLWuov1nEC3mEQf/n6fQ=="
         },
         "codemirror": {
-            "version": "5.49.2",
-            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.49.2.tgz",
-            "integrity": "sha512-dwJ2HRPHm8w51WB5YTF9J7m6Z5dtkqbU9ntMZ1dqXyFB9IpjoUFDj80ahRVEoVanfIp6pfASJbOlbWdEf8FOzQ=="
-        },
-        "commander": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.1.tgz",
-            "integrity": "sha512-UNgvDd+csKdc9GD4zjtkHKQbT8Aspt2jCBqNSPp53vAS0L1tS9sXB2TCEOPHJ7kt9bN/niWkYj8T3RQSoMXdSQ=="
-        },
-        "esm": {
-            "version": "3.2.25",
-            "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
-            "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA=="
-        },
-        "mathjax": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/mathjax/-/mathjax-3.0.0.tgz",
-            "integrity": "sha512-z4uLbDHNbs/aRuR6zCcnzwFQuMixkHCcWqgVaommfK/3cA1Ahq7OXemn+m8JwTYcBApSHgcrSbPr9sm3sZFL+A==",
-            "requires": {
-                "mathjax-full": "git://github.com/mathjax/MathJax-src.git"
-            }
-        },
-        "mathjax-full": {
-            "version": "git://github.com/mathjax/MathJax-src.git#0d74266e1820220d33cb6b29d4ca3575b352ac0d",
-            "from": "git://github.com/mathjax/MathJax-src.git",
-            "requires": {
-                "esm": "^3.2.25",
-                "mj-context-menu": "^0.2.0",
-                "speech-rule-engine": "^3.0.0-beta.6"
-            }
+            "version": "5.50.0",
+            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.50.0.tgz",
+            "integrity": "sha512-32LAmGcBNhKtJP4WGgkcaCVQDyChAyaWA6jasg778ziZzo3PWBuhpAQIJMO8//Id45RoaLyXjuhcRUBoS8Vg+Q=="
         },
         "mdbootstrap": {
-            "version": "4.10.0",
-            "resolved": "https://registry.npmjs.org/mdbootstrap/-/mdbootstrap-4.10.0.tgz",
-            "integrity": "sha512-jpDSrAv9BbqHGFCHf9iQts7dWAuJYT3VFmElLkKpD6cGJ5Pcjv5oiTvfKvFGjVsxWsjLtj7Y0Rh135EYejkaeg=="
-        },
-        "mj-context-menu": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/mj-context-menu/-/mj-context-menu-0.2.0.tgz",
-            "integrity": "sha512-yJxrWBHCjFZEHsZgfs7m5g9OSCNzsVYadW6f6lX3pgZL67vmodtSW/4zhsYmuDKweXfHs0M1kJge1uQIasWA+g=="
-        },
-        "speech-rule-engine": {
-            "version": "3.0.0-beta.6",
-            "resolved": "https://registry.npmjs.org/speech-rule-engine/-/speech-rule-engine-3.0.0-beta.6.tgz",
-            "integrity": "sha512-B7gcT53jAsKpx7WvFYQcyUlFmgS3Wa9KlDy0FY8SOTa+Wz5EqmI0MpCD5/fYm8/2qiCPp8HwZg+H3cBgM+sNVw==",
-            "requires": {
-                "commander": "*",
-                "wicked-good-xpath": "*",
-                "xmldom-sre": "^0.1.31"
-            }
-        },
-        "wicked-good-xpath": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/wicked-good-xpath/-/wicked-good-xpath-1.3.0.tgz",
-            "integrity": "sha1-gbDpXoZQ5JyUsiKY//hoa1VTz2w="
-        },
-        "xmldom-sre": {
-            "version": "0.1.31",
-            "resolved": "https://registry.npmjs.org/xmldom-sre/-/xmldom-sre-0.1.31.tgz",
-            "integrity": "sha512-f9s+fUkX04BxQf+7mMWAp5zk61pciie+fFLC9hX9UVvCeJQfNHRHXpeo5MPcR0EUf57PYLdt+ZO4f3Ipk2oZUw=="
+            "version": "4.11.0",
+            "resolved": "https://registry.npmjs.org/mdbootstrap/-/mdbootstrap-4.11.0.tgz",
+            "integrity": "sha512-3yhRRo8UQDqRgeEutSpx9jIECzkyPebOq/oYsG2TLAmXVmujDBb+OoTW6+yZ1MtaQZCu8AF8D1/pM9Y8sLj3uA=="
         }
     }
 }
diff --git a/package.json b/package.json
index fc1e45f..a4c6495 100644
--- a/package.json
+++ b/package.json
@@ -2,10 +2,9 @@
     "description": "Javascript libraries required to run the server",
     "email": "mjsb@uevora.pt",
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^5.11.2",
-        "codemirror": "^5.49.2",
-        "mathjax": "^3",
-        "mdbootstrap": "^4.10.0"
+        "@fortawesome/fontawesome-free": "^5.12.0",
+        "codemirror": "^5.50.0",
+        "mdbootstrap": "^4.11.0"
     },
     "private": true
 }
--
libgit2 0.21.2