-
-
+{% endblock content %}
\ No newline at end of file
diff --git a/Cuentas/templates/components/header.html b/Cuentas/templates/components/header.html
index ad15a13..8dc69b9 100644
--- a/Cuentas/templates/components/header.html
+++ b/Cuentas/templates/components/header.html
@@ -1,4 +1,4 @@
-
+
-
+
-
TERCERO
+
+
+ {% include 'components/user_list.html' with users=users|filter_by_year:"3" %}
+
- {% include 'components/user_list.html' with users=users|filter_by_year:"3" %}
-
-
-
-{% endblock content %}
-
-{% block footer %}
- {% include 'components/footer.html' %}
-{% endblock %}
\ No newline at end of file
+
+
-
+
-
CUARTO
+
+
+ {% include 'components/user_list.html' with users=users|filter_by_year:"4" %}
+
- {% include 'components/user_list.html' with users=users|filter_by_year:"4" %}
-
-
+
{{ header_title }}
diff --git a/Cuentas/templates/components/user_card.html b/Cuentas/templates/components/user_card.html
index 56dffdd..7f95de1 100644
--- a/Cuentas/templates/components/user_card.html
+++ b/Cuentas/templates/components/user_card.html
@@ -3,27 +3,21 @@
{% if user.role == 'A' %}
{% if user.studentprofile.year == '4' %}
-
+
{% elif user.studentprofile.year == '3' %}
-
+
{% endif %}
{% else %}
-
+
{% endif %}
-
+
{{ user.first_name }} {{ user.last_name }}
{% thumbnail user.avatar "200x200" crop="center" as im %} - {% endthumbnail %}
- {% thumbnail user.avatar "200x200" crop="center" as im %} - {% endthumbnail %}
- {#{{ user.email }}#}
- {# {{ user.pronouns }}#}
- {{ user.studentprofile.get_year_display }}
- {#{{ user.get_role_display }}#}
-
\ No newline at end of file
diff --git a/Cuentas/templates/profesores.html b/Cuentas/templates/profesores.html
index 74252a5..e693bbd 100644
--- a/Cuentas/templates/profesores.html
+++ b/Cuentas/templates/profesores.html
@@ -7,24 +7,20 @@
{% endblock %}
{% block content %}
-
-
+
+
-{% endblock content %}
-
-{% block footer %}
- {% include 'components/footer.html' %}
-{% endblock %}
+{% endblock content %}
\ No newline at end of file
diff --git a/Fichas/templates/components/ficha-list-card.html b/Fichas/templates/components/ficha-list-card.html
index 72ecb45..49ce0db 100644
--- a/Fichas/templates/components/ficha-list-card.html
+++ b/Fichas/templates/components/ficha-list-card.html
@@ -2,7 +2,7 @@
{% include 'components/sidebar.html' %}
-
-
- {% include 'components/header.html' with header_title='Profesores' %}
+
+ {% include 'components/header.html' with header_title='Profesores' %}
+
+ class="col-start-2 col-span-full
+ items-start grid grid-rows-2 gap-3 pr-2">
{% include 'components/user_list.html' with users=users|filter_by_role:"P" title="Profesores" %}
{{ ficha.title }}
diff --git a/Fichas/templates/ficha_list.html b/Fichas/templates/ficha_list.html
index aa58f12..530500a 100644
--- a/Fichas/templates/ficha_list.html
+++ b/Fichas/templates/ficha_list.html
@@ -2,8 +2,8 @@
{% load static %}
{% block title %}Fichas {% endblock %}
{% block content %}
-
-
+
+
{% include 'components/sidebar.html' %}
{% if request.resolver_match.view_name == 'my-fichas' %}
@@ -11,10 +11,8 @@
{% else %}
{% include 'components/header.html' with header_title='Fichas' %}
{% endif %}
-
-
-