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

Jump to bottom

hub: fix missing view titles #227

Merged
merged 4 commits into from
Sep 7, 2023
Merged

hub: fix missing view titles #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
745edde
hub: do not set empty <title> if title is not in the context
lzaoral Sep 4, 2023
ce5461c
hub: fix incorrect title for the channel/detail view
lzaoral Sep 4, 2023
16272f9
hub: add title for the login view
lzaoral Sep 4, 2023
deba691
hub: add titles to HTTP error templates
lzaoral Sep 4, 2023
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
4 changes: 4 additions & 0 deletions kobo/hub/templates/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{% extends "base.html" %}
{% load i18n %}

{% block head %}
<title>404 {% trans "Page not found" %}</title>
{% endblock %}

{% block content %}
<h2>{% trans "Page not found" %} (404)</h2>
<p>{% trans "We're sorry, but the requested page could not be found." %}</p>
Expand Down
4 changes: 4 additions & 0 deletions kobo/hub/templates/500.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{% extends "base.html" %}
{% load i18n %}

{% block head %}
<title>500 {% trans "Internal Server Error" %}</title>
{% endblock %}

{% block content %}
<h2>{% trans "Internal Server Error" %} (500)</h2>
<p>{% trans "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." %}</p>
Expand Down
2 changes: 1 addition & 1 deletion kobo/hub/templates/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<html lang="en">

<head>
<title>{{ title }}</title>
{% if title %}<title>{{ title }}</title>{% endif %}
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rel="stylesheet" href="{% static "kobo/css/screen.css" %}" type="text/css" media="screen" />
{% block css %}
Expand Down
2 changes: 1 addition & 1 deletion kobo/hub/urls/channel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
model = Channel,
template_name = "channel/detail.html",
context_object_name = "channel",
title = _("Architecture detail"),
title = _("Channel detail"),
), name="channel/detail"),
]
1 change: 1 addition & 0 deletions kobo/hub/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ def task_log_json(request, id, log_name):


class LoginView(django.contrib.auth.views.LoginView):
extra_context = {'title': _('Login')}
template_name = 'auth/login.html'

class LogoutView(django.contrib.auth.views.LogoutView):
Expand Down
Loading