Skip to content

Commit

Permalink
chore: apply shorter line length format
Browse files Browse the repository at this point in the history
  • Loading branch information
SilvanVerhoeven committed Aug 8, 2024
1 parent 83c08af commit 5555527
Show file tree
Hide file tree
Showing 14 changed files with 74 additions and 25 deletions.
8 changes: 6 additions & 2 deletions myhpi/core/templates/core/minutes.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
<h1 class="page-title">
<span class="underline">{{ page.title }}</span>
</h1>
<div class="col-lg-9 minutes-text">{{ parsed_md.0|touchify_abbreviations|tag_external_links }}</div>
<div class="col-lg-9 minutes-text">
{{ parsed_md.0|touchify_abbreviations|tag_external_links }}
</div>
<div class="col-lg-3 minutes-meta">
<aside class="side-panel border-accent">
<h1 class="side-panel-title">{% translate "Date" %}</h1>
Expand All @@ -29,7 +31,9 @@ <h1 class="side-panel-title">{% translate "Minutes taker" %}</h1>
<aside class="side-panel border-accent">
<h1 class="side-panel-title">{% translate "Participants" %}</h1>
<ul>
{% for participant in page.participants.all %}<li>{{ participant.get_full_name }}</li>{% endfor %}
{% for participant in page.participants.all %}
<li>{{ participant.get_full_name }}</li>
{% endfor %}
</ul>
</aside>
<aside class="side-panel border-accent">
Expand Down
8 changes: 6 additions & 2 deletions myhpi/core/templates/core/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
{% if perms.wagtail.edit_page %}
{% if page.has_unpublished_changes %}
<aside class="side-panel border-accent sidebar-container d-print-none">
<h1 class="side-panel-warning">{% translate "Page has unpublished changes!" %}</h1>
<h1 class="side-panel-warning">
{% translate "Page has unpublished changes!" %}
</h1>
</aside>
{% endif %}
{% with page.visible_for.all|join:", " as visibility %}
Expand Down Expand Up @@ -46,7 +48,9 @@ <h1 class="side-panel-title">{% translate "Attachments" %}</h1>
id="sidebar-offcanvas"
aria-labelledby="sidebar-offcanvas-label">
<div class="offcanvas-header">
<h5 class="offcanvas-title" id="sidebar-offcanvas-label">{% translate "Table of contents" %}</h5>
<h5 class="offcanvas-title" id="sidebar-offcanvas-label">
{% translate "Table of contents" %}
</h5>
<button type="button"
class="btn-close"
data-bs-dismiss="offcanvas"
Expand Down
8 changes: 6 additions & 2 deletions myhpi/polls/templates/polls/base_poll.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,13 @@ <h2>{{ page.question }}</h2>
{% elif page.results_visible %}
{% block results %}{% endblock %}
{% elif not page.in_voting_period %}
<p>{% translate "You've accessed this page outside of the voting period." %}</p>
<p>
{% translate "You've accessed this page outside of the voting period." %}
</p>
{% else %}
<p>{% translate "You are not allowed to cast (another) vote and the results are not visible yet." %}</p>
<p>
{% translate "You are not allowed to cast (another) vote and the results are not visible yet." %}
</p>
{% endif %}
</div>
<div class="col-lg-3">
Expand Down
4 changes: 3 additions & 1 deletion myhpi/polls/templates/polls/ranked_choice_poll.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
data-parent="#options"
class="collapse show">
<div class="card-body">
{% with field.help_text|markdown as parsed_md %}<p>{{ parsed_md.0 }}</p>{% endwith %}
{% with field.help_text|markdown as parsed_md %}
<p>{{ parsed_md.0 }}</p>
{% endwith %}
</div>
</div>
</div>
Expand Down
4 changes: 3 additions & 1 deletion myhpi/search/templates/search/search_field.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
{% if search_query %}value="{{ search_query }}"{% endif %}>
<button type="submit"
class="btn btn-primary"
aria-label="{% translate 'Search' %}">{% bs_icon "search" extra_classes="text-light" %}</button>
aria-label="{% translate 'Search' %}">
{% bs_icon "search" extra_classes="text-light" %}
</button>
</div>
</form>
12 changes: 9 additions & 3 deletions myhpi/templates/403.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@ <h1>{% translate "Access denied" %}</h1>
</p>

<ul class="pb-3">
<li>{% translate "You are not logged in and are not accessing the page from the university network." %}</li>
<li>{% translate "You are not logged in and the page is only available for logged in users." %}</li>
<li>{% translate "You are logged in but don't have the required permissions to access this page." %}</li>
<li>
{% translate "You are not logged in and are not accessing the page from the university network." %}
</li>
<li>
{% translate "You are not logged in and the page is only available for logged in users." %}
</li>
<li>
{% translate "You are logged in but don't have the required permissions to access this page." %}
</li>
</ul>
{% endblock %}
11 changes: 8 additions & 3 deletions myhpi/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@
href="{% static 'scss/myHPI.scss'|compile %}"
rel="stylesheet">

