Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[waiting for django5.1] Content Security Policy #2099

Closed
wants to merge 13 commits into from
Closed

[waiting for django5.1] Content Security Policy #2099

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4063a40
Add mozilla-django-csp. Add CSP-nonces to everything. Inline-code is …
richardebeling Sep 25, 2023
111e100
CSP-compliant navbar
richardebeling Nov 13, 2023
03e92f7
rewrite onclick-attributes of modal buttons
richardebeling Nov 29, 2023
9d167f1
Rewrite non-modal onclick handlers
richardebeling Nov 29, 2023
2686535
Use utility classes instead of inline width styles
richardebeling Nov 29, 2023
1793174
Use d-none over inline display: none
richardebeling Nov 29, 2023
28f83c9
Fix JS error on login page
richardebeling Dec 18, 2023
3368115
Allow inline images and inline style for now
richardebeling Jan 8, 2024
216edd7
fixup! Add mozilla-django-csp. Add CSP-nonces to everything. Inline-c…
richardebeling Jan 22, 2024
a20173e
fixup! Use utility classes instead of inline width styles
richardebeling Jan 22, 2024
2aec369
fixup! Rewrite non-modal onclick handlers
richardebeling Jan 22, 2024
799063f
Formatting
richardebeling Jan 22, 2024
0eb488b
Merge remote-tracking branch 'upstream/main' into csp
richardebeling Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions evap/contributor/templates/contributor_index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
<table class="table table-seamless-links table-vertically-aligned">
<thead>
<tr>
<th style="width: 35%">{% trans 'Name' %}</th>
<th style="width: 15%">{% trans 'State' %}</th>
<th style="width: 17%">{% trans 'Evaluation period' %}</th>
<th style="width: 15%">{% trans 'Participants' %}</th>
<th style="width: 18%"></th>
<th class="width-percent-35">{% trans 'Name' %}</th>
<th class="width-percent-15">{% trans 'State' %}</th>
<th class="width-percent-17">{% trans 'Evaluation period' %}</th>
<th class="width-percent-15">{% trans 'Participants' %}</th>
<th class="width-percent-18"></th>
</tr>
</thead>
<tbody>
Expand Down
20 changes: 10 additions & 10 deletions evap/development/templates/development_components.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,11 +398,11 @@ <h6>Special rows</h6>
{% spaceless %}
<div class="distribution-bar-container">
<div class="distribution-bar">
<div class="vote-bg-green" style="width: 52%;">&nbsp;</div>
<div class="vote-bg-lime" style="width: 26%;">&nbsp;</div>
<div class="vote-bg-yellow" style="width: 13%;">&nbsp;</div>
<div class="vote-bg-orange" style="width: 6%;">&nbsp;</div>
<div class="vote-bg-red" style="width: 3%;">&nbsp;</div>
<div class="vote-bg-green width-percent-52">&nbsp;</div>
<div class="vote-bg-lime width-percent-26">&nbsp;</div>
<div class="vote-bg-yellow width-percent-13">&nbsp;</div>
<div class="vote-bg-orange width-percent-6">&nbsp;</div>
<div class="vote-bg-red width-percent-3">&nbsp;</div>
</div>
</div>
{% endspaceless %}
Expand Down Expand Up @@ -449,11 +449,11 @@ <h6>Special rows</h6>
{% spaceless %}
<div class="distribution-bar-container">
<div class="distribution-bar">
<div class="vote-bg-green" style="width: 52%;">&nbsp;</div>
<div class="vote-bg-lime" style="width: 26%;">&nbsp;</div>
<div class="vote-bg-yellow" style="width: 13%;">&nbsp;</div>
<div class="vote-bg-orange" style="width: 6%;">&nbsp;</div>
<div class="vote-bg-red" style="width: 3%;">&nbsp;</div>
<div class="vote-bg-green width-percent-52">&nbsp;</div>
<div class="vote-bg-lime width-percent-26">&nbsp;</div>
<div class="vote-bg-yellow width-percent-13">&nbsp;</div>
<div class="vote-bg-orange width-percent-6">&nbsp;</div>
<div class="vote-bg-red width-percent-3">&nbsp;</div>
</div>
</div>
{% endspaceless %}
Expand Down
8 changes: 4 additions & 4 deletions evap/evaluation/templates/contribution_formset.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ <h5 class="card-title me-auto">{% trans 'Contributors' %}</h5>
<thead>
<tr>
<th></th>
<th style="width: 30%">{% trans 'Contributor' %}</th>
<th style="width: 30%">{% trans 'Questionnaires' %}</th>
<th style="width: 30%">{% trans 'Options' %}</th>
<th style="width: 10%"></th>
<th class="width-percent-30">{% trans 'Contributor' %}</th>
<th class="width-percent-30">{% trans 'Questionnaires' %}</th>
<th class="width-percent-30">{% trans 'Options' %}</th>
<th class="width-percent-10"></th>
</tr>
</thead>
<tbody>
Expand Down
10 changes: 5 additions & 5 deletions evap/evaluation/templates/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div class="footer d-print-none">
<div class="color-bar">
<div class="vote-bg-green" style="width: 52%;"></div>
<div class="vote-bg-lime" style="width: 26%;"></div>
<div class="vote-bg-yellow" style="width: 13%;"></div>
<div class="vote-bg-orange" style="width: 6%;"></div>
<div class="vote-bg-red" style="width: 3%;"></div>
<div class="vote-bg-green width-percent-52"></div>
<div class="vote-bg-lime width-percent-26"></div>
<div class="vote-bg-yellow width-percent-13"></div>
<div class="vote-bg-orange width-percent-6"></div>
<div class="vote-bg-red width-percent-3"></div>
</div>
<nav class="navbar navbar-expand">
<div class="collapse navbar-collapse justify-content-between">
Expand Down
2 changes: 1 addition & 1 deletion evap/evaluation/templates/progress_bar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<span class="progress-container{% if warning %} progress-container-warning{% endif %} d-flex">
{% spaceless %}
<span class="progress">
<span class="progress-bar" style="width: {% widthratio done total 100 %}%;"></span>
<span class="progress-bar width-percent-{% widthratio done total 100 %}"></span>
<span class="progress-bartext">
{% if icon %}
<small><span class="fas fa-{{ icon }}"></span></small>&nbsp;
Expand Down
8 changes: 4 additions & 4 deletions evap/grades/templates/grades_course_view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ <h3 class="mb-3">{{ course.name }} ({{ semester.name }})</h3>
<table class="table table-striped table-vertically-aligned">
<thead>
<tr>
<th style="width: 40%">{% trans 'Description' %}</th>
<th style="width: 20%">{% trans 'Type' %}</th>
<th style="width: 25%">{% trans 'Last edited' %}</th>
<th style="width: 15%">{% trans 'Actions' %}</th>
<th class="width-percent-40">{% trans 'Description' %}</th>
<th class="width-percent-20">{% trans 'Type' %}</th>
<th class="width-percent-25">{% trans 'Last edited' %}</th>
<th class="width-percent-15">{% trans 'Actions' %}</th>
</tr>
</thead>
<tbody>
Expand Down
12 changes: 6 additions & 6 deletions evap/grades/templates/grades_semester_view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ <h3 class="col-8 mb-0">
<table class="table table-striped grade-course-table table-vertically-aligned">
<thead>
<tr>
<th style="width: 35%" class="col-order" data-col="name">{% trans 'Name' %}</th>
<th style="width: 20%" class="col-order" data-col="responsible">{% trans 'Responsible' %}</th>
<th style="width: 10%" class="col-order" data-col="complete">{% trans 'Evaluation completed' %}</th>
<th style="width: 10%" class="col-order" data-col="midterm-grades">{% trans 'Midterm grade documents' %}</th>
<th style="width: 10%" class="col-order" data-col="final-grades">{% trans 'Final grade documents' %}</th>
<th style="width: 15%" class="text-end">{% trans 'Actions' %}</th>
<th class="width-percent-35 col-order" data-col="name">{% trans 'Name' %}</th>
<th class="width-percent-20 col-order" data-col="responsible">{% trans 'Responsible' %}</th>
<th class="width-percent-10 col-order" data-col="complete">{% trans 'Evaluation completed' %}</th>
<th class="width-percent-10 col-order" data-col="midterm-grades">{% trans 'Midterm grade documents' %}</th>
<th class="width-percent-10 col-order" data-col="final-grades">{% trans 'Final grade documents' %}</th>
<th class="width-percent-15 text-end">{% trans 'Actions' %}</th>
</tr>
</thead>
<tbody>
Expand Down
16 changes: 8 additions & 8 deletions evap/rewards/templates/rewards_index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
<table class="table table-striped table-vertically-aligned mb-3">
<thead>
<tr>
<th style="width: 20%">{% trans 'Date' %}</th>
<th style="width: 40%">{% trans 'Event' %}</th>
<th style="width: 20%">{% trans 'Available until' %}</th>
<th style="width: 20%">{% trans 'Redeem points' %}</th>
<th class="width-percent-20">{% trans 'Date' %}</th>
<th class="width-percent-40">{% trans 'Event' %}</th>
<th class="width-percent-20">{% trans 'Available until' %}</th>
<th class="width-percent-20">{% trans 'Redeem points' %}</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -67,10 +67,10 @@
<table class="table table-striped">
<thead>
<tr>
<th style="width: 20%">{% trans 'Date' %}</th>
<th style="width: 40%">{% trans 'Action' %}</th>
<th style="width: 20%" class="text-end">{% trans 'Granted points' %}</th>
<th style="width: 20%" class="text-end">{% trans 'Redeemed points' %}</th>
<th class="width-percent-20">{% trans 'Date' %}</th>
<th class="width-percent-40">{% trans 'Action' %}</th>
<th class="width-percent-20 text-end">{% trans 'Granted points' %}</th>
<th class="width-percent-20 text-end">{% trans 'Redeemed points' %}</th>
</tr>
</thead>
<tbody>
Expand Down
10 changes: 5 additions & 5 deletions evap/rewards/templates/rewards_reward_point_redemption_event_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<table class="table table-striped">
<thead>
<tr>
<th style="width: 20%">{% trans 'Event date' %}</th>
<th style="width: 20%">{% trans 'Redemption end date' %}</th>
<th style="width: 30%">{% trans 'Event name' %}</th>
<th style="width: 15%">{% trans 'Redemptions' %}</th>
<th class="text-end" style="width: 15%">{% trans 'Actions' %}</th>
<th class="width-percent-20">{% trans 'Event date' %}</th>
<th class="width-percent-20">{% trans 'Redemption end date' %}</th>
<th class="width-percent-30">{% trans 'Event name' %}</th>
<th class="width-percent-15">{% trans 'Redemptions' %}</th>
<th class="width-percent-15 text-end">{% trans 'Actions' %}</th>
</tr>
</thead>
<tbody>
Expand Down
8 changes: 4 additions & 4 deletions evap/staff/templates/staff_course_type_index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
<thead>
<tr>
<th class="movable"></th>
<th style="width: 30%">{% trans 'Name (German)' %}</th>
<th style="width: 30%">{% trans 'Name (English)' %}</th>
<th style="width: 30%">{% trans 'Import names' %}</th>
<th class="text-end" style="width: 10%">{% trans 'Actions' %}</th>
<th class="width-percent-30">{% trans 'Name (German)' %}</th>
<th class="width-percent-30">{% trans 'Name (English)' %}</th>
<th class="width-percent-30">{% trans 'Import names' %}</th>
<th class="width-percent-10 text-end">{% trans 'Actions' %}</th>
</tr>
</thead>
<tbody>
Expand Down
8 changes: 4 additions & 4 deletions evap/staff/templates/staff_degree_index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
<thead>
<tr>
<th class="movable"></th>
<th style="width: 25%">{% trans 'Name (German)' %}</th>
<th style="width: 25%">{% trans 'Name (English)' %}</th>
<th style="width: 40%">{% trans 'Import names' %}</th>
<th class="text-end" style="width: 10%">{% trans 'Actions' %}</th>
<th class="width-percent-25">{% trans 'Name (German)' %}</th>
<th class="width-percent-25">{% trans 'Name (English)' %}</th>
<th class="width-percent-40">{% trans 'Import names' %}</th>
<th class="width-percent-10 text-end">{% trans 'Actions' %}</th>
</tr>
</thead>
<tbody>
Expand Down
6 changes: 3 additions & 3 deletions evap/staff/templates/staff_faq_index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<thead>
<tr>
<th class="movable"></th>
<th style="width: 45%">{% trans 'Section title (German)' %}</th>
<th style="width: 45%">{% trans 'Section title (English)' %}</th>
<th class="text-end" style="width: 10%">{% trans 'Actions' %}</th>
<th class="width-percent-45">{% trans 'Section title (German)' %}</th>
<th class="width-percent-45">{% trans 'Section title (English)' %}</th>
<th class="width-percent-10 text-end">{% trans 'Actions' %}</th>
</tr>
</thead>
<tbody>
Expand Down
6 changes: 3 additions & 3 deletions evap/staff/templates/staff_faq_section.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<thead>
<tr>
<th class="movable"></th>
<th style="width: 45%">{% trans 'Question/Answer (German)' %}</th>
<th style="width: 45%">{% trans 'Question/Answer (English)' %}</th>
<th class="text-end" style="width: 10%">{% trans 'Actions' %}</th>
<th class="width-percent-45">{% trans 'Question/Answer (German)' %}</th>
<th class="width-percent-45">{% trans 'Question/Answer (English)' %}</th>
<th class="width-percent-10 text-end">{% trans 'Actions' %}</th>
</tr>
</thead>
<tbody>
Expand Down
8 changes: 4 additions & 4 deletions evap/staff/templates/staff_questionnaire_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ <h5 class="card-title">{% trans 'Questions' %}</h5>
<thead>
<tr>
<th></th>
<th style="width: 37%">{% trans 'Question text (German)' %}</th>
<th style="width: 37%">{% trans 'Question text (English)' %}</th>
<th style="width: 20%">{% trans 'Question type' %}</th>
<th style="width: 6%"></th>
<th class="width-percent-37">{% trans 'Question text (German)' %}</th>
<th class="width-percent-37">{% trans 'Question text (English)' %}</th>
<th class="width-percent-20">{% trans 'Question type' %}</th>
<th class="width-percent-6"></th>
</tr>
</thead>
<tbody>
Expand Down
10 changes: 5 additions & 5 deletions evap/staff/templates/staff_questionnaire_index_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
<table class="table table-vertically-aligned table-striped questionnaire-table">
<thead>
<tr class="table-header">
<th class="movable" style="width: 3%"></th>
<th style="width: 52%">{% trans 'Questionnaire' %}</th>
<th style="width: 10%">
<th class="width-percent-3 movable"></th>
<th class="width-percent-52">{% trans 'Questionnaire' %}</th>
<th class="width-percent-10">
{% if type != 'contributor' %}
{% trans 'Locked' %}
{% endif %}
</th>
<th style="width: 15%">{% trans 'Visibility' %}</th>
<th class="text-end" style="width: 20%">{% trans 'Actions' %}</th>
<th class="width-percent-15">{% trans 'Visibility' %}</th>
<th class="width-percent-20 text-end">{% trans 'Actions' %}</th>
</tr>
</thead>
<tbody>
Expand Down
6 changes: 3 additions & 3 deletions evap/staff/templates/staff_semester_export.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ <h3>{% trans 'Export' %} {{ semester.name }}</h3>
<table id="exportsheets-table" class="table">
<thead>
<tr>
<th style="width: 25%">{% trans 'Degrees' %}</th>
<th style="width: 65%">{% trans 'Course types' %}</th>
<th style="width: 10%"></th>
<th class="width-percent-25">{% trans 'Degrees' %}</th>
<th class="width-percent-65">{% trans 'Course types' %}</th>
<th class="width-percent-10"></th>
</tr>
</thead>
<tbody>
Expand Down
6 changes: 3 additions & 3 deletions evap/staff/templates/staff_semester_preparation_reminder.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
<table class="table table-striped">
<thead>
<tr>
<th style="width: 57%">{% trans 'Name' %}</th>
<th style="width: 18%">{% trans 'Start of evaluation' %}</th>
<th style="width: 25%">{% trans 'Last modified by' %}</th>
<th class="width-percent-57">{% trans 'Name' %}</th>
<th class="width-percent-18">{% trans 'Start of evaluation' %}</th>
<th class="width-percent-25">{% trans 'Last modified by' %}</th>
</tr>
</thead>
<tbody>
Expand Down
10 changes: 5 additions & 5 deletions evap/staff/templates/staff_semester_view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ <h3>
<table class="table">
<thead>
<tr>
<th style="width: 19%">{% trans 'Degree' %}</th>
<th style="width: 30%">{% trans 'Evaluation period' %}</th>
<th style="width: 17%">{% trans 'Finished evaluations' %}</th>
<th style="width: 17%">{% trans 'Reviewed text answers' %}</th>
<th style="width: 17%">{% trans 'Participation' %}</th>
<th class="width-percent-19">{% trans 'Degree' %}</th>
<th class="width-percent-30">{% trans 'Evaluation period' %}</th>
<th class="width-percent-17">{% trans 'Finished evaluations' %}</th>
<th class="width-percent-17">{% trans 'Reviewed text answers' %}</th>
<th class="width-percent-17">{% trans 'Participation' %}</th>
</tr>
</thead>
<tbody>
Expand Down
4 changes: 2 additions & 2 deletions evap/staff/templates/staff_text_answer_warnings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<colgroup>
<col />
<col />
<col style="width: 30%" />
<col style="width: 30%" />
<col class="width-percent-30" />
<col class="width-percent-30" />
<col />
</colgroup>
<thead>
Expand Down
Loading