mirror of
https://codeberg.org/Mo8it/AdvLabDB.git
synced 2024-09-19 18:31:16 +00:00
Use base templates
This commit is contained in:
parent
1c8582064a
commit
68335add60
10 changed files with 29 additions and 83 deletions
|
@ -1336,7 +1336,7 @@ class ImportView(SecureAdminBaseView):
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
flash(str(ex), "error")
|
flash(str(ex), "error")
|
||||||
|
|
||||||
return self.render("import.jinja.html", form=form)
|
return self.render("admin_import.jinja.html", form=form)
|
||||||
|
|
||||||
|
|
||||||
class ActionsView(SecureAdminBaseView):
|
class ActionsView(SecureAdminBaseView):
|
||||||
|
@ -1364,7 +1364,7 @@ class ActionsView(SecureAdminBaseView):
|
||||||
|
|
||||||
return redirect(self.url)
|
return redirect(self.url)
|
||||||
|
|
||||||
return self.render("actions.jinja.html", form=form)
|
return self.render("admin_actions.jinja.html", form=form)
|
||||||
|
|
||||||
|
|
||||||
class AnalysisView(SecureAdminBaseView):
|
class AnalysisView(SecureAdminBaseView):
|
||||||
|
|
|
@ -1,11 +1,6 @@
|
||||||
{% from "macros.jinja.html" import information %}
|
{% extends "admin_base.jinja.html" %}
|
||||||
{% extends "admin/master.html" %}
|
|
||||||
|
|
||||||
{% block body %}
|
|
||||||
{{ information(current_user, active_semester_str, role="admin") }}
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
<form method="POST">
|
<form method="POST">
|
||||||
{% for field in form %}
|
{% for field in form %}
|
||||||
{% if field.widget.input_type == "checkbox" %}
|
{% if field.widget.input_type == "checkbox" %}
|
||||||
|
@ -21,6 +16,4 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</form>
|
</form>
|
||||||
|
{% endblock %}
|
||||||
{{ footer|safe }}
|
|
||||||
{% endblock body %}
|
|
|
@ -1,11 +1,6 @@
|
||||||
{% from "macros.jinja.html" import information %}
|
{% extends "admin_base.jinja.html" %}
|
||||||
{% extends "admin/master.html" %}
|
|
||||||
|
|
||||||
{% block body %}
|
|
||||||
{{ information(current_user, active_semester_str, role="admin") }}
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
{% for error in form.file.errors %}
|
{% for error in form.file.errors %}
|
||||||
<div class="alert alert-danger">
|
<div class="alert alert-danger">
|
||||||
<strong>Error!</strong> {{ error }}
|
<strong>Error!</strong> {{ error }}
|
||||||
|
@ -243,6 +238,4 @@
|
||||||
<code>assistant_email</code>
|
<code>assistant_email</code>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
{% endblock %}
|
||||||
{{ footer|safe }}
|
|
||||||
{% endblock body %}
|
|
|
@ -1,11 +1,6 @@
|
||||||
{% from "macros.jinja.html" import information %}
|
{% extends "admin_base.jinja.html" %}
|
||||||
{% extends "admin/index.html" %}
|
|
||||||
|
|
||||||
{% block body %}
|
|
||||||
{{ information(current_user, active_semester_str, role="admin") }}
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
<div class="d-inline-flex">
|
<div class="d-inline-flex">
|
||||||
<div class="table">
|
<div class="table">
|
||||||
<table class="table table-bordered">
|
<table class="table table-bordered">
|
||||||
|
@ -35,8 +30,4 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{ super() }}
|
|
||||||
|
|
||||||
{{ footer|safe }}
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,11 +1,6 @@
|
||||||
{% from "macros.jinja.html" import information %}
|
{% extends "admin_base.jinja.html" %}
|
||||||
{% extends "admin/master.html" %}
|
|
||||||
|
|
||||||
{% block body %}
|
|
||||||
{{ information(current_user, active_semester_str, role="admin")}}
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
<form method="POST">
|
<form method="POST">
|
||||||
{% for field in form %}
|
{% for field in form %}
|
||||||
{% if field.widget.input_type == "submit" %}
|
{% if field.widget.input_type == "submit" %}
|
||||||
|
@ -17,4 +12,4 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</form>
|
</form>
|
||||||
{% endblock body %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,11 +1,6 @@
|
||||||
{% from "macros.jinja.html" import information %}
|
{% extends "admin_base.jinja.html" %}
|
||||||
{% extends "admin/master.html" %}
|
|
||||||
|
|
||||||
{% block body %}
|
|
||||||
{{ information(current_user, active_semester_str, role="admin")}}
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
<h2>Assistant's marks analysis</h2>
|
<h2>Assistant's marks analysis</h2>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
|
@ -38,4 +33,4 @@
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endblock body %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,11 +1,6 @@
|
||||||
{% from "macros.jinja.html" import information %}
|
{% extends "admin_base.jinja.html" %}
|
||||||
{% extends "admin/master.html" %}
|
|
||||||
|
|
||||||
{% block body %}
|
|
||||||
{{ information(current_user, active_semester_str, role="admin")}}
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
<h2>Final part marks analysis</h2>
|
<h2>Final part marks analysis</h2>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
|
@ -34,4 +29,4 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
{% endblock body %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,11 +1,6 @@
|
||||||
{% from "macros.jinja.html" import information %}
|
{% extends "assistant_base.jinja.html" %}
|
||||||
{% extends "admin/master.html" %}
|
|
||||||
|
|
||||||
{% block body %}
|
|
||||||
{{ information(current_user, active_semester_str, role="assistant") }}
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
<div class="d-inline-flex">
|
<div class="d-inline-flex">
|
||||||
<table class="table table-bordered">
|
<table class="table table-bordered">
|
||||||
<tbody>
|
<tbody>
|
||||||
|
@ -177,6 +172,4 @@
|
||||||
It is for information related to the experiment and group.
|
It is for information related to the experiment and group.
|
||||||
Examples: Protocol received, submission until ..., etc.</p>
|
Examples: Protocol received, submission until ..., etc.</p>
|
||||||
</font>
|
</font>
|
||||||
|
{% endblock %}
|
||||||
{{ footer|safe }}
|
|
||||||
{% endblock body %}
|
|
||||||
|
|
|
@ -1,16 +1,7 @@
|
||||||
{% from "macros.jinja.html" import information %}
|
{% extends "assistant_base.jinja.html" %}
|
||||||
{% extends "admin/index.html" %}
|
|
||||||
|
|
||||||
{% block body %}
|
|
||||||
{{ information(current_user, active_semester_str, role="assistant") }}
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
<p>
|
<p>
|
||||||
Number of <strong>missing</strong> final experiment marks: {{ number_of_missing_final_experiment_marks }}
|
Number of <strong>missing</strong> final experiment marks: {{ number_of_missing_final_experiment_marks }}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
{{ super() }}
|
|
||||||
|
|
||||||
{{ footer|safe }}
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
{% from "macros.jinja.html" import information %}
|
{% 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) }}
|
{{ information(current_user, active_semester_str, role=role) }}
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
{% include "docs/" + role + ".jinja.html" %}
|
{% include "docs/" + role + ".jinja.html" %}
|
||||||
|
{% endblock %}
|
||||||
{{ footer|safe }}
|
|
||||||
{% endblock body %}
|
|
||||||
|
|
Loading…
Reference in a new issue