Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Alsijil
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Alsijil
Commits
a94bc45f
Commit
a94bc45f
authored
3 years ago
by
Julian
Browse files
Options
Downloads
Patches
Plain Diff
Move register absence and filter buttons
parent
80868b77
No related branches found
No related tags found
1 merge request
!111
Resolve "[Person overview] Implement multiple selection for marking absences as excused or for deleting"
Pipeline
#10534
failed
3 years ago
Stage: test
Stage: build
Stage: publish
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/alsijil/templates/alsijil/class_register/person.html
+12
-12
12 additions, 12 deletions
...apps/alsijil/templates/alsijil/class_register/person.html
with
12 additions
and
12 deletions
aleksis/apps/alsijil/templates/alsijil/class_register/person.html
+
12
−
12
View file @
a94bc45f
...
...
@@ -21,6 +21,13 @@
{% blocktrans with person=person %}
Class register overview for {{ person }}
{% endblocktrans %}
{% has_perm "alsijil.register_absence" user person as can_register_absence %}
{% if can_register_absence %}
<a
class=
"btn primary-color waves-effect waves-light right"
href=
"{% url "
register_absence
"
person.pk
%}"
>
<i
class=
"material-icons left"
>
rate_review
</i>
{% trans "Register absence" %}
</a>
{% endif %}
{% endblock %}
{% block content %}
...
...
@@ -52,15 +59,6 @@
<!-- Personal Note Tab -->
<div
class=
"col s12"
id=
"personal-notes"
>
{% has_perm "alsijil.edit_person_overview_personalnote" user person as can_mark_all_as_excused %}
{% has_perm "alsijil.register_absence" user person as can_register_absence %}
{% if can_register_absence %}
<a
class=
"btn primary-color waves-effect waves-light"
href=
"{% url "
register_absence
"
person.pk
%}"
>
<i
class=
"material-icons left"
>
rate_review
</i>
{% trans "Register absence" %}
</a>
{% endif %}
<div
class=
"col s12"
id=
"overview"
>
<h5>
{% trans "Relevant personal notes" %}
</h5>
<form
class=
"modal"
id=
"filter-modal"
>
...
...
@@ -80,14 +78,16 @@
</button>
</div>
</form>
{% has_perm "alsijil.edit_person_overview_personalnote" user person as can_mark_all_as_excused %}
<div
class=
"row"
>
<div
class=
"col s12 m3 l5 push-m9 push-l7"
>
<button
class=
"modal-trigger right btn primary-color waves-effect waves-light medium-high-right"
class=
"modal-trigger right btn primary-color waves-effect waves-light
{% if can_mark_all_as_excused %} medium-high-right {% endif %}"
data-target=
"filter-modal"
type=
"button"
>
Filter results ({{ num_filters }})
<i
class=
"material-icons right"
>
filter_alt
</i>
</button>
Filter results ({{ num_filters }})
<i
class=
"material-icons right"
>
filter_alt
</i>
</button>
</div>
<form
action=
""
method=
"post"
class=
""
>
{% csrf_token %}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment