Skip to content

Commit

Permalink
Fixed Issue #15: Add title header on all pages in the organiser view
Browse files Browse the repository at this point in the history
  • Loading branch information
Darkboy17 committed Feb 22, 2024
1 parent e45c3cc commit 52ae394
Show file tree
Hide file tree
Showing 29 changed files with 60 additions and 18 deletions.
1 change: 1 addition & 0 deletions src/pretalx/orga/templates/orga/cfp/access_code_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@


{% block cfp_content %}
<h1 class="mt-2 mb-2">Call for Speakers</h1>
<h2>{% translate "Access codes" %}</h2>
<div class="alert alert-info">
{% blocktranslate trimmed %}
Expand Down
3 changes: 2 additions & 1 deletion src/pretalx/orga/templates/orga/cfp/flow.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
{% endblock %}

{% block cfp_content %}
<h1>{% translate "CfP Editor" %}</h1>
<h1 class="mt-2 mb-2">Call for Speakers</h1>
<h3>{% translate "Editor" %}</h3>
<p>
{% blocktranslate trimmed %}
This is the pretalx CfP editor. This page allows you to change the
Expand Down
2 changes: 2 additions & 0 deletions src/pretalx/orga/templates/orga/cfp/question_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
{% load i18n %}

{% block cfp_content %}
<h1 class="mt-2 mb-2">Call for Speakers</h1>
<h3>{% translate "Questions" %}</h3>
<div class="alert alert-info">
{% blocktranslate trimmed %}
Questions can help you sort out additional details with speakers, such as
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{% load i18n %}

{% block cfp_content %}
<h1 class="mt-2 mb-2">Call for Speakers</h1>
<h2>{% translate "Session Types" %}</h2>
<div class="alert alert-info">
{% blocktranslate trimmed %}
Expand Down
2 changes: 2 additions & 0 deletions src/pretalx/orga/templates/orga/cfp/text.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
{% endblock %}

{% block cfp_content %}
<h2 class="mt-2 mb-2">Call for Speakers</h2>
<h3>Content</h3>
<div class="alert alert-info">
<span>
{% translate "A good Call for Participation will engage potential speakers. Remember to include:" %}<br>
Expand Down
3 changes: 2 additions & 1 deletion src/pretalx/orga/templates/orga/cfp/track_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
{% load i18n %}

{% block cfp_content %}
<h2>{% translate "Tracks" %}</h2>
<h1 class="mt-2 mb-2">Call for Speakers</h1>
<h3>{% translate "Tracks" %}</h3>
<div class="alert alert-info">
{% blocktranslate trimmed %}
Tracks are used to sort your sessions into categories. You can use the
Expand Down
5 changes: 4 additions & 1 deletion src/pretalx/orga/templates/orga/mails/compose_choice.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{% extends "orga/base.html" %}
{% load i18n %}
{% block content %}
<h1>{% translate "Send emails" %}</h1>
<h1 class="mt-2 mb-0">Mails</h1>
<h2 class="mb-4">
{% translate "Compose E-mails" %}
</h2>
<ul class="list-group">
<a class="list-group-item list-group-item-action" href="{{ request.event.orga_urls.compose_mails_sessions }}">
<h4>
Expand Down
2 changes: 1 addition & 1 deletion src/pretalx/orga/templates/orga/mails/outbox_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{% load rich_text %}

{% block mail_content %}
<h2>{% translate "Mail Editor" %}</h2>
{% if form.instance.sent %}
<div class="alert alert-info">
{% blocktranslate trimmed with timestamp=form.instance.sent %}
Expand All @@ -13,7 +14,6 @@
{% endif %}
<form method="post">
{% csrf_token %}
<h2>{% translate "Mail Editor" %}</h2>
{% bootstrap_form_errors form %}

{% if not form.read_only %}
Expand Down
8 changes: 6 additions & 2 deletions src/pretalx/orga/templates/orga/mails/outbox_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
{% load url_replace %}

{% block mail_content %}
<h2>
<h1 class="mt-2 mb-0">Mails</h1>
<h2 class="mb-4">
{% translate "Outbox" %}
</h2>
<h3>
<span>
{{ page_obj.paginator.count }}
{% blocktranslate trimmed count count=page_obj.paginator.count %}
Expand All @@ -12,7 +16,7 @@ <h2>
pending mails
{% endblocktranslate %}
</span>
</h2>
</h3>
<div class="submit-group">
<span>
{% include "common/search_form.html" %}
Expand Down
4 changes: 4 additions & 0 deletions src/pretalx/orga/templates/orga/mails/sent_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
{% load url_replace %}

