diff --git a/evap/contributor/templates/contributor_evaluation_form.html b/evap/contributor/templates/contributor_evaluation_form.html index ecd2e22c51..15273ba34d 100644 --- a/evap/contributor/templates/contributor_evaluation_form.html +++ b/evap/contributor/templates/contributor_evaluation_form.html @@ -5,10 +5,12 @@ {% block title %}{% trans 'Your EvaP' %} - {{ block.super }}{% endblock %} {% block breadcrumb_bar %} - +
+ +
{% endblock %} {% block content %} @@ -59,7 +61,7 @@
{% trans 'Course data' %}
-
+
{% trans 'Evaluation data' %}
{% if evaluation.allow_editors_to_edit %} @@ -80,7 +82,7 @@
{% trans 'Evaluation data' %}
-
+
{% include 'contribution_formset.html' with formset=formset staff=False editable=editable %}
diff --git a/evap/contributor/templates/contributor_index.html b/evap/contributor/templates/contributor_index.html index e61132d2cc..6496bdac37 100644 --- a/evap/contributor/templates/contributor_index.html +++ b/evap/contributor/templates/contributor_index.html @@ -17,7 +17,7 @@
{% if user.is_delegate %}
-
{% trans 'Delegated evaluations' %}
+
{% trans 'Delegated evaluations' %}
{% trans 'Show' %} @@ -42,7 +42,7 @@
{{ semester.semester_name }}
-
+
diff --git a/evap/development/templates/development_components.html b/evap/development/templates/development_components.html index 303da8149f..901c4ebfb8 100644 --- a/evap/development/templates/development_components.html +++ b/evap/development/templates/development_components.html @@ -3,11 +3,13 @@ {% block title %}{% trans 'Development' %} - {{ block.super }}{% endblock %} {% block breadcrumb_bar %} -
    - {% block breadcrumb %} -
  • {% trans 'Development' %}
    • - {% endblock %} -
+
+
    + {% block breadcrumb %} +
  • {% trans 'Development' %}
    • + {% endblock %} +
+
{% endblock %} {% block content %} diff --git a/evap/evaluation/templates/contact_modal.html b/evap/evaluation/templates/contact_modal.html index 7566c4ed26..70ce142699 100644 --- a/evap/evaluation/templates/contact_modal.html +++ b/evap/evaluation/templates/contact_modal.html @@ -30,7 +30,7 @@ - + {% else %} diff --git a/evap/evaluation/templates/footer.html b/evap/evaluation/templates/footer.html index 2c747d68e6..4b8155ee60 100644 --- a/evap/evaluation/templates/footer.html +++ b/evap/evaluation/templates/footer.html @@ -6,7 +6,7 @@
-
diff --git a/evap/grades/templates/grades_semester_view.html b/evap/grades/templates/grades_semester_view.html index 73ed72cd0c..e6b44b3e83 100644 --- a/evap/grades/templates/grades_semester_view.html +++ b/evap/grades/templates/grades_semester_view.html @@ -30,7 +30,7 @@

{% trans 'Courses' %}
-
+
{% if courses %}

diff --git a/evap/results/templates/results_evaluation_detail.html b/evap/results/templates/results_evaluation_detail.html index 6be6c29142..ef591e7ef8 100644 --- a/evap/results/templates/results_evaluation_detail.html +++ b/evap/results/templates/results_evaluation_detail.html @@ -7,10 +7,12 @@ {% block title %}{{ evaluation.full_name }} - {{ evaluation.course.semester.name }} - {% trans 'Results' %} - {{ block.super }}{% endblock %} {% block breadcrumb_bar %} -
    -
  • {{ evaluation.course.semester.name }}
    • -
  • {{ evaluation.full_name }}
    • -
+
+
    +
  • {{ evaluation.course.semester.name }}
    • +
  • {{ evaluation.full_name }}
    • +
+
{% endblock %} {% block content %} diff --git a/evap/rewards/templates/rewards_index.html b/evap/rewards/templates/rewards_index.html index 4ad138271b..96e11bdcd7 100644 --- a/evap/rewards/templates/rewards_index.html +++ b/evap/rewards/templates/rewards_index.html @@ -15,7 +15,7 @@
{% trans 'Redeem points' %}
-
+

{% trans 'Total points available' %}: {{ total_points_available }}

{% if total_points_available > 0 %} {% if events %} @@ -62,7 +62,7 @@
{% trans 'Reward points history' %}
-
+
{% if reward_point_actions %}
diff --git a/evap/rewards/templates/rewards_reward_point_redemption_event_list.html b/evap/rewards/templates/rewards_reward_point_redemption_event_list.html index 3648befacf..c3a4f28a32 100644 --- a/evap/rewards/templates/rewards_reward_point_redemption_event_list.html +++ b/evap/rewards/templates/rewards_reward_point_redemption_event_list.html @@ -1,7 +1,7 @@
{% trans title %}
-
+
{% if events %}
diff --git a/evap/staff/templates/staff_base.html b/evap/staff/templates/staff_base.html index 97de9c79bd..dbdff8038a 100644 --- a/evap/staff/templates/staff_base.html +++ b/evap/staff/templates/staff_base.html @@ -3,13 +3,15 @@ {% block title %}{% trans 'Manage' %} - {{ block.super }}{% endblock %} {% block breadcrumb_bar %} -
    - {% block breadcrumb %} - {% if disable_breadcrumb_manager or not user.is_manager %} -
  • {% trans 'Manage' %}
    • - {% else %} -
  • {% trans 'Manage' %}
    • - {% endif %} - {% endblock %} -
+
+
    + {% block breadcrumb %} + {% if disable_breadcrumb_manager or not user.is_manager %} +
  • {% trans 'Manage' %}
    • + {% else %} +
  • {% trans 'Manage' %}
    • + {% endif %} + {% endblock %} +
+
{% endblock %} diff --git a/evap/staff/templates/staff_course_type_index.html b/evap/staff/templates/staff_course_type_index.html index 95c7909c61..3ecd2aa511 100644 --- a/evap/staff/templates/staff_course_type_index.html +++ b/evap/staff/templates/staff_course_type_index.html @@ -19,7 +19,7 @@ {{ formset.management_form }}
-
+
diff --git a/evap/staff/templates/staff_degree_index.html b/evap/staff/templates/staff_degree_index.html index 2aa2782ea5..44ff2af056 100644 --- a/evap/staff/templates/staff_degree_index.html +++ b/evap/staff/templates/staff_degree_index.html @@ -15,7 +15,7 @@ {{ formset.management_form }}
-
+
diff --git a/evap/staff/templates/staff_evaluation_form.html b/evap/staff/templates/staff_evaluation_form.html index 79d88732ed..ef05c733a6 100644 --- a/evap/staff/templates/staff_evaluation_form.html +++ b/evap/staff/templates/staff_evaluation_form.html @@ -28,7 +28,7 @@

-
+
{% include 'contribution_formset.html' with formset=formset manager=True editable=editable %}
diff --git a/evap/staff/templates/staff_faq_index.html b/evap/staff/templates/staff_faq_index.html index 93b5032976..1f40eae3b7 100644 --- a/evap/staff/templates/staff_faq_index.html +++ b/evap/staff/templates/staff_faq_index.html @@ -15,7 +15,7 @@ {{ formset.management_form }}
-
+

diff --git a/evap/staff/templates/staff_faq_section.html b/evap/staff/templates/staff_faq_section.html index e687ce8e42..1f99205a39 100644 --- a/evap/staff/templates/staff_faq_section.html +++ b/evap/staff/templates/staff_faq_section.html @@ -16,7 +16,7 @@ {{ formset.management_form }}
-
+
diff --git a/evap/staff/templates/staff_index.html b/evap/staff/templates/staff_index.html index 03fec7bd6b..e83a85e5cd 100644 --- a/evap/staff/templates/staff_index.html +++ b/evap/staff/templates/staff_index.html @@ -1,106 +1,80 @@ {% extends 'staff_base.html' %} {% block content %} -
-
-
-
-

{% trans 'Semesters' %}

