Finished removing font-awesome

New learn topic in demo/math

Finished removing font-awesome
New learn topic in demo/math
Miguel Barão
1 parent 5316b7d1
Showing 5 changed files with 44 additions and 56 deletions Show diff stats
aprendizations/templates/courses.html
aprendizations/templates/maintopics-table.html
aprendizations/templates/rankings.html
aprendizations/templates/topic.html
demo/math/learn-prime-numbers/learn.yaml
@@ -12,9 +12,6 @@
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css">
  
-    <!-- font-awesome -->
-    <!-- <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet"> -->
-
     <link rel="stylesheet" href="{{static_url('css/maintopics.css')}}">
     <link rel="stylesheet" href="{{static_url('css/sticky-footer-navbar.css')}}">
     <!-- Scripts -->
@@ -44,9 +41,7 @@
           <ul class="navbar-nav ms-auto">
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                <i class="bi bi-person-circle"></i>
-                <!-- <i class="fas fa-user-graduate" aria-hidden="true"></i> -->
-                &nbsp;
+                <i class="bi bi-person-circle"></i>&nbsp;
                 <span id="name">{{ escape(name) }}</span>
                 <span class="caret"></span>
               </a>
@@ -16,9 +16,6 @@
   <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css">
  
-  <!-- font-awesome -->
-  <!-- <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet"> -->
-
   <link rel="stylesheet" href="{{static_url('css/maintopics.css')}}">
   <script defer src="{{static_url('js/maintopics.js')}}"></script>
  
@@ -42,7 +39,6 @@
       <ul class="navbar-nav ms-auto">
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-            <!-- <i class="fas fa-user-graduate" aria-hidden="true"></i> -->
             <i class="bi bi-person-circle"></i>
             &nbsp;
             <span id="name">{{ escape(name) }}</span>
@@ -109,34 +105,22 @@
           <tr>
             <th scope="row" class="text-muted text-center">
               {% if t['type']=='chapter' %}
-                <!-- <i class="fas fa-flag"></i> -->
-                <i class="bi bi-flag-fill"></i>
+                <i class="bi bi-flag-fill"></i>&nbsp;
               {% elif t['type']=='learn' %}
-                <!-- <i class="fas fa-book"></i>&nbsp; -->
-                <!-- <i class="bi bi-book-fill"></i>&nbsp; -->
-                <h5>
                 <i class="bi bi-book"></i>&nbsp;
-                </h5>
-
               {% else %}
-                <i class="fas fa-pencil-alt"></i>&nbsp;
-                <i class="bi bi-pencil-fill"></i>&nbsp;
                 <i class="bi bi-pencil"></i>&nbsp;
               {% end %}
             </th>
             <td>
               <div class="text-muted">
                 {% if t['ref'] not in course['goals'] %}
-                  <!-- <i class="fas fa-puzzle-piece"></i> -->
-                  <i class="bi bi-puzzle-fill"></i>
+                  <i class="bi bi-puzzle-fill"></i>&nbsp;
                 {% end %}
-
-
                 {{ t['name'] }}
               </div>
             </td>
             <td class="text-center">
-              <!-- <i class="fas fa-lock text-muted"></i> -->
               <i class="bi bi-lock-fill text-muted"></i>
             </td>
           </tr>
@@ -147,46 +131,49 @@
             <th scope="row" class="text-primary text-center">
               {% if t['type']=='chapter' %}
                 <span class="text-nowrap" data-toggle="tooltip" data-placement="bottom" title="Fim do capítulo">
-                <!-- <i class="fas fa-flag-checkered"></i>&nbsp; -->
-                <i class="bi bi-flag-fill"></i>&nbsp;
+                  <h5>
+                    <i class="bi bi-flag-fill"></i>&nbsp;
+                  </h5>
                 </span>
               {% elif t['type']=='learn' %}
                 <span class="text-nowrap" data-toggle="tooltip" data-placement="bottom" title="Texto com matéria">
-                <!-- <i class="fas fa-book"></i>&nbsp; -->
-                <!-- <i class="bi bi-book-fill"></i>&nbsp; -->
-                <i class="bi bi-book"></i>&nbsp;
+                  <h5>
+                    <i class="bi bi-book"></i>&nbsp;
+                  </h5>
                 </span>
               {% else %}
                 <span class="text-nowrap" data-toggle="tooltip" data-placement="bottom" title="Exercícios">
-                <!-- <i class="fas fa-pencil-alt"></i>&nbsp; -->
-                <!-- <i class="bi bi-pencil-fill"></i>&nbsp; -->
-                <i class="bi bi-pencil"></i>&nbsp;
+                  <h5>
+                    <i class="bi bi-pencil"></i>&nbsp;
+                  </h5>
                 </span>
               {% end %}
             </th>
             <td class="text-primary">
               {% if t['ref'] not in course['goals'] %}
                 <span class="text-nowrap" data-toggle="tooltip" data-placement="bottom" title="Pré-requisito para este curso">
-                <!-- <i class="fas fa-puzzle-piece"></i> -->
-                <i class="bi bi-puzzle-fill"></i>
+                  <h5>
+                    <i class="bi bi-puzzle-fill"></i>
+                  </h5>
                 </span>
               {% end %}
-
               {{ t['name'] }}
             </td>
  
             <td class="text-center">
               {% if t['level'] < 0.01 %}
-                <!-- <i class="fas fa-lock-open text-success"></i> -->
-                <i class="bi bi-unlock-fill text-success"></i>
-
+                <h5>
+                  <i class="bi bi-unlock-fill text-success"></i>
+                </h5>
               {% elif t['type']=='chapter' %}
-                <!-- <h5><i class="fas fa-award text-warning"></i></h5> -->
-                <i class="bi bi-award-fill"></i>
-
+                <h5>
+                  <i class="bi bi-award-fill"></i>
+                </h5>
               {% else %}
                 <span class="text-nowrap text-warning" data-toggle="tooltip" data-placement="bottom" title="{{round(t['level']*5, 3)}}">
-                  {{ int(t['level']*5+0.25)*'<i class="bi bi-star-fill"></i>' }}{% if int(t['level']*5+0.25) < 5 %}{{'<i class="bi bi-star-half"></i>' if 0.25 <= t['level']*5-int(t['level']*5) < 0.75 else '<i class="bi bi-star"></i>'}}{% end %}{{ (4-int(t['level']*5+0.25))*'<i class="bi bi-star"></i>' }}
+                  <h5>
+                    {{ int(t['level']*5+0.25)*'<i class="bi bi-star-fill"></i>' }}{% if int(t['level']*5+0.25) < 5 %}{{'<i class="bi bi-star-half"></i>' if 0.25 <= t['level']*5-int(t['level']*5) < 0.75 else '<i class="bi bi-star"></i>'}}{% end %}{{ (4-int(t['level']*5+0.25))*'<i class="bi bi-star"></i>' }}
+                  </h5>
                 </span>
               {% end %} <!-- if -->
             </td>
@@ -12,9 +12,6 @@
   <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css">
  
-  <!-- font-awesome -->
-  <!-- <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet"> -->
-
   <link rel="stylesheet" href="{{static_url('css/maintopics.css')}}">
   <script defer src="{{static_url('js/maintopics.js')}}"></script>
  
@@ -38,9 +35,7 @@
       <ul class="navbar-nav ms-auto">
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-            <!-- <i class="fas fa-user-graduate" aria-hidden="true"></i> -->
-            <i class="bi bi-person-circle"></i>
-            &nbsp;
+            <i class="bi bi-person-circle"></i>&nbsp;
             <span id="name">{{ escape(name) }}</span>
             <span class="caret"></span>
           </a>
@@ -58,7 +53,6 @@
   <h1 class="display-6">{{ course_title }}</h1>
  
 <table class="table table-sm table-hover">
-  <!-- <col width="100"> -->
   <thead>
     <tr>
       <th scope="col" class="text-center">Posição</th>
@@ -71,12 +65,10 @@
     <tr class="{{ 'table-secondary' if r[0] == uid else '' }}">
       <td class="text-center"> <!-- rank -->
         <strong>
-          <!-- {{ '<i class="fas fa-crown fa-lg text-warning"></i>' if i==0 else i+1 }} -->
-          <!-- {{ '<h3><i class="bi bi-mortarboard-fill text-warning"></i></h3>' if i==0 else i+1 }} -->
           {{ '<h3><i class="bi bi-trophy-fill text-warning"></i></h3>' if i==0 else i+1 }}
         </strong>
       </td>
-      <td> <!-- student name -->
+      <td> <!-- first and last name -->
         {{ ' '.join(r[1].split()[n] for n in (0,-1)) }}
       </td>
       <td> <!-- progress -->
@@ -14,9 +14,6 @@
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css">
  
