Skip to content
Snippets Groups Projects
Commit eea85f25 authored by Johannes Wolf's avatar Johannes Wolf
Browse files

rtl and utilities changes

parent d1270d9c
Branches
No related tags found
No related merge requests found
Showing
with 51 additions and 49 deletions
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<div class="card mb-3"> <div class="card mb-3">
<div class="card-body"> <div class="card-body">
<div class="d-flex"> <div class="d-flex">
<h5 class="card-title mr-auto">{% trans 'Evaluation data' %}</h5> <h5 class="card-title me-auto">{% trans 'Evaluation data' %}</h5>
{% if not evaluation.allow_editors_to_edit %} {% if not evaluation.allow_editors_to_edit %}
<div> <div>
<button type="button" class="btn btn-sm btn-light" onclick="changeEvaluationRequestModalShow();" id="changeEvaluationRequestModalButton"> <button type="button" class="btn btn-sm btn-light" onclick="changeEvaluationRequestModalShow();" id="changeEvaluationRequestModalButton">
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<div class="card-body"> <div class="card-body">
<fieldset> <fieldset>
<div class="d-flex"> <div class="d-flex">
<h5 class="card-title mr-auto">{% trans 'Participants' %}</h5> <h5 class="card-title me-auto">{% trans 'Participants' %}</h5>
<div> <div>
<button type="button" class="btn btn-sm btn-light" onclick="changeParticipantRequestModalShow();" id="changeParticipantRequestModalButton"> <button type="button" class="btn btn-sm btn-light" onclick="changeParticipantRequestModalShow();" id="changeParticipantRequestModalButton">
{% trans 'Request changes' %} {% trans 'Request changes' %}
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="callout-header d-flex"> <div class="callout-header d-flex">
<span class="fas fa-info-circle callout-icon"></span> <span class="fas fa-info-circle callout-icon"></span>
<span>{% trans 'Information for contributors' %}</span> <span>{% trans 'Information for contributors' %}</span>
<button type="button" class="btn-close callout-closable-close ml-auto" data-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close callout-closable-close ms-auto" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
<div class="callout-content small"> <div class="callout-content small">
<b>{% trans 'Delegates' %}</b><br /> <b>{% trans 'Delegates' %}</b><br />
...@@ -35,11 +35,11 @@ ...@@ -35,11 +35,11 @@
</div> </div>
</div> </div>
<div class="d-flex mb-3"> <div class="d-flex mb-3">
<div class="ml-auto d-print-none"> <div class="ms-auto d-print-none">
<a href="{% url 'contributor:export' %}" class="btn btn-sm btn-light">{% trans 'Export results' %}</a> <a href="{% url 'contributor:export' %}" class="btn btn-sm btn-light">{% trans 'Export results' %}</a>
</div> </div>
{% if user.is_delegate %} {% if user.is_delegate %}
<div class="btn-switch btn-switch-light mb-auto ml-2 d-print-none"> <div class="btn-switch btn-switch-light mb-auto ms-2 d-print-none">
<div class="btn-switch-label"><span class="fas fa-user-friends"></span> {% trans 'Delegated evaluations' %}</div> <div class="btn-switch-label"><span class="fas fa-user-friends"></span> {% trans 'Delegated evaluations' %}</div>
<div class="btn-switch btn-group"> <div class="btn-switch btn-group">
<a href="{% url 'contributor:index' %}?show_delegated=true" role="button" class="btn btn-sm btn-light{% if show_delegated %} active{% endif %}"> <a href="{% url 'contributor:index' %}?show_delegated=true" role="button" class="btn btn-sm btn-light{% if show_delegated %} active{% endif %}">
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<span class="fas fa-user"></span> {{ evaluation.num_participants }} <span class="fas fa-user"></span> {{ evaluation.num_participants }}
</td> </td>
{% endif %} {% endif %}
<td class="text-right"> <td class="text-end">
{% if evaluation.state != evaluation.State.PUBLISHED and not evaluation.is_single_result %} {% if evaluation.state != evaluation.State.PUBLISHED and not evaluation.is_single_result %}
{% if evaluation|is_user_editor_or_delegate:user %} {% if evaluation|is_user_editor_or_delegate:user %}
{% if evaluation.state == evaluation.State.PREPARED %} {% if evaluation.state == evaluation.State.PREPARED %}
......
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
<div class="callout-header d-flex"> <div class="callout-header d-flex">
<span class="fas fa-info-circle callout-icon"></span> <span class="fas fa-info-circle callout-icon"></span>
<span>Information</span> <span>Information</span>
<button type="button" class="btn-close callout-closable-close ml-auto" data-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close callout-closable-close ms-auto" data-bs-dismiss="modal" aria-label="Close">
</div> </div>
<div class="callout-content"> <div class="callout-content">
Give the user some explanation. Give the user some explanation.
...@@ -407,7 +407,7 @@ ...@@ -407,7 +407,7 @@
</div> </div>
</div> </div>
{% endspaceless %} {% endspaceless %}
<div class="badge-grade ml-2" style="background-color: rgb(177, 205, 82)">1.8</div> <div class="badge-grade ms-2" style="background-color: rgb(177, 205, 82)">1.8</div>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -458,7 +458,7 @@ ...@@ -458,7 +458,7 @@
</div> </div>
</div> </div>
{% endspaceless %} {% endspaceless %}
<div class="badge-grade ml-2" style="background-color: rgb(177, 205, 82)">1.8</div> <div class="badge-grade ms-2" style="background-color: rgb(177, 205, 82)">1.8</div>
</div> </div>
</td> </td>
</tr> </tr>
......
<div class="mb-3 d-md-flex"> <div class="mb-3 d-md-flex">
<div class="col-md-2"> <div class="col-md-2">
<div class="nav nav-pills btn-switch btn-group-vertical float-right" role="tablist"> <div class="nav nav-pills btn-switch btn-group-vertical float-end" role="tablist">
{% for field in fields %} {% for field in fields %}
<a class="px-2 py-1 space-normal font-weight-bold btn btn-light text-center nav-link {% if forloop.first %}show active{% endif %}" href="#tab-{{ field.id_for_label }}" data-toggle="pill" role="tab" aria-controls="pills-{{ field.label }}" aria-selected="{% if forloop.first %}true{% endif %}"> <a class="px-2 py-1 space-normal fw-bold btn btn-light text-center nav-link {% if forloop.first %}show active{% endif %}" href="#tab-{{ field.id_for_label }}" data-toggle="pill" role="tab" aria-controls="pills-{{ field.label }}" aria-selected="{% if forloop.first %}true{% endif %}">
{{ field.label }} {{ field.label }}
</a> </a>
{% endfor %} {% endfor %}
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<fieldset> <fieldset>
<div class="d-flex mb-2"> <div class="d-flex mb-2">
<h5 class="card-title mr-auto">{% trans 'Contributors' %}</h5> <h5 class="card-title me-auto">{% trans 'Contributors' %}</h5>
{% if not manager %} {% if not manager %}
<div> <div>
<button type="button" class="btn btn-sm btn-light" onclick="createAccountRequestModalShow();" id="createAccountRequestModalButton"> <button type="button" class="btn btn-sm btn-light" onclick="createAccountRequestModalShow();" id="createAccountRequestModalButton">
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
{% include 'bootstrap_form_field.html' with field=new_key_form.email wide=True %} {% include 'bootstrap_form_field.html' with field=new_key_form.email wide=True %}
<div class="d-flex justify-content-center"> <div class="d-flex justify-content-center">
<button type="submit" class="btn btn-dark login-button">{% trans 'Request login URL' %}</button> <button type="submit" class="btn btn-dark login-button">{% trans 'Request login URL' %}</button>
<button type="button" class="btn btn-light ml-1" data-toggle="modal" data-target="#loginProblemsModal"> <button type="button" class="btn btn-light ms-1" data-bs-toggle="modal" data-bs-target="#loginProblemsModal">
{% trans 'Help' %} {% trans 'Help' %}
</button> </button>
</div> </div>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
{% for log_group in logged_object.grouped_logentries %} {% for log_group in logged_object.grouped_logentries %}
<li class="list-group-item"> <li class="list-group-item">
<p> <p>
<span class="pr-3"> <span class="pe-3">
<span class="far fa-clock" aria-hidden="true"></span> <span class="far fa-clock" aria-hidden="true"></span>
{{ log_group.0.datetime|date:"SHORT_DATETIME_FORMAT" }} {{ log_group.0.datetime|date:"SHORT_DATETIME_FORMAT" }}
</span> </span>
......
{% load static %} {% load static %}
{% load evaluation_filters %} {% load evaluation_filters %}
<nav class="navbar navbar-dark {% if debug %}bg-debug{% else %}bg-dark{% endif %} {% if user.is_participant and user.is_responsible_or_contributor_or_delegate or user.is_reviewer %}navbar-expand-xl{% else %}navbar-expand-lg{% endif %} pl-0"> <nav class="navbar navbar-dark {% if debug %}bg-debug{% else %}bg-dark{% endif %} {% if user.is_participant and user.is_responsible_or_contributor_or_delegate or user.is_reviewer %}navbar-expand-xl{% else %}navbar-expand-lg{% endif %} ps-0">
<a class="d-block <a class="d-block
{% if user.is_participant and user.is_responsible_or_contributor_or_delegate or user.is_reviewer %} {% if user.is_participant and user.is_responsible_or_contributor_or_delegate or user.is_reviewer %}
d-xl-none d-xl-none
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
</li> </li>
{% if user.is_authenticated %} {% if user.is_authenticated %}
{% if user.has_staff_permission %} {% if user.has_staff_permission %}
<li class="nav-item btn-switch-navbar my-auto pl-2"> <li class="nav-item btn-switch-navbar my-auto ps-2">
<div class="btn-group"> <div class="btn-group">
<form method="post" action="{% url 'staff:exit_staff_mode' %}"> <form method="post" action="{% url 'staff:exit_staff_mode' %}">
{% csrf_token %} {% csrf_token %}
......
<span class="far fa-eye ml-1 icon-gray" data-toggle="tooltip" data-placement="left" title=" <span class="far fa-eye ms-1 icon-gray" data-bs-toggle="tooltip" data-bs-placement="left" title="
{{ intro_text }}<br /> {{ intro_text }}<br />
{% for contributor in visible_by_contribution %} {% for contributor in visible_by_contribution %}
{{ contributor.full_name }}{% if contributor.is_proxy_user %} ({% blocktrans count delegate_count=contributor.delegates.count %}{{ delegate_count }} person{% plural %}{{ delegate_count }} people{% endblocktrans %}){% endif %}{% if not forloop.last or visible_by_delegation_count > 0 %}, {% endif %} {{ contributor.full_name }}{% if contributor.is_proxy_user %} ({% blocktrans count delegate_count=contributor.delegates.count %}{{ delegate_count }} person{% plural %}{{ delegate_count }} people{% endblocktrans %}){% endif %}{% if not forloop.last or visible_by_delegation_count > 0 %}, {% endif %}
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<th style="width: 10%" class="col-order" data-col="complete">{% trans 'Evaluation completed' %}</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="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: 10%" class="col-order" data-col="final-grades">{% trans 'Final grade documents' %}</th>
<th style="width: 15%" class="text-right">{% trans 'Actions' %}</th> <th style="width: 15%" class="text-end">{% trans 'Actions' %}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</a> </a>
{% endif %} {% endif %}
</td> </td>
<td class="text-right" style="min-width:72px"> <td class="text-end" style="min-width:72px">
{% if not course.gets_no_grade_documents %} {% if not course.gets_no_grade_documents %}
{% if num_final_grades == 0 %} {% if num_final_grades == 0 %}
<button type="button" {{ disable_if_archived }} onclick="confirmNouploadModalShow({{ course.id }}, '{{ course.name|escapejs }}');" class="btn btn-sm btn-secondary" data-toggle="tooltip" data-placement="top" title="{% trans 'Confirm that final grades have been submitted but will not be uploaded.' %}"> <button type="button" {{ disable_if_archived }} onclick="confirmNouploadModalShow({{ course.id }}, '{{ course.name|escapejs }}');" class="btn btn-sm btn-secondary" data-toggle="tooltip" data-placement="top" title="{% trans 'Confirm that final grades have been submitted but will not be uploaded.' %}">
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
{% spaceless %} {% spaceless %}
{% if question_result.has_answers %} {% if question_result.has_answers %}
<div class="result-widget d-flex" <div class="result-widget d-flex"
data-toggle="tooltip" data-placement="left" data-fallback-placement='["left", "bottom"]' data-bs-toggle="tooltip" data-bs-placement="left" data-fallback-placement='["left", "bottom"]'
title="{% include 'result_widget_tooltip.html' with question_result=question_result %}" title="{% include 'result_widget_tooltip.html' with question_result=question_result %}"
> >
<div class="badge-participants badge-participants-{{ question_result.count_sum|participationclass:num_voters }} mr-2 mr-lg-3"> <div class="badge-participants badge-participants-{{ question_result.count_sum|participationclass:num_voters }} me-2 me-lg-3">
<span class="fas fa-user"></span> {{ question_result.count_sum }} <span class="fas fa-user"></span> {{ question_result.count_sum }}
</div> </div>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</div> </div>
{% else %} {% else %}
<div class="d-flex" data-toggle="tooltip" data-placement="left" data-fallback-placement='["left", "bottom"]' title="{% trans 'Not enough answers were given.' %}"> <div class="d-flex" data-toggle="tooltip" data-placement="left" data-fallback-placement='["left", "bottom"]' title="{% trans 'Not enough answers were given.' %}">
<div class="badge-participants badge-disabled mr-2 mr-lg-3"> <div class="badge-participants badge-disabled me-2 me-lg-3">
{% if question_result.is_published %} {% if question_result.is_published %}
<span class="fas fa-user"></span> {{ question_result.count_sum }} <span class="fas fa-user"></span> {{ question_result.count_sum }}
{% else %} {% else %}
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<span class="right">{{ weight_info }}</span> <span class="right">{{ weight_info }}</span>
{% endif %} {% endif %}
</div> </div>
<div class="badge-grade ml-2{% if question_result.warning %} participants-warning{% endif %}" style="background-color: {{ average|gradecolor }}"> <div class="badge-grade ms-2{% if question_result.warning %} participants-warning{% endif %}" style="background-color: {{ average|gradecolor }}">
{% if question_result.question.is_yes_no_question %} {% if question_result.question.is_yes_no_question %}
{{ question_result.approval_count|percentage:question_result.count_sum }} {{ question_result.approval_count|percentage:question_result.count_sum }}
{% else %} {% else %}
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
<span class="right">{{ weight_info }}</span> <span class="right">{{ weight_info }}</span>
{% endif %} {% endif %}
</div> </div>
<div class="badge-grade badge-disabled ml-2"><span class="{{ icon }}"></span></div> <div class="badge-grade badge-disabled ms-2"><span class="{{ icon }}"></span></div>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</div> </div>
{% endif %} {% endif %}
<div class="d-flex"> <div class="d-flex">
<h3 class="mr-auto">{{ evaluation.full_name }} ({{ evaluation.course.semester.name }})</h3> <h3 class="me-auto">{{ evaluation.full_name }} ({{ evaluation.course.semester.name }})</h3>
<div class="btn-switch btn-switch-light my-auto d-print-none"> <div class="btn-switch btn-switch-light my-auto d-print-none">
<div class="btn-switch-label">{% trans 'View' %}</div> <div class="btn-switch-label">{% trans 'View' %}</div>
...@@ -72,16 +72,16 @@ ...@@ -72,16 +72,16 @@
<div class="card card-outline-primary mb-3"> <div class="card card-outline-primary mb-3">
<div class="card-header d-flex"> <div class="card-header d-flex">
<div class="mr-auto">{% trans 'Overview' %}</div> <div class="me-auto">{% trans 'Overview' %}</div>
{% if can_export_text_answers %} {% if can_export_text_answers %}
<a class="btn btn-sm btn-light d-print-none" href="{% url 'results:evaluation_text_answers_export' evaluation.id %}?view={{ view }}{% if contributor_id is not None %}&contributor_id={{ contributor_id }}{% endif %}" type="button"> <a class="btn btn-sm btn-light d-print-none" href="{% url 'results:evaluation_text_answers_export' evaluation.id %}?view={{ view }}{% if contributor_id is not None %}&contributor_id={{ contributor_id }}{% endif %}" type="button">
{% trans 'Export text answers' %} {% trans 'Export text answers' %}
</a> </a>
{% endif %} {% endif %}
{% if evaluation.course.grade_documents.count == 1 and can_download_grades %} {% if evaluation.course.grade_documents.count == 1 and can_download_grades %}
<a class="btn btn-sm btn-light d-print-none ml-2" href="{% url 'grades:download_grades' evaluation.course.grade_documents.first.id %}">{{ evaluation.course.grade_documents.first.description }}</a> <a class="btn btn-sm btn-light d-print-none ms-2" href="{% url 'grades:download_grades' evaluation.course.grade_documents.first.id %}">{{ evaluation.course.grade_documents.first.description }}</a>
{% elif evaluation.course.grade_documents.count > 1 and can_download_grades %} {% elif evaluation.course.grade_documents.count > 1 and can_download_grades %}
<div class="btn-group d-print-none ml-2" role="group"> <div class="btn-group d-print-none ms-2" role="group">
<button type="button" id="btnDownload" class="btn btn-sm btn-light dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{% trans 'Grades' %}</button> <button type="button" id="btnDownload" class="btn btn-sm btn-light dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{% trans 'Grades' %}</button>
<div class="dropdown-menu" aria-labelledby="btnDownload"> <div class="dropdown-menu" aria-labelledby="btnDownload">
{% for grade_document in evaluation.course.grade_documents.all %} {% for grade_document in evaluation.course.grade_documents.all %}
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
{% for contribution_result in contributor_contribution_results %} {% for contribution_result in contributor_contribution_results %}
<div class="card collapsible{% if not forloop.last %} mb-3{% endif %}"> <div class="card collapsible{% if not forloop.last %} mb-3{% endif %}">
<div class="card-header d-flex"> <div class="card-header d-flex">
<div class="mr-auto"> <div class="me-auto">
<a class="collapse-toggle{% if not contribution_result.has_answers %} collapsed{% endif %}" <a class="collapse-toggle{% if not contribution_result.has_answers %} collapsed{% endif %}"
data-toggle="collapse" href="#contributor-{{ contribution_result.contributor.id }}" data-toggle="collapse" href="#contributor-{{ contribution_result.contributor.id }}"
aria-controls="contributor-{{ contribution_result.contributor.id }}"> aria-controls="contributor-{{ contribution_result.contributor.id }}">
......
<div class="d-md-flex print-no-break"> <div class="d-md-flex print-no-break">
<h4>{{ questionnaire_result.questionnaire.public_name }}</h4> <h4>{{ questionnaire_result.questionnaire.public_name }}</h4>
{% if questionnaire_result.warning %} {% if questionnaire_result.warning %}
<p class="ml-auto mt-auto participants-warning"> <p class="ms-auto mt-auto participants-warning">
<span class="fas fa-exclamation-triangle"></span> <span class="fas fa-exclamation-triangle"></span>
{% trans 'Only a few participants answered these questions.' %} {% trans 'Only a few participants answered these questions.' %}
</p> </p>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="card-body"> <div class="card-body">
<h5 class="card-title"> <h5 class="card-title">
{% trans 'Filter' %} {% trans 'Filter' %}
<span class="reset-button float-right" data-reset="filter"> <span class="reset-button float-end" data-reset="filter">
<span class="fas fa-eraser"></span> <span class="fas fa-eraser"></span>
{% trans 'Clear all filters' %} {% trans 'Clear all filters' %}
</span> </span>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<div class="card-body pb-lg-0"> <div class="card-body pb-lg-0">
<h5 class="card-title mb-lg-0"> <h5 class="card-title mb-lg-0">
{% trans 'Order' %} {% trans 'Order' %}
<span class="reset-button float-right d-none d-lg-block" data-reset="order"> <span class="reset-button float-end d-none d-lg-block" data-reset="order">
<span class="fas fa-sort-amount-down"></span> <span class="fas fa-sort-amount-down"></span>
{% trans 'Order by evaluation and semester' %} {% trans 'Order by evaluation and semester' %}
</span> </span>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<div data-col="result" class="col-order">{% trans 'Distribution and average grade' %}</div> <div data-col="result" class="col-order">{% trans 'Distribution and average grade' %}</div>
</div> </div>
<div class="d-flex d-lg-none"> <div class="d-flex d-lg-none">
<div class="mr-2 btn-switch btn-group btn-group-toggle icon-buttons" data-toggle="buttons"> <div class="me-2 btn-switch btn-group btn-group-toggle icon-buttons" data-bs-toggle="buttons">
<label class="btn btn-light btn-lg active"> <label class="btn btn-light btn-lg active">
<input type="radio" name="result-sort-order" value="asc" /> <input type="radio" name="result-sort-order" value="asc" />
<span class="fas fa-sort-alpha-down"></span> <span class="fas fa-sort-alpha-down"></span>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
<div class="ml-auto d-print-none"> <div class="ms-auto d-print-none">
{% blocktrans asvar intro_text %}These text answers can be seen by:{% endblocktrans %} {% blocktrans asvar intro_text %}These text answers can be seen by:{% endblocktrans %}
{% include 'textanswer_visibility_info.html' with intro_text=intro_text visible_by_contribution=question_result.answers_visible_to.visible_by_contribution visible_by_delegation_count=question_result.answers_visible_to.visible_by_delegation_count %} {% include 'textanswer_visibility_info.html' with intro_text=intro_text visible_by_contribution=question_result.answers_visible_to.visible_by_contribution visible_by_delegation_count=question_result.answers_visible_to.visible_by_delegation_count %}
</div> </div>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<th style="width: 20%">{% trans 'Date' %}</th> <th style="width: 20%">{% trans 'Date' %}</th>
<th style="width: 40%">{% trans 'Event' %}</th> <th style="width: 40%">{% trans 'Event' %}</th>
<th style="width: 20%">{% trans 'Available until' %}</th> <th style="width: 20%">{% trans 'Available until' %}</th>
<th style="width: 20%" class="text-right">{% trans 'Redeem points' %}</th> <th style="width: 20%" class="text-end">{% trans 'Redeem points' %}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
<td>{{ event.date }}</td> <td>{{ event.date }}</td>
<td>{{ event.name }}</td> <td>{{ event.name }}</td>
<td>{{ event.redeem_end_date }}</td> <td>{{ event.redeem_end_date }}</td>
<td class="text-right"> <td class="text-end">
<select class="form-control pull-right" id="id_points-{{ event.id }}" name="points-{{ event.id }}" style="width:5em"> <select class="form-control" id="id_points-{{ event.id }}" name="points-{{ event.id }}" style="width:5em">
{% for p in point_selection %} {% for p in point_selection %}
<option value="{{ p }}">{{ p }}</option> <option value="{{ p }}">{{ p }}</option>
{% endfor %} {% endfor %}
...@@ -48,7 +48,9 @@ ...@@ -48,7 +48,9 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
<button type="submit" class="btn btn-primary pull-right">{% trans 'Redeem' %}</button> <span class="d-flex">
<button type="submit" class="btn btn-primary ms-auto">{% trans 'Redeem' %}</button>
</span>
</form> </form>
{% else %} {% else %}
<p class="font-italic">{% blocktrans %}Currently there are no events available for which you can redeem points. We'll send you a message when this changes.{% endblocktrans %}</p> <p class="font-italic">{% blocktrans %}Currently there are no events available for which you can redeem points. We'll send you a message when this changes.{% endblocktrans %}</p>
...@@ -70,8 +72,8 @@ ...@@ -70,8 +72,8 @@
<tr> <tr>
<th style="width: 20%">{% trans 'Date' %}</th> <th style="width: 20%">{% trans 'Date' %}</th>
<th style="width: 40%">{% trans 'Action' %}</th> <th style="width: 40%">{% trans 'Action' %}</th>
<th style="width: 20%" class="text-right">{% trans 'Granted points' %}</th> <th style="width: 20%" class="text-end">{% trans 'Granted points' %}</th>
<th style="width: 20%" class="text-right">{% trans 'Redeemed points' %}</th> <th style="width: 20%" class="text-end">{% trans 'Redeemed points' %}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -79,8 +81,8 @@ ...@@ -79,8 +81,8 @@
<tr> <tr>
<td>{{ action_time }}</td> <td>{{ action_time }}</td>
<td>{{ event_name }}</td> <td>{{ event_name }}</td>
<td class="text-right">{{ granting_value }}</td> <td class="text-end">{{ granting_value }}</td>
<td class="text-right">{{ redemption_value }}</td> <td class="text-end">{{ redemption_value }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
......
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
</div> </div>
<div class="mb-3 d-flex"> <div class="mb-3 d-flex">
<div class="form-label pe-4"> <div class="form-label pe-4">
<div class="nav nav-pills btn-switch btn-group-vertical float-right" role="tablist"> <div class="nav nav-pills btn-switch btn-group-vertical float-end" role="tablist">
<a class="p-1 space-normal font-weight-bold btn btn-light text-center nav-link show active" href="#tab-plain{{ id_suffix }}" data-toggle="pill" role="tab" aria-controls="pills-plain{{ id_suffix }}" aria-selected="true"> <a class="p-1 space-normal fw-bold btn btn-light text-center nav-link show active" href="#tab-plain{{ id_suffix }}" data-toggle="pill" role="tab" aria-controls="pills-plain{{ id_suffix }}" aria-selected="true">
{% trans 'Plain Text' %} {% trans 'Plain Text' %}
</a> </a>
<a class="p-1 space-normal font-weight-bold btn btn-light text-center nav-link" href="#tab-html{{ id_suffix }}" data-toggle="pill" role="tab" aria-controls="pills-html{{ id_suffix }}" aria-selected="false"> <a class="p-1 space-normal fw-bold btn btn-light text-center nav-link" href="#tab-html{{ id_suffix }}" data-toggle="pill" role="tab" aria-controls="pills-html{{ id_suffix }}" aria-selected="false">
{% trans 'HTML' %} {% trans 'HTML' %}
</a> </a>
</div> </div>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
{% else %} {% else %}
<button name="operation" value="test-participants" type="submit" class="btn btn-sm btn-light form-submit-btn">{% trans 'Upload and test' %}</button> <button name="operation" value="test-participants" type="submit" class="btn btn-sm btn-light form-submit-btn">{% trans 'Upload and test' %}</button>
<div class="mt-2"> <div class="mt-2">
<button name="operation" value="import-participants" type="button" onclick="importParticipantsModalShow('import-participants');" class="btn btn-sm btn-primary mr-1 form-submit-btn";>{% trans 'Import previously uploaded file' %}</button> <button name="operation" value="import-participants" type="button" onclick="importParticipantsModalShow('import-participants');" class="btn btn-sm btn-primary me-1 form-submit-btn";>{% trans 'Import previously uploaded file' %}</button>
<button name="operation" value="import-replace-participants" type="button" onclick="replaceParticipantsModalShow('import-replace-participants');" class="btn btn-sm btn-danger form-submit-btn">{% trans 'Replace participants' %}</button> <button name="operation" value="import-replace-participants" type="button" onclick="replaceParticipantsModalShow('import-replace-participants');" class="btn btn-sm btn-danger form-submit-btn">{% trans 'Replace participants' %}</button>
</div> </div>
{% endif %} {% endif %}
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</div> </div>
<div class="card-footer text-center"> <div class="card-footer text-center">
<button name="operation" value="copy-participants" type="button" onclick="copyParticipantsModalShow('copy-participants');" class="btn btn-sm btn-primary form-submit-btn">{% trans 'Copy participants' %}</button> <button name="operation" value="copy-participants" type="button" onclick="copyParticipantsModalShow('copy-participants');" class="btn btn-sm btn-primary form-submit-btn">{% trans 'Copy participants' %}</button>
<button name="operation" value="copy-replace-participants" type="button" onclick="copyReplaceParticipantsModalShow('copy-replace-participants');" class="btn btn-sm btn-danger ml-1 form-submit-btn">{% trans 'Replace participants' %}</button> <button name="operation" value="copy-replace-participants" type="button" onclick="copyReplaceParticipantsModalShow('copy-replace-participants');" class="btn btn-sm btn-danger ms-1 form-submit-btn">{% trans 'Replace participants' %}</button>
</div> </div>
</div> </div>
</form> </form>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<button name="operation" value="test-contributors" type="submit" class="btn btn-sm btn-light form-submit-btn">{% trans 'Upload and test' %}</button> <button name="operation" value="test-contributors" type="submit" class="btn btn-sm btn-light form-submit-btn">{% trans 'Upload and test' %}</button>
<div class="mt-2"> <div class="mt-2">
<button name="operation" value="import-contributors" type="button" onclick="importContributorsModalShow('import-contributors');" class="btn btn-sm btn-primary form-submit-btn">{% trans 'Import previously uploaded file' %}</button> <button name="operation" value="import-contributors" type="button" onclick="importContributorsModalShow('import-contributors');" class="btn btn-sm btn-primary form-submit-btn">{% trans 'Import previously uploaded file' %}</button>
<button name="operation" value="import-replace-contributors" type="button" onclick="replaceContributorsModalShow('import-replace-contributors');" class="btn btn-sm btn-danger ml-1 form-submit-btn">{% trans 'Replace contributors' %}</button> <button name="operation" value="import-replace-contributors" type="button" onclick="replaceContributorsModalShow('import-replace-contributors');" class="btn btn-sm btn-danger ms-1 form-submit-btn">{% trans 'Replace contributors' %}</button>
</div> </div>
{% endif %} {% endif %}
</div> </div>
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
</div> </div>
<div class="card-footer text-center"> <div class="card-footer text-center">
<button name="operation" value="copy-contributors" type="button" onclick="copyContributorsModalShow('copy-contributors');" class="btn btn-sm btn-primary form-submit-btn">{% trans 'Copy contributors' %}</button> <button name="operation" value="copy-contributors" type="button" onclick="copyContributorsModalShow('copy-contributors');" class="btn btn-sm btn-primary form-submit-btn">{% trans 'Copy contributors' %}</button>
<button name="operation" value="copy-replace-contributors" type="button" onclick="copyReplaceContributorsModalShow('copy-replace-contributors');" class="btn btn-sm btn-danger ml-1 form-submit-btn">{% trans 'Replace contributors' %}</button> <button name="operation" value="copy-replace-contributors" type="button" onclick="copyReplaceContributorsModalShow('copy-replace-contributors');" class="btn btn-sm btn-danger ms-1 form-submit-btn">{% trans 'Replace contributors' %}</button>
</div> </div>
</div> </div>
</form> </form>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment