mo8it/AdvLabDB
1
0
Fork 0
mirror of https://codeberg.org/Mo8it/AdvLabDB.git synced 2024-09-19 18:31:16 +00:00
Code Releases Activity

Use base templates

Browse source
This commit is contained in:
Mo 2022-10-09 03:00:51 +02:00
parent 1c8582064a
commit 68335add60
10 changed files with 29 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
advlabdb/adminModelViews.py
View file

@ -1336,7 +1336,7 @@ class ImportView(SecureAdminBaseView):
except Exception as ex:
flash(str(ex), "error")
return self.render("import.jinja.html", form=form)
return self.render("admin_import.jinja.html", form=form)
class ActionsView(SecureAdminBaseView):
@ -1364,7 +1364,7 @@ class ActionsView(SecureAdminBaseView):
return redirect(self.url)
return self.render("actions.jinja.html", form=form)
return self.render("admin_actions.jinja.html", form=form)
class AnalysisView(SecureAdminBaseView):

13
advlabdb/templates/actions.jinja.html → advlabdb/templates/admin_actions.jinja.html
View file

@ -1,11 +1,6 @@
{% from "macros.jinja.html" import information %}
{% extends "admin/master.html" %}
{% block body %}
{{ information(current_user, active_semester_str, role="admin") }}
<hr>
{% extends "admin_base.jinja.html" %}
{% block content %}
<form method="POST">
{% for field in form %}
{% if field.widget.input_type == "checkbox" %}
@ -21,6 +16,4 @@
{% endif %}
{% endfor %}
</form>
{{ footer|safe }}
{% endblock body %}
{% endblock %}

13
advlabdb/templates/import.jinja.html → advlabdb/templates/admin_import.jinja.html
View file

@ -1,11 +1,6 @@
{% from "macros.jinja.html" import information %}
{% extends "admin/master.html" %}
{% block body %}
{{ information(current_user, active_semester_str, role="admin") }}
<hr>
{% extends "admin_base.jinja.html" %}
{% block content %}
{% for error in form.file.errors %}
<div class="alert alert-danger">
<strong>Error!</strong> {{ error }}
@ -243,6 +238,4 @@
<code>assistant_email</code>
</li>
</ul>
{{ footer|safe }}
{% endblock body %}
{% endblock %}

13
advlabdb/templates/admin_index.jinja.html
View file

@ -1,11 +1,6 @@
{% from "macros.jinja.html" import information %}
{% extends "admin/index.html" %}
{% block body %}
{{ information(current_user, active_semester_str, role="admin") }}
<hr>
{% extends "admin_base.jinja.html" %}
{% block content %}
<div class="d-inline-flex">
<div class="table">
<table class="table table-bordered">
@ -35,8 +30,4 @@
</table>
</div>
</div>
{{ super() }}
{{ footer|safe }}
{% endblock %}

11
advlabdb/templates/analysis/analysis.jinja.html
View file

@ -1,11 +1,6 @@
{% from "macros.jinja.html" import information %}
{% extends "admin/master.html" %}
{% block body %}
{{ information(current_user, active_semester_str, role="admin")}}
<hr>
{% extends "admin_base.jinja.html" %}
{% block content %}
<form method="POST">
{% for field in form %}
{% if field.widget.input_type == "submit" %}
@ -17,4 +12,4 @@
{% endif %}
{% endfor %}
</form>
{% endblock body %}
{% endblock %}

11
advlabdb/templates/analysis/assistant_marks.jinja.html
View file

@ -1,11 +1,6 @@
{% from "macros.jinja.html" import information %}
{% extends "admin/master.html" %}
{% block body %}
{{ information(current_user, active_semester_str, role="admin")}}
<hr>
{% extends "admin_base.jinja.html" %}
{% block content %}
<h2>Assistant's marks analysis</h2>
<p>
@ -38,4 +33,4 @@
<hr>
{% endfor %}
{% endblock body %}
{% endblock %}

11
advlabdb/templates/analysis/final_part_marks.jinja.html
View file

@ -1,11 +1,6 @@
{% from "macros.jinja.html" import information %}
{% extends "admin/master.html" %}
{% block body %}
{{ information(current_user, active_semester_str, role="admin")}}
<hr>
{% extends "admin_base.jinja.html" %}
{% block content %}
<h2>Final part marks analysis</h2>
<p>
@ -34,4 +29,4 @@
</div>
<br>
{% endblock body %}
{% endblock %}

13
advlabdb/templates/assistant_group_experiment_form.jinja.html
View file

@ -1,11 +1,6 @@
{% from "macros.jinja.html" import information %}
{% extends "admin/master.html" %}
{% block body %}
{{ information(current_user, active_semester_str, role="assistant") }}
<hr>
{% extends "assistant_base.jinja.html" %}
{% block content %}
<div class="d-inline-flex">
<table class="table table-bordered">
<tbody>
@ -177,6 +172,4 @@
It is for information related to the experiment and group.
Examples: Protocol received, submission until ..., etc.</p>
</font>
{{ footer|safe }}
{% endblock body %}
{% endblock %}

13
advlabdb/templates/assistant_index.jinja.html
View file

@ -1,16 +1,7 @@
{% from "macros.jinja.html" import information %}
{% extends "admin/index.html" %}
{% block body %}
{{ information(current_user, active_semester_str, role="assistant") }}
<hr>
{% extends "assistant_base.jinja.html" %}
{% block content %}
<p>
Number of <strong>missing</strong> final experiment marks: {{ number_of_missing_final_experiment_marks }}
</p>
{{ super() }}
{{ footer|safe }}
{% endblock %}

10
advlabdb/templates/docs/docs.jinja.html
View file

@ -1,12 +1,12 @@
{% from "macros.jinja.html" import information %}
{% extends "admin/master.html" %}
{% extends "base.jinja.html" %}
{% block body %}
{% block pre_content %}
{{ information(current_user, active_semester_str, role=role) }}
<hr>
{% endblock %}
{% block content %}
{% include "docs/" + role + ".jinja.html" %}
{{ footer|safe }}
{% endblock body %}
{% endblock %}