{% block extra_css %}{# Override this in templates to add extra stylesheets #}{% endblock %}
{% block extra_css %}
{# Override this in templates to add extra stylesheets #}
{% endblock %}
</head>

<body class="bg-background myhpi-accent d-flex flex-column min-vh-100 {% block body_class %}{% endblock %}">
Expand Down Expand Up @@ -150,7 +152,8 @@
<button type="button"
class="btn-close"
data-bs-dismiss="alert"
aria-label="{% translate 'Close' %}"></button>
aria-label="{% translate 'Close' %}">
</button>
</div>
{% endfor %}
</div>
Expand Down Expand Up @@ -215,7 +218,9 @@
<script type="text/javascript" src="{% static 'js/search.js' %}"></script>
<script type="text/javascript" src="{% static 'js/myHPI.js' %}"></script>

{% block extra_js %}{# Override this in templates to add extra javascript #}{% endblock %}
{% block extra_js %}
{# Override this in templates to add extra javascript #}
{% endblock %}
</body>

</html>
4 changes: 3 additions & 1 deletion myhpi/templates/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
<div class="page-content d-flex flex-wrap flex-column flex-sm-row">
{% for column in footer_columns %}
<div class="footer-category">
{% with column|markdown as parsed_markdown %}{{ parsed_markdown.0|tag_external_links }}{% endwith %}
{% with column|markdown as parsed_markdown %}
{{ parsed_markdown.0|tag_external_links }}
{% endwith %}
</div>
{% endfor %}
<div class="footer-category">
Expand Down
4 changes: 3 additions & 1 deletion myhpi/templates/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
{% else %}
{% if 'next' in request.GET and not request.GET.user_initiated %}
<div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">
&times;
</button>
{% translate "Please login to see this page." %}
</div>
{% endif %}
Expand Down
4 changes: 3 additions & 1 deletion myhpi/tenca_django/templates/tenca_django/action.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,7 @@
{% endblock %}

{% block content %}
<p>{% trans "This link is now invalid. You never need to visit it again." %}</p>
<p>
{% trans "This link is now invalid. You never need to visit it again." %}
</p>
{% endblock %}
4 changes: 3 additions & 1 deletion myhpi/tenca_django/templates/tenca_django/backend_error.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@
{% endblock %}

{% block content %}
<p>{% trans "Sorry for the inconvenience, but the mail server backend does not reply. Please try again later." %}</p>
<p>
{% trans "Sorry for the inconvenience, but the mail server backend does not reply. Please try again later." %}
</p>
{% endblock %}
4 changes: 3 additions & 1 deletion myhpi/tenca_django/templates/tenca_django/delete_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
<form method="post">
{% csrf_token %}
<div class="form-group">
<button type="submit" name="confirm" class="btn btn-danger">{% trans "Delete" %}</button>
<button type="submit" name="confirm" class="btn btn-danger">
{% trans "Delete" %}
</button>
<a class="btn btn-secondary"
href="{% url 'tenca_django:tenca_manage_list' mailing_list.list_id %}">{% trans "Cancel" %}</a>
</div>
Expand Down
20 changes: 15 additions & 5 deletions myhpi/tenca_django/templates/tenca_django/manage_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,28 @@ <h4 class="mt-2">{% trans "Members" %}</h4>
<div class="flex-fill">{{ form.email }}</div>
<div>
{% if is_owner %}
<button name="demote_member" class="btn btn-link" type="submit">Demote from Owner</button>
<button name="demote_member" class="btn btn-link" type="submit">
Demote from Owner
</button>
{% else %}
<button name="promote_member" class="btn btn-link" type="submit">Promote to Owner</button>
<button name="promote_member" class="btn btn-link" type="submit">
Promote to Owner
</button>
{% endif %}

{% if is_blocked %}
<button name="unblock_member" class="btn btn-link" type="submit">Unblock member</button>
<button name="unblock_member" class="btn btn-link" type="submit">
Unblock member
</button>
{% else %}
<button name="block_member" class="btn btn-link" type="submit">Block member</button>
<button name="block_member" class="btn btn-link" type="submit">
Block member
</button>
{% endif %}

<button name="remove_member" class="btn btn-link" type="submit">Remove member</button>
<button name="remove_member" class="btn btn-link" type="submit">
Remove member
</button>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
</div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">{% trans 'Un-/Subscribe' %}</button>
<button type="submit" class="btn btn-primary">
{% trans 'Un-/Subscribe' %}
</button>
</div>
</form>
{% endblock %}

0 comments on commit 5555527

Please sign in to comment.