-    <!-- font-awesome -->
-    <!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" /> -->
-
     <!-- mathjax -->
     <script>
       MathJax = {
@@ -63,7 +60,7 @@
           <ul class="navbar-nav">
             <li class="nav-item"><a class="nav-link" href="/courses">Cursos</a></li>
             <li class="nav-item"><a class="nav-link active" aria-current="page" href="/course/{{course_id}}">Tópicos</a></li>
-            <!-- <li class="nav-item"><a class="nav-link disabled" href="#">Classificação</a></li> -->
+            <li class="nav-item"><a class="nav-link disabled" href="#">Classificação</a></li>
           </ul>
           <ul class="navbar-nav ms-auto">
             <li class="nav-item dropdown">
@@ -0,0 +1,17 @@
+- type: radio
+  title: O que são números primos?
+  text: |
+    Um número $n \ge 2$ é primo se os únicos divisores forem $1$ e $n$.
+
+    Por exemplo, o número $5$ é primo, pois $2,3,4$ não são divisores de $5$.
+
+    ---
+
+    O número $1$ é primo?
+  options:
+    - Não
+    - Sim
+  max_tries: 1
+  solution: |
+    O número $1$ não é primo. Apenas podem ser primos os números a partir do
+    $2$.
...	...	@@ -12,9 +12,6 @@
12	12	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>
13	13	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css">
14	14
15		- <!-- font-awesome -->
16		- <!-- <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet"> -->
17		-
18	15	<link rel="stylesheet" href="{{static_url('css/maintopics.css')}}">
19	16	<link rel="stylesheet" href="{{static_url('css/sticky-footer-navbar.css')}}">
20	17	<!-- Scripts -->
...	...	@@ -44,9 +41,7 @@
44	41	<ul class="navbar-nav ms-auto">
45	42	<li class="nav-item dropdown">
46	43	<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
47		- <i class="bi bi-person-circle"></i>
48		- <!-- <i class="fas fa-user-graduate" aria-hidden="true"></i> -->
49		-
	44	+ <i class="bi bi-person-circle"></i>
50	45	<span id="name">{{ escape(name) }}</span>
51	46	<span class="caret"></span>
52	47	</a>
...	...
...	...	@@ -16,9 +16,6 @@
16	16	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>
17	17	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css">
18	18
19		- <!-- font-awesome -->
20		- <!-- <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet"> -->
21		-
22	19	<link rel="stylesheet" href="{{static_url('css/maintopics.css')}}">
23	20	<script defer src="{{static_url('js/maintopics.js')}}"></script>
24	21
...	...	@@ -42,7 +39,6 @@
42	39	<ul class="navbar-nav ms-auto">
43	40	<li class="nav-item dropdown">
44	41	<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
45		- <!-- <i class="fas fa-user-graduate" aria-hidden="true"></i> -->
46	42	<i class="bi bi-person-circle"></i>
47	43
48	44	<span id="name">{{ escape(name) }}</span>
...	...	@@ -109,34 +105,22 @@
109	105	<tr>
110	106	<th scope="row" class="text-muted text-center">
111	107	{% if t['type']=='chapter' %}
112		- <!-- <i class="fas fa-flag"></i> -->
113		- <i class="bi bi-flag-fill"></i>
	108	+ <i class="bi bi-flag-fill"></i>
114	109	{% elif t['type']=='learn' %}
115		- <!-- <i class="fas fa-book"></i>  -->
116		- <!-- <i class="bi bi-book-fill"></i>  -->
117		- <h5>
118	110	<i class="bi bi-book"></i>
119		- </h5>
120		-
121	111	{% else %}
122		- <i class="fas fa-pencil-alt"></i>
123		- <i class="bi bi-pencil-fill"></i>
124	112	<i class="bi bi-pencil"></i>
125	113	{% end %}
126	114	</th>
127	115	<td>
128	116	<div class="text-muted">
129	117	{% if t['ref'] not in course['goals'] %}
130		- <!-- <i class="fas fa-puzzle-piece"></i> -->
131		- <i class="bi bi-puzzle-fill"></i>
	118	+ <i class="bi bi-puzzle-fill"></i>
132	119	{% end %}
133		-
134		-
135	120	{{ t['name'] }}
136	121	</div>
137	122	</td>
138	123	<td class="text-center">
139		- <!-- <i class="fas fa-lock text-muted"></i> -->
140	124	<i class="bi bi-lock-fill text-muted"></i>
141	125	</td>
142	126	</tr>
...	...	@@ -147,46 +131,49 @@
147	131	<th scope="row" class="text-primary text-center">
148	132	{% if t['type']=='chapter' %}
149	133	<span class="text-nowrap" data-toggle="tooltip" data-placement="bottom" title="Fim do capítulo">
150		- <!-- <i class="fas fa-flag-checkered"></i>  -->
151		- <i class="bi bi-flag-fill"></i>
	134	+ <h5>
	135	+ <i class="bi bi-flag-fill"></i>
	136	+ </h5>
152	137	</span>
153	138	{% elif t['type']=='learn' %}
154	139	<span class="text-nowrap" data-toggle="tooltip" data-placement="bottom" title="Texto com matéria">
155		- <!-- <i class="fas fa-book"></i>  -->
156		- <!-- <i class="bi bi-book-fill"></i>  -->
157		- <i class="bi bi-book"></i>
	140	+ <h5>
	141	+ <i class="bi bi-book"></i>
	142	+ </h5>
158	143	</span>
159	144	{% else %}
160	145	<span class="text-nowrap" data-toggle="tooltip" data-placement="bottom" title="Exercícios">
161		- <!-- <i class="fas fa-pencil-alt"></i>  -->
162		- <!-- <i class="bi bi-pencil-fill"></i>  -->
163		- <i class="bi bi-pencil"></i>
	146	+ <h5>
	147	+ <i class="bi bi-pencil"></i>
	148	+ </h5>
164	149	</span>
165	150	{% end %}
166	151	</th>
167	152	<td class="text-primary">
168	153	{% if t['ref'] not in course['goals'] %}
169	154	<span class="text-nowrap" data-toggle="tooltip" data-placement="bottom" title="Pré-requisito para este curso">
170		- <!-- <i class="fas fa-puzzle-piece"></i> -->
171		- <i class="bi bi-puzzle-fill"></i>
	155	+ <h5>
	156	+ <i class="bi bi-puzzle-fill"></i>
	157	+ </h5>
172	158	</span>
173	159	{% end %}
174		-
175	160	{{ t['name'] }}
176	161	</td>
177	162
178	163	<td class="text-center">
179	164	{% if t['level'] < 0.01 %}
180		- <!-- <i class="fas fa-lock-open text-success"></i> -->
181		- <i class="bi bi-unlock-fill text-success"></i>
182		-
	165	+ <h5>
	166	+ <i class="bi bi-unlock-fill text-success"></i>
	167	+ </h5>
183	168	{% elif t['type']=='chapter' %}
184		- <!-- <h5><i class="fas fa-award text-warning"></i></h5> -->
185		- <i class="bi bi-award-fill"></i>
186		-
	169	+ <h5>
	170	+ <i class="bi bi-award-fill"></i>
	171	+ </h5>
187	172	{% else %}
188	173	<span class="text-nowrap text-warning" data-toggle="tooltip" data-placement="bottom" title="{{round(t['level']*5, 3)}}">
189		- {{ int(t['level']5+0.25)'<i class="bi bi-star-fill"></i>' }}{% if int(t['level']5+0.25) < 5 %}{{'<i class="bi bi-star-half"></i>' if 0.25 <= t['level']5-int(t['level']5) < 0.75 else '<i class="bi bi-star"></i>'}}{% end %}{{ (4-int(t['level']5+0.25))*'<i class="bi bi-star"></i>' }}
	174	+ <h5>
	175	+ {{ int(t['level']5+0.25)'<i class="bi bi-star-fill"></i>' }}{% if int(t['level']5+0.25) < 5 %}{{'<i class="bi bi-star-half"></i>' if 0.25 <= t['level']5-int(t['level']5) < 0.75 else '<i class="bi bi-star"></i>'}}{% end %}{{ (4-int(t['level']5+0.25))*'<i class="bi bi-star"></i>' }}
	176	+ </h5>
190	177	</span>
191	178	{% end %} <!-- if -->
192	179	</td>
...	...
...	...	@@ -14,9 +14,6 @@
14	14	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>
15	15	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css">
16	16
17		- <!-- font-awesome -->
18		- <!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" /> -->
19		-
20	17	<!-- mathjax -->
21	18	<script>
22	19	MathJax = {
...	...	@@ -63,7 +60,7 @@
63	60	<ul class="navbar-nav">
64	61	<li class="nav-item"><a class="nav-link" href="/courses">Cursos</a></li>
65	62	<li class="nav-item"><a class="nav-link active" aria-current="page" href="/course/{{course_id}}">Tópicos</a></li>
66		- <!-- <li class="nav-item"><a class="nav-link disabled" href="#">Classificação</a></li> -->
	63	+ <li class="nav-item"><a class="nav-link disabled" href="#">Classificação</a></li>
67	64	</ul>
68	65	<ul class="navbar-nav ms-auto">
69	66	<li class="nav-item dropdown">
...	...
...	...	@@ -0,0 +1,17 @@
	1	+- type: radio
	2	+ title: O que são números primos?
	3	+ text: \|
	4	+ Um número $n \ge 2$ é primo se os únicos divisores forem $1$ e $n$.
	5	+
	6	+ Por exemplo, o número $5$ é primo, pois $2,3,4$ não são divisores de $5$.
	7	+
	8	+ ---
	9	+
	10	+ O número $1$ é primo?
	11	+ options:
	12	+ - Não
	13	+ - Sim
	14	+ max_tries: 1
	15	+ solution: \|
	16	+ O número $1$ não é primo. Apenas podem ser primos os números a partir do
	17	+ $2$.
...	...