Commit 44f8c950d6133b4486c070e485f9b1d846299826

Authored by Miguel Barão
1 parent e20ac51c
Exists in master and in 1 other branch dev

minor cleanup

aprendizations/templates/courses.html
@@ -32,8 +32,8 @@ @@ -32,8 +32,8 @@
32 <div class="collapse navbar-collapse" id="navbarNavText"> 32 <div class="collapse navbar-collapse" id="navbarNavText">
33 <ul class="navbar-nav"> 33 <ul class="navbar-nav">
34 <li class="nav-item"><a class="nav-link active" aria-current="page" href="/courses">Cursos</a></li> 34 <li class="nav-item"><a class="nav-link active" aria-current="page" href="/courses">Cursos</a></li>
35 - <!-- <li class="nav-item"><a class="nav-link disabled" href="#">Tópicos</a></li> -->  
36 - <!-- <li class="nav-item"><a class="nav-link disabled" href="#">Classificação</a></li> --> 35 + <li class="nav-item"><a class="nav-link disabled" href="#">Tópicos</a></li>
  36 + <li class="nav-item"><a class="nav-link disabled" href="#">Classificação</a></li>
37 </ul> 37 </ul>
38 <ul class="navbar-nav ms-auto"> 38 <ul class="navbar-nav ms-auto">
39 <li class="nav-item dropdown"> 39 <li class="nav-item dropdown">
@@ -89,32 +89,15 @@ @@ -89,32 +89,15 @@
89 {% for k,v in courses.items() %} 89 {% for k,v in courses.items() %}
90 <div class="col"> 90 <div class="col">
91 <div class="card bg-light shadow"> 91 <div class="card bg-light shadow">
92 - <!-- <div class="row g-0"> -->  
93 - <!-- <div class="col-md-1 bg-primary"> -->  
94 - <!-- <img src="..." class="img-fluid rounded-start" alt="..."> -->  
95 - <!-- </div> -->  
96 - <!-- <div class="col-md-11"> -->  
97 - <div class="card-body">  
98 - <h5>{{ v['title'] }}</h5>  
99 - <p class="card-text">{{ v.get('description', '') }}</p>  
100 - <a href="/course/{{k}}" class="card-link">Começar</a>  
101 - </div>  
102 - <!-- </div> -->  
103 - <!-- </div> --> 92 + <div class="card-body">
  93 + <h5>{{ v['title'] }}</h5>
  94 + <p class="card-text">{{ v.get('description', '') }}</p>
  95 + <a href="/course/{{k}}" class="stretched-link">Iniciar</a>
  96 + </div>
104 </div> 97 </div>
105 </div> 98 </div>
106 {% end %} 99 {% end %}
107 </div> 100 </div>
108 </div> 101 </div>
109 -  
110 - <!-- <footer class="footer"> -->  
111 - <!-- <div class="container"> -->  
112 - <!-- <small class="text-muted"> -->  
113 - <!-- <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 erros</a> -->  
114 - <!-- &nbsp;/&nbsp; -->  
115 - <!-- <a href="mailto:mjsb@uevora.pt?subject=Sugestões">Enviar sugestões</a> -->  
116 - <!-- </small> -->  
117 - <!-- </div> -->  
118 - <!-- </footer> -->  
119 </body> 102 </body>
120 </html> 103 </html>
aprendizations/templates/question-radio.html
@@ -3,14 +3,16 @@ @@ -3,14 +3,16 @@
3 3
4 {% block answer %} 4 {% block answer %}
5 <fieldset data-role="controlgroup"> 5 <fieldset data-role="controlgroup">
6 - <div class="list-group">  
7 - {% for n,opt in enumerate(question['options']) %}  
8 - <label class="list-group-item list-group-item-action">  
9 - <input type="radio" class="form-check-input" id="{{ n }}" accesskey="{{ n+1 }}" name="answer" value="{{ n }}">  
10 - {{ md(opt, strip_p_tag=True) }}  
11 - </label>  
12 - {% end %}  
13 - </div> 6 + <div class="list-group">
  7 + {% for n,opt in enumerate(question['options']) %}
  8 + <label class="list-group-item list-group-item-action">
  9 + <input type="radio" class="form-check-input" id="{{ n }}" accesskey="{{ n+1 }}" name="answer" value="{{ n }}">
  10 + <label for="{{ n }}" class="custom-control-label">
  11 + {{ md(opt, strip_p_tag=True) }}
  12 + </label>
  13 + </label>
  14 + {% end %}
  15 + </div>
14 </fieldset> 16 </fieldset>
15 <input type="hidden" name="qid" value="{{ question['qid'] }}"> 17 <input type="hidden" name="qid" value="{{ question['qid'] }}">
16 {% end %} 18 {% end %}
package-lock.json
@@ -6,80 +6,34 @@ @@ -6,80 +6,34 @@
6 "": { 6 "": {
7 "dependencies": { 7 "dependencies": {
8 "@fortawesome/fontawesome-free": "^5.15.3", 8 "@fortawesome/fontawesome-free": "^5.15.3",
9 - "bootstrap": "^5.1",  
10 - "codemirror": "^5.59.4",  
11 - "mdbootstrap": "^4.19.2" 9 + "codemirror": "^5.59.4"
12 } 10 }
13 }, 11 },
14 "node_modules/@fortawesome/fontawesome-free": { 12 "node_modules/@fortawesome/fontawesome-free": {
15 - "version": "5.15.3",  
16 - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.3.tgz",  
17 - "integrity": "sha512-rFnSUN/QOtnOAgqFRooTA3H57JLDm0QEG/jPdk+tLQNL/eWd+Aok8g3qCI+Q1xuDPWpGW/i9JySpJVsq8Q0s9w==", 13 + "version": "5.15.4",
  14 + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz",
  15 + "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==",
18 "hasInstallScript": true, 16 "hasInstallScript": true,
19 "engines": { 17 "engines": {
20 "node": ">=6" 18 "node": ">=6"
21 } 19 }
22 }, 20 },
23 - "node_modules/@popperjs/core": {  
24 - "version": "2.9.3",  
25 - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.3.tgz",  
26 - "integrity": "sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ==",  
27 - "peer": true,  
28 - "funding": {  
29 - "type": "opencollective",  
30 - "url": "https://opencollective.com/popperjs"  
31 - }  
32 - },  
33 - "node_modules/bootstrap": {  
34 - "version": "5.1.0",  
35 - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.0.tgz",  
36 - "integrity": "sha512-bs74WNI9BgBo3cEovmdMHikSKoXnDgA6VQjJ7TyTotU6L7d41ZyCEEelPwkYEzsG/Zjv3ie9IE3EMAje0W9Xew==",  
37 - "funding": {  
38 - "type": "opencollective",  
39 - "url": "https://opencollective.com/bootstrap"  
40 - },  
41 - "peerDependencies": {  
42 - "@popperjs/core": "^2.9.3"  
43 - }  
44 - },  
45 "node_modules/codemirror": { 21 "node_modules/codemirror": {
46 - "version": "5.62.0",  
47 - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.0.tgz",  
48 - "integrity": "sha512-Xnl3304iCc8nyVZuRkzDVVwc794uc9QNX0UcPGeNic1fbzkSrO4l4GVXho9tRNKBgPYZXgocUqXyfIv3BILhCQ=="  
49 - },  
50 - "node_modules/mdbootstrap": {  
51 - "version": "4.19.2",  
52 - "resolved": "https://registry.npmjs.org/mdbootstrap/-/mdbootstrap-4.19.2.tgz",  
53 - "integrity": "sha512-a+LwPflYRYwlmYKTvftW0X7SfOMrRZ02qZjrssNko1lPU/HR5JRFc1uwa3Dmmw+6TwsYH760waqdghBFrucpOw==" 22 + "version": "5.62.2",
  23 + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.2.tgz",
  24 + "integrity": "sha512-tVFMUa4J3Q8JUd1KL9yQzQB0/BJt7ZYZujZmTPgo/54Lpuq3ez4C8x/ATUY/wv7b7X3AUq8o3Xd+2C5ZrCGWHw=="
54 } 25 }
55 }, 26 },
56 "dependencies": { 27 "dependencies": {
57 "@fortawesome/fontawesome-free": { 28 "@fortawesome/fontawesome-free": {
58 - "version": "5.15.3",  
59 - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.3.tgz",  
60 - "integrity": "sha512-rFnSUN/QOtnOAgqFRooTA3H57JLDm0QEG/jPdk+tLQNL/eWd+Aok8g3qCI+Q1xuDPWpGW/i9JySpJVsq8Q0s9w=="  
61 - },  
62 - "@popperjs/core": {  
63 - "version": "2.9.3",  
64 - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.3.tgz",  
65 - "integrity": "sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ==",  
66 - "peer": true  
67 - },  
68 - "bootstrap": {  
69 - "version": "5.1.0",  
70 - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.0.tgz",  
71 - "integrity": "sha512-bs74WNI9BgBo3cEovmdMHikSKoXnDgA6VQjJ7TyTotU6L7d41ZyCEEelPwkYEzsG/Zjv3ie9IE3EMAje0W9Xew==",  
72 - "requires": {} 29 + "version": "5.15.4",
  30 + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz",
  31 + "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg=="
73 }, 32 },
74 "codemirror": { 33 "codemirror": {
75 - "version": "5.62.0",  
76 - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.0.tgz",  
77 - "integrity": "sha512-Xnl3304iCc8nyVZuRkzDVVwc794uc9QNX0UcPGeNic1fbzkSrO4l4GVXho9tRNKBgPYZXgocUqXyfIv3BILhCQ=="  
78 - },  
79 - "mdbootstrap": {  
80 - "version": "4.19.2",  
81 - "resolved": "https://registry.npmjs.org/mdbootstrap/-/mdbootstrap-4.19.2.tgz",  
82 - "integrity": "sha512-a+LwPflYRYwlmYKTvftW0X7SfOMrRZ02qZjrssNko1lPU/HR5JRFc1uwa3Dmmw+6TwsYH760waqdghBFrucpOw==" 34 + "version": "5.62.2",
  35 + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.2.tgz",
  36 + "integrity": "sha512-tVFMUa4J3Q8JUd1KL9yQzQB0/BJt7ZYZujZmTPgo/54Lpuq3ez4C8x/ATUY/wv7b7X3AUq8o3Xd+2C5ZrCGWHw=="
83 } 37 }
84 } 38 }
85 } 39 }