- {% if semesters %} - - {% else %} - {% trans 'There are no semesters yet.' %} - {% endif %} - {% trans 'Create new semester' %} -
-
+
+
+

{% trans 'Semesters' %}

+ {% if semesters %} + + {% else %} + {% trans 'There are no semesters yet.' %} + {% endif %} + {% trans 'Create new semester' %}
-
-
-
-

{% trans 'Questionnaires' %}

- - {% trans 'Create new questionnaire' %} -
-
-
-
-

{% trans 'Users' %}

- - {% trans 'Create new user' %} -
-
+
+

{% trans 'Questionnaires' %}

+ + {% trans 'Create new questionnaire' %}
-
-
-
-

{% trans 'Degrees' %}

- -
-
-
-
-

{% trans 'Course types' %}

- -
-
-
-
-

{% trans 'Text answer warnings' %}

- -
-
-
-
-

{% trans 'Reward Points' %}

- -
-
+
+

{% trans 'Users' %}

+ + {% trans 'Create new user' %}
-
-
-
-

{% trans 'Templates' %}

- -
-
-
-
-

{% trans 'FAQ and Infotexts' %}

- -
-
+
+

{% trans 'Degrees' %}

+ +
+
+

{% trans 'Course types' %}

+ +
+
+

{% trans 'Text answer warnings' %}

+ +
+
+

{% trans 'Reward Points' %}

+ +
+
+

{% trans 'Templates' %}

+ +
+
+

{% trans 'FAQ and Infotexts' %}

+
{% endblock %} diff --git a/evap/staff/templates/staff_questionnaire_form.html b/evap/staff/templates/staff_questionnaire_form.html index 0f968f76c9..64c6bc7835 100644 --- a/evap/staff/templates/staff_questionnaire_form.html +++ b/evap/staff/templates/staff_questionnaire_form.html @@ -22,7 +22,7 @@
{% trans 'General Options' %}
-
+
{% trans 'Questions' %}
{{ formset.management_form }} {% include 'bootstrap_form_errors.html' with errors=formset.non_form_errors %} diff --git a/evap/staff/templates/staff_questionnaire_index_list.html b/evap/staff/templates/staff_questionnaire_index_list.html index c4f0331e3b..8465d395b3 100644 --- a/evap/staff/templates/staff_questionnaire_index_list.html +++ b/evap/staff/templates/staff_questionnaire_index_list.html @@ -6,7 +6,7 @@
-
+
diff --git a/evap/staff/templates/staff_semester_view.html b/evap/staff/templates/staff_semester_view.html index f586e5f83f..6b34d43a1b 100644 --- a/evap/staff/templates/staff_semester_view.html +++ b/evap/staff/templates/staff_semester_view.html @@ -80,7 +80,7 @@

{% endif %}
-
+

@@ -259,7 +259,7 @@

-
+ {% if num_evaluations > 0 %}

