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

HTML fixes #119

Merged
merged 3 commits into from
Sep 12, 2024
Merged

HTML fixes #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afb9987
Mark up telephone number as a tag
friedelwolff Sep 12, 2024
8f3a0fe
Remove unnecessary final slash in self-closing tags
friedelwolff Sep 12, 2024
c484fdd
Fix invalid <form> in <p>
friedelwolff Sep 12, 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
2 changes: 1 addition & 1 deletion app/templates/admin/base_site.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{% block extrastyle %}
<link rel="stylesheet" href="{% static 'css/admin.css' %}">
<link rel="stylesheet" href="{% static 'css/dark_mode_override.css' %}">
<link rel="icon" href="{% static 'img/favicon.png' %}" sizes="32x32" />
<link rel="icon" href="{% static 'img/favicon.png' %}" sizes="32x32">
{% endblock %}

{% block branding %}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/app/contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h2 class="fs-4">{% trans "Contact details for more information" %}</h2>
South Africa
{% endblocktrans %}
</p>
<p>+27 18 285 2750</p>
<p><a href="tel:+27182852750">+27 (0)18 285-2750</a></p>
<p><a href="mailto:[email protected]">[email protected]</a></p>
</div>

Expand Down
4 changes: 1 addition & 3 deletions app/templates/app/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,11 @@ <h2 class="fs-3 card-title">{% trans "Search" %}</h2>
This platforms hosts terminology and other useful language resources.
{% endblocktrans %}
</p>
<p>
<form method="get" action="{% url 'search' %}">
<input type="search" name="search" placeholder="{% trans 'Search term...' %}"
class="form-control search-input">
<input type="submit" value="{% trans 'Search' %}" class="btn btn-primary mt-2"/>
<input type="submit" value="{% trans 'Search' %}" class="btn btn-primary mt-2">
</form>
</p>
</div>
</div>
</section>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/app/search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h2 class="fs-5 card-title mt-2">{% trans "Search a term" %}</h2>
value="{{ request.GET.search }}">
</div>
<div class="col-auto">
<input type="submit" class="btn btn-primary me-4"/>
<input type="submit" class="btn btn-primary me-4">
<a href="{% url 'search' %}" hx-target="#main" hx-select="#main" class="btn btn-secondary">{% trans 'Reset' %}</a>
</div>
{% if page_obj.paginator.num_pages > 1 %}
Expand Down Expand Up @@ -111,7 +111,7 @@ <h2 id="filter-heading" class="fs-5 card-title">{% trans "Filters" %}</h2>
<a href="#search" class="d-md-none">{% trans "Alter search terms above" %}</a>
</div>
</div>
<input type="submit" class="btn btn-primary me-4"/>
<input type="submit" class="btn btn-primary me-4">
<a href="{% url 'search' %}" hx-target="#main" hx-select="#main" class="btn btn-secondary">{% trans 'Reset' %}</a>
</section>
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions app/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<head>
<title>{% block title %}{% trans "SADiLaR" %}{% endblock %}</title>
<meta name="description" content="{% block description %}{% trans 'Terminology and other language resources' %}{% endblock %}">
<meta name="keywords" content="{% block keywords %}{% trans 'language, terminology' %}{% endblock %}"/>
<meta name="keywords" content="{% block keywords %}{% trans 'language, terminology' %}{% endblock %}">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.min.css" integrity="sha256-9kPW/n5nn53j4WMRYAxe9c1rCY96Oogo/MKSVdKzPmI=" crossorigin="anonymous">
<link rel="icon" href="{% static 'img/favicon.png' %}" sizes="32x32" />
<link rel="icon" href="{% static 'img/favicon.png' %}" sizes="32x32">
{# htmx JS at the end of body seems to create problems when navigating through browser history #}
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/htmx.min.js" integrity="sha256-4XRtl1nsDUPFwoRFIzOjELtf1yheusSy3Jv0TXK1qIc=" crossorigin="anonymous"></script>
<meta name="htmx-config" content='{% include "app/htmx-config.json" %}'>
Expand Down
Loading