Skip to content

Commit 41730fd

Browse files
JelteFJelteF
committed
Fix deprecations for django 5
1 parent 7d12350 commit 41730fd

File tree

2 files changed

+106
-106
lines changed

2 files changed

+106
-106
lines changed

‎pgcommitfest/commitfest/templates/base.html‎

Lines changed: 105 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,115 @@
11
{%load commitfest%}
2-
<!DOCTYPE html>
3-
<html>
4-
<head>
5-
<title>{{title|default:'Commitfest' }}</title>
6-
<link rel="stylesheet" href="/media/commitfest/css/jquery-ui.css" type="text/css">
7-
<link rel="stylesheet" href="/media/commitfest/css/bootstrap.css?v=5.3.7" />
8-
<link rel="stylesheet" href="/media/commitfest/css/bootstrap-icons.css" />
9-
<link rel="stylesheet" href="/media/commitfest/css/selectize.bootstrap5.css" />
10-
<link rel="stylesheet" href="/media/commitfest/css/commitfest.css?{% static_file_param %}" />
11-
<link rel="shortcut icon" href="/media/commitfest/favicon.ico" />
12-
{%block extrahead%}{%endblock%}
13-
{%if rss_alternate%} <link rel="alternate" type="application/rss+xml" title="{{rss_alternate_title}}" href="{{rss_alternate}}" />{%endif%}
14-
</head>
15-
<body>
2+
{%load l10n%}
3+
{%localize off%}
4+
<!DOCTYPE html>
5+
<html>
6+
<head>
7+
<title>{{title|default:'Commitfest' }}</title>
8+
<link rel="stylesheet" href="/media/commitfest/css/jquery-ui.css" type="text/css">
9+
<link rel="stylesheet" href="/media/commitfest/css/bootstrap.css?v=5.3.7" />
10+
<link rel="stylesheet" href="/media/commitfest/css/bootstrap-icons.css" />
11+
<link rel="stylesheet" href="/media/commitfest/css/selectize.bootstrap5.css" />
12+
<link rel="stylesheet" href="/media/commitfest/css/commitfest.css?{% static_file_param %}" />
13+
<link rel="shortcut icon" href="/media/commitfest/favicon.ico" />
14+
{%block extrahead%}{%endblock%}
15+
{%if rss_alternate%} <link rel="alternate" type="application/rss+xml" title="{{rss_alternate_title}}" href="{{rss_alternate}}" />{%endif%}
16+
</head>
17+
<body>
1618
<!-- Main Navigation -->
17-
<nav class="navbar navbar-expand-sm navbar-dark bg-dark mb-3">
18-
<div class="container-fluid">
19-
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
20-
<span class="navbar-toggler-icon"></span>
21-
</button>
22-
<div class="collapse navbar-collapse" id="mainNavbar">
23-
<div class="navbar-content-wrapper">
24-
<ul class="navbar-nav me-auto mb-2 mb-sm-0">
25-
<li class="nav-item">
26-
<a class="nav-link{% if request.resolver_match.url_name == 'home' or request.path == '/' %} active{% endif %}" href="/">Home</a>
27-
</li>
28-
<li class="nav-item">
29-
<a class="nav-link{% if '/new/' in request.path %} active{% endif %}" href="/{{open_cf.id}}/new/">New Patch</a>
30-
</li>
31-
<li class="nav-item">
32-
<a class="nav-link{% if cf and cf.is_in_progress %} active{% endif %}" href="/current/">Current CF</a>
33-
</li>
34-
<li class="nav-item">
35-
<a class="nav-link{% if cf and cf.is_open_regular %} active{% endif %}" href="/open/">Open CF</a>
36-
</li>
37-
<li class="nav-item">
38-
<a class="nav-link{% if cf and cf.is_open_draft %} active{% endif %}" href="/draft/">Draft CF</a>
39-
</li>
40-
<li class="nav-item dropdown">
41-
<a class="nav-link dropdown-toggle{% if '/activity/' in request.path or '/commitfest_history/' in request.path %} active{% endif %}" href="#" id="moreDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
42-
More
43-
</a>
44-
<ul class="dropdown-menu" aria-labelledby="moreDropdown">
45-
<li><a class="dropdown-item" href="/activity/">Activity Log</a></li>
46-
<li><a class="dropdown-item" href="/commitfest_history/">All Commitfests</a></li>
47-
</ul>
48-
</li>
49-
<li class="nav-item">
50-
<a class="nav-link{% if '/help/' in request.path %} active{% endif %}" href="/help/">Help</a>
51-
</li>
52-
</ul>
53-
<div class="navbar-actions d-flex gap-2 align-items-center">
54-
<form method="GET" action="/search/">
55-
<div class="input-group" style="width: 300px;">
56-
<input type="text" class="form-control" name="searchterm" placeholder="Email Message-ID or keywords">
57-
<button type="submit" class="btn btn-secondary">
58-
<i class="bi bi-search"></i>
59-
</button>
60-
</div>
61-
</form>
62-
<a class="btn btn-secondary" href="https://github.com/postgres/pgcommitfest" target="_blank"><img class="github-logo" src="/media/commitfest/github-mark.svg"/> Contribute</a>
19+
<nav class="navbar navbar-expand-sm navbar-dark bg-dark mb-3">
20+
<div class="container-fluid">
21+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
22+
<span class="navbar-toggler-icon"></span>
23+
</button>
24+
<div class="collapse navbar-collapse" id="mainNavbar">
25+
<div class="navbar-content-wrapper">
26+
<ul class="navbar-nav me-auto mb-2 mb-sm-0">
27+
<li class="nav-item">
28+
<a class="nav-link{% if request.resolver_match.url_name == 'home' or request.path == '/' %} active{% endif %}" href="/">Home</a>
29+
</li>
30+
<li class="nav-item">
31+
<a class="nav-link{% if '/new/' in request.path %} active{% endif %}" href="/{{open_cf.id}}/new/">New Patch</a>
32+
</li>
33+
<li class="nav-item">
34+
<a class="nav-link{% if cf and cf.is_in_progress %} active{% endif %}" href="/current/">Current CF</a>
35+
</li>
36+
<li class="nav-item">
37+
<a class="nav-link{% if cf and cf.is_open_regular %} active{% endif %}" href="/open/">Open CF</a>
38+
</li>
39+
<li class="nav-item">
40+
<a class="nav-link{% if cf and cf.is_open_draft %} active{% endif %}" href="/draft/">Draft CF</a>
41+
</li>
42+
<li class="nav-item dropdown">
43+
<a class="nav-link dropdown-toggle{% if '/activity/' in request.path or '/commitfest_history/' in request.path %} active{% endif %}" href="#" id="moreDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
44+
More
45+
</a>
46+
<ul class="dropdown-menu" aria-labelledby="moreDropdown">
47+
<li><a class="dropdown-item" href="/activity/">Activity Log</a></li>
48+
<li><a class="dropdown-item" href="/commitfest_history/">All Commitfests</a></li>
49+
</ul>
50+
</li>
51+
<li class="nav-item">
52+
<a class="nav-link{% if '/help/' in request.path %} active{% endif %}" href="/help/">Help</a>
53+
</li>
54+
</ul>
55+
<div class="navbar-actions d-flex gap-2 align-items-center">
56+
<form method="GET" action="/search/">
57+
<div class="input-group" style="width: 300px;">
58+
<input type="text" class="form-control" name="searchterm" placeholder="Email Message-ID or keywords">
59+
<button type="submit" class="btn btn-secondary">
60+
<i class="bi bi-search"></i>
61+
</button>
62+
</div>
63+
</form>
64+
<a class="btn btn-secondary" href="https://github.com/postgres/pgcommitfest" target="_blank"><img class="github-logo" src="/media/commitfest/github-mark.svg"/> Contribute</a>
65+
</div>
6366
</div>
6467
</div>
6568
</div>
66-
</div>
67-
</nav>
69+
</nav>
6870