diff --git a/evap/staff/templates/staff_text_answer_warnings.html b/evap/staff/templates/staff_text_answer_warnings.html index 380101e58c..16b52d4456 100644 --- a/evap/staff/templates/staff_text_answer_warnings.html +++ b/evap/staff/templates/staff_text_answer_warnings.html @@ -16,7 +16,7 @@ {{ formset.management_form }}
-
+
diff --git a/evap/staff/templates/staff_user_list.html b/evap/staff/templates/staff_user_list.html index 174cca33ac..a472b830a4 100644 --- a/evap/staff/templates/staff_user_list.html +++ b/evap/staff/templates/staff_user_list.html @@ -37,7 +37,7 @@
-
+
diff --git a/evap/static/scss/_components.scss b/evap/static/scss/_components.scss index 9fc73c5d1a..ccbee1df31 100644 --- a/evap/static/scss/_components.scss +++ b/evap/static/scss/_components.scss @@ -19,4 +19,5 @@ @import "components/distribution-bar"; @import "components/quick-review"; +@import "components/staff-index"; @import "components/notebook"; diff --git a/evap/static/scss/_utilities.scss b/evap/static/scss/_utilities.scss index dd91f2ce3e..d56f26cd28 100644 --- a/evap/static/scss/_utilities.scss +++ b/evap/static/scss/_utilities.scss @@ -71,3 +71,7 @@ a.no-underline:hover { .z-over-fixed { z-index: $zindex-fixed + 1; } + +.break-spaces { + white-space: break-spaces; +} diff --git a/evap/static/scss/_variables.scss b/evap/static/scss/_variables.scss index b069329a73..899b004e0f 100644 --- a/evap/static/scss/_variables.scss +++ b/evap/static/scss/_variables.scss @@ -2,6 +2,8 @@ $fa-font-path: "../font-awesome/webfonts"; +$brand-height: 42px; + $enable-smooth-scroll: false; $grid-breakpoints: ( diff --git a/evap/static/scss/components/_breadcrumb.scss b/evap/static/scss/components/_breadcrumb.scss index 150df8394f..f33e3262b5 100644 --- a/evap/static/scss/components/_breadcrumb.scss +++ b/evap/static/scss/components/_breadcrumb.scss @@ -25,3 +25,7 @@ border-right: 13px solid transparent; } } + +.breadcrumb-bar { + overflow-x: hidden; /* breadcrumb::after must not overflow screen */ +} diff --git a/evap/static/scss/components/_distribution-bar.scss b/evap/static/scss/components/_distribution-bar.scss index f3f6311e05..b6c8aadc25 100644 --- a/evap/static/scss/components/_distribution-bar.scss +++ b/evap/static/scss/components/_distribution-bar.scss @@ -62,6 +62,10 @@ margin: 0 0.5rem; } + &:not(:empty) { + min-width: calc(3ch + 2*3px); // 3 characters + left and right border + } + } .result-widget:hover { diff --git a/evap/static/scss/components/_nav.scss b/evap/static/scss/components/_nav.scss index 7596088606..7ebb2ea4cf 100644 --- a/evap/static/scss/components/_nav.scss +++ b/evap/static/scss/components/_nav.scss @@ -4,6 +4,10 @@ background-color: $darker-gray; } +.navbar-collapse.show { + overflow-y: scroll; /* scrollable menus on mobile */ +} + .navbar-nav .nav-link, .navbar-nav .navbar-text { padding: .0 .5rem; @@ -29,3 +33,7 @@ .nav-item { padding: 0 0.25rem; } + +#navbarNavDropdown { + max-height: calc(100vh - $brand-height); +} diff --git a/evap/static/scss/components/_staff-index.scss b/evap/static/scss/components/_staff-index.scss new file mode 100644 index 0000000000..45a3336d9b --- /dev/null +++ b/evap/static/scss/components/_staff-index.scss @@ -0,0 +1,17 @@ +.staff-index-card-columns { + @include media-breakpoint-up(sm) { + column-count: 2; + } + @include media-breakpoint-up(lg) { + column-count: 3; + } + + .card { + margin-bottom: 1rem; + + @include media-breakpoint-up(sm) { + display: inline-block; + width: 100%; + } + } +} diff --git a/evap/static/scss/evap.scss b/evap/static/scss/evap.scss index 0afa6168ae..fb2a687f72 100644 --- a/evap/static/scss/evap.scss +++ b/evap/static/scss/evap.scss @@ -40,7 +40,7 @@ body { } .brand-image { - height: 42px; + height: $brand-height; } .color-bar { diff --git a/evap/student/templates/student_vote.html b/evap/student/templates/student_vote.html index 30411076cf..61ebc9ebe7 100644 --- a/evap/student/templates/student_vote.html +++ b/evap/student/templates/student_vote.html @@ -7,10 +7,12 @@ {% block title %}{{ evaluation.full_name }} - {% trans 'Evaluation' %} - {{ block.super }}{% endblock %} {% block breadcrumb_bar %} -
    -
  • {{ evaluation.course.semester.name }}
    • -
  • {{ evaluation.full_name }}
    • -
+
+
    +
  • {{ evaluation.course.semester.name }}
    • +
  • {{ evaluation.full_name }}
    • +
+
{% endblock %} {% block content %}