{% block mail_content %}
<h1 class="mt-2 mb-0">Mails</h1>
<h2 class="mb-4">
{% translate "Sent E-mails" %}
</h2>
<h2>
{{ page_obj.paginator.count }}
{% translate "Sent Mails" %}
Expand Down
4 changes: 4 additions & 0 deletions src/pretalx/orga/templates/orga/mails/template_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
{% load i18n %}

{% block mail_content %}
<h1 class="mt-2 mb-0">Mails</h1>
<h2 class="mb-4">
{% translate "Templates" %}
</h2>
<div class="alert alert-info">
<div>
<p>
Expand Down
3 changes: 2 additions & 1 deletion src/pretalx/orga/templates/orga/organiser/detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
{% block title %}{% if request.event %}{{ request.event.name }}{% else %}{{ request.organiser.name }}{% endif %}{% endblock %}

{% block content %}
<h2 class="mt-2 mb-4">Settings</h2>
<form method="post"><fieldset>
<legend>{% translate "Settings" %}</legend>
<legend>{% translate "Teams" %}</legend>
{% csrf_token %}
{% bootstrap_form form layout='event' %}
<div class="submit-group panel">
Expand Down
2 changes: 1 addition & 1 deletion src/pretalx/orga/templates/orga/plugins.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{% block title %}{% translate "Plugins" %}{% endblock %}
{% block content %}
<h2>{% translate "Plugins" %}</h2>
<h2 class="mt-2 mb-2">{% translate "Plugins Settings" %}</h2>

{% if grouped_plugins %}
<form method="post" class="form-horizontal">
Expand Down
1 change: 1 addition & 0 deletions src/pretalx/orga/templates/orga/review/assignment.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<script defer src="{% static "cfp/js/animateFormset.js" %}"></script>
<script defer src="{% static "orga/js/reviewAssignment.js" %}"></script>
{% endcompress %}
<h1 class="mt-2 mb-2">Review</h1>
<h2>{% translate "Assign reviewers" %}</h2>

<ul class="nav nav-tabs" id="myTab" role="tablist">
Expand Down
4 changes: 4 additions & 0 deletions src/pretalx/orga/templates/orga/review/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
{% block content %}
{% has_perm 'orga.perform_reviews' request.user request.event as can_review %}
{% has_perm 'orga.view_speakers' request.user request.event as can_view_speakers %}
<h1 class="mt-2 mb-2">Review</h1>
<h2 class="d-flex w-100 justify-content-between align-items-start">
{% translate "Review" %}
</h2>
<div class="alert alert-info">
<div>
{% if can_review and next_submission %}
Expand Down
1 change: 1 addition & 0 deletions src/pretalx/orga/templates/orga/review/export.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{% load static %}

{% block content %}
<h1 class="mt-2 mb-2">Review</h1>
<h2>
{% translate "Export review data" %}
</h2>
Expand Down
3 changes: 2 additions & 1 deletion src/pretalx/orga/templates/orga/schedule/export.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
{% load static %}

{% block schedule_content %}
<h2>
<h1 class="mt-2 mb-0">Schedule</h1>
<h2 class="mb-4">
{% translate "Export schedule data" %}
</h2>
<ul class="nav nav-tabs" id="myTab" role="tablist">
Expand Down
2 changes: 2 additions & 0 deletions src/pretalx/orga/templates/orga/schedule/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
{% endblock %}

{% block schedule_content %}
<h1 class="mt-2 mb-2">Schedule</h1>
<h2 class="mt-2 mb-2">Editor</h2>

<div class="schedule-header d-flex m-3 no-print">
<div id="schedule-action-wrapper" class="d-flex align-items-center ml-auto">
Expand Down
6 changes: 4 additions & 2 deletions src/pretalx/orga/templates/orga/schedule/room_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@
{% load i18n %}

{% block content %}
<h1 class="mt-2 mb-0">Schedule</h1>
<h2 class="mt-0 mb-4">Rooms</h2>
<div>
<h2>
<h3>
{{ request.event.rooms.count }}
{% blocktranslate trimmed count count=request.event.rooms.count context "Number of rooms" %}
Room
{% plural %}
Rooms
{% endblocktranslate %}
</h2>
</h3>