69-
<div class="container-fluid">
71+
<div class="container-fluid">
7072

71-
<nav aria-label="breadcrumb">
72-
<ol class="breadcrumb">
73-
{%if title %}
74-
<li class="breadcrumb-item"><a href="/">Home</a></li>
75-
{%for c in breadcrumbs%}
76-
<li class="breadcrumb-item"><a href="{{c.href}}">{{c.title}}</a></li>
77-
{%endfor%}
78-
<li class="breadcrumb-item active" aria-current="page">{{title}}</li>
79-
{%else%}
80-
<li class="breadcrumb-item active" aria-current="page">Home</li>
81-
{%endif%}
82-
</ol>
83-
<div class="float-end">
84-
{%if user.is_authenticated%}
85-
Logged in as {{user}} (<a href="/account/profile/">edit profile</a> | <a href="/account/logout/">log out</a>{%if user.is_staff%} | <a href="/admin/">administration</a>{%endif%})
86-
{%else%}
87-
<a href="/account/login/?next={{request.path}}">Log in</a>
88-
{%endif%}
89-
{%if header_activity%} | <a href="{{header_activity_link}}">{{header_activity}}</a>{%endif%}
90-
</div>
91-
</nav>
73+
<nav aria-label="breadcrumb">
74+
<ol class="breadcrumb">
75+
{%if title %}
76+
<li class="breadcrumb-item"><a href="/">Home</a></li>
77+
{%for c in breadcrumbs%}
78+
<li class="breadcrumb-item"><a href="{{c.href}}">{{c.title}}</a></li>
79+
{%endfor%}
80+
<li class="breadcrumb-item active" aria-current="page">{{title}}</li>
81+
{%else%}
82+
<li class="breadcrumb-item active" aria-current="page">Home</li>
83+
{%endif%}
84+
</ol>
85+
<div class="float-end">
86+
{%if user.is_authenticated%}
87+
Logged in as {{user}} (<a href="/account/profile/">edit profile</a> | <a href="/account/logout/">log out</a>{%if user.is_staff%} | <a href="/admin/">administration</a>{%endif%})
88+
{%else%}
89+
<a href="/account/login/?next={{request.path}}">Log in</a>
90+
{%endif%}
91+
{%if header_activity%} | <a href="{{header_activity_link}}">{{header_activity}}</a>{%endif%}
92+
</div>
93+
</nav>
9294