<div class="table-responsive">
<table class="table table-sm table-hover table-flip">
Expand Down
2 changes: 1 addition & 1 deletion src/pretalx/orga/templates/orga/settings/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{% endblock %}

{% block settings_content %}
<h2>{% translate "Settings" %}</h2>
<h2 class="mt-2 mb-4">{% translate "Settings" %}</h2>
<div class="flex-container"><div class="flex-content">
<form method="post" enctype="multipart/form-data">
{% csrf_token %}
Expand Down
2 changes: 1 addition & 1 deletion src/pretalx/orga/templates/orga/settings/mail.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{% block settings_content %}
<form method="post">
{% csrf_token %}
<h2>{% translate "E-mail settings" %}</h2>
<h2 class="mt-2 mb-2">{% translate "E-mail settings" %}</h2>
<div class="alert alert-info offset-md-3">
{% blocktranslate trimmed %}
If you don't configure custom email settings, the global configuration
Expand Down
3 changes: 1 addition & 2 deletions src/pretalx/orga/templates/orga/settings/review.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
{% endcompress %}
<form method="post" class="d-flex flex-column">
{% csrf_token %}

<h2>{% translate "Review settings" %}</h2>
<h2 class="mt-2 mb-2">{% translate "Review settings" %}</h2>
<div class="alert alert-info col-md-9 flip ml-auto">
{% blocktranslate trimmed %}
If you require neither a review score nor a review text, reviewers will
Expand Down
2 changes: 1 addition & 1 deletion src/pretalx/orga/templates/orga/settings/widget.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<form method="post" class="d-flex flex-column">
{% csrf_token %}

<h2>{% translate "Widget settings" %}</h2>
<h2 class="mt-2 mb-2">{% translate "Widget settings" %}</h2>
<div class="alert alert-info col-md-9 flip ml-auto">
{% blocktranslate trimmed %}
You can configure a pretalx schedule widget to show your event schedule
Expand Down
6 changes: 4 additions & 2 deletions src/pretalx/orga/templates/orga/speaker/information_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
{% load i18n %}

{% block content %}
<h2>
<h1 class="mt-2 mb-2">Speakers</h1>
<h2 class="mt-2 mb-2">Speaker Information</h2>
<h3>
{{ information.count }}
{% blocktranslate trimmed count count=information.count %}
Speaker Information Note
{% plural %}
Speaker Information Notes
{% endblocktranslate %}
</h2>
</h3>
<div class="alert alert-info">
{% blocktranslate trimmed %}
Add important messages (e.g. "Please bring an HDMI adapter if required.") or files (e.g. a conference styleguide).<br>
Expand Down
1 change: 1 addition & 0 deletions src/pretalx/orga/templates/orga/speaker/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
{% load url_replace %}

{% block content %}
<h1 class="mt-2 mb-2">Speakers</h1>
<h2>
{{ page_obj.paginator.count }}
{% blocktranslate trimmed count count=page_obj.paginator.count %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{% load rules %}

{% block content %}
<h1 class="mt-2 mb-2">Sessions</h1>
<h2 class="d-flex w-100 justify-content-between align-items-start">
{% translate "Attendee feedback" %}
</h2>
Expand Down
2 changes: 2 additions & 0 deletions src/pretalx/orga/templates/orga/submission/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
{% has_perm 'orga.change_submission_state' request.user request.event as can_change_submission %}
{% has_perm 'orga.view_speakers' request.user request.event as can_view_speakers %}
{% has_perm 'orga.send_mails' request.user request.event as can_send_mails %}
<h1 class="mt-2 mb-2">Sessions</h1>
<h2>{% translate "Sessions" %}</h2>
<h2 class="d-flex align-items-center">
<span>
{{ page_obj.paginator.count }}
Expand Down
1 change: 1 addition & 0 deletions src/pretalx/orga/templates/orga/submission/stats.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
{% endblock %}

{% block content %}
<h1 class="mt-2 mb-2">Sessions</h1>
<div id="stats">
<h2 class="d-flex w-100 justify-content-between align-items-start">
{% translate "Proposal Statistics" %}
Expand Down
1 change: 1 addition & 0 deletions src/pretalx/orga/templates/orga/submission/tag_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
{% load rules %}

{% block cfp_content %}
<h1 class="mt-2 mb-2">Sessions</h1>
<h2>{% translate "Tags" %}</h2>
{% has_perm 'orga.add_tags' request.user request.event as can_edit_tags %}
{% if can_edit_tags %}
Expand Down

0 comments on commit 52ae394

Please sign in to comment.