93-
{%if title %}
94-
<h1>{{title}}</h1>
95-
{%endif%}
95+
{%if title %}
96+
<h1>{{title}}</h1>
97+
{%endif%}
9698

97-
{%if messages%}
98-
{%for m in messages%}
99-
<div class="alert {{m.tags|alertmap}}">{{m}}</div>
100-
{%endfor%}
101-
{%endif%}
99+
{%if messages%}
100+
{%for m in messages%}
101+
<div class="alert {{m.tags|alertmap}}">{{m}}</div>
102+
{%endfor%}
103+
{%endif%}
102104

103-
{%block contents%}
104-
{%endblock%}
105-
</div>
106-
<script src="/media/commitfest/js/jquery.js"></script>
107-
<script src="/media/commitfest/js/jquery-ui.js"></script>
108-
<script src="/media/commitfest/js/bootstrap.js?v=5.3.7"></script>
109-
<script src="/media/commitfest/js/selectize.min.js"></script>
110-
<script src="/media/commitfest/js/commitfest.js?{% static_file_param %}"></script>
111-
{%block morescript%}{%endblock%}
112-
</html>
105+
{%block contents%}
106+
{%endblock%}
107+
</div>
108+
<script src="/media/commitfest/js/jquery.js"></script>
109+
<script src="/media/commitfest/js/jquery-ui.js"></script>
110+
<script src="/media/commitfest/js/bootstrap.js?v=5.3.7"></script>
111+
<script src="/media/commitfest/js/selectize.min.js"></script>
112+
<script src="/media/commitfest/js/commitfest.js?{% static_file_param %}"></script>
113+
{%block morescript%}{%endblock%}
114+
{%endlocalize%}
115+
</html>

‎pgcommitfest/settings.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
# If running in a Windows environment this must be set to the same as your
3030
# system time zone.
3131
TIME_ZONE = "GMT"
32+
USE_TZ = True
3233

3334
# Language code for this installation. All choices can be found here:
3435
# http://www.i18nguy.com/unicode/language-identifiers.html
@@ -40,10 +41,6 @@
4041
# to load the internationalization machinery.
4142
USE_I18N = False
4243

43-
# If you set this to False, Django will not format dates, numbers and
44-
# calendars according to the current locale
45-
USE_L10N = False
46-
4744
# Absolute filesystem path to the directory that will hold user-uploaded files.
4845
# Example: "/home/media/media.lawrence.com/media/"
4946
MEDIA_ROOT = ""

0 commit comments

Comments
 (0)