Skip to content

Commit 2e373ad

Browse files
authored
feat: improve release information in footer. (ietf-tools#3738)
1 parent 7917fa3 commit 2e373ad

3 files changed

Lines changed: 12 additions & 15 deletions

File tree

ietf/__init__.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,3 @@
1616

1717
# set this to ".p1", ".p2", etc. after patching
1818
__patch__ = ""
19-
20-
__date__ = "$Date$"
21-
22-
__rev__ = "$Rev$ (dev) Latest release: Rev. 19974 "
23-
24-
__id__ = "$Id$"

ietf/context_processors.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import sys
44
import django
55
from django.conf import settings
6-
from ietf import __date__, __rev__, __version__, __patch__, __id__
6+
from ietf import __version__, __patch__, __release_branch__, __release_hash__
77

88
def server_mode(request):
99
return {'server_mode': settings.SERVER_MODE}
@@ -17,11 +17,10 @@ def python_version():
1717

1818
def revision_info(request):
1919
return {
20-
'revision_time': __date__[7:32],
21-
'revision_date': __date__[7:17],
22-
'revision_num': __rev__[6:-2],
23-
'revision_id': __id__[5:-2],
24-
'version_num': __version__+__patch__,
20+
'version_num': __version__,
21+
'patch' : __patch__,
22+
'branch' : __release_branch__,
23+
'git_hash' : __release_hash__,
2524
'django_version': django.get_version(),
2625
'python_version': python_version(),
2726
'bugreport_email': settings.BUG_REPORT_EMAIL,

ietf/templates/base.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,14 @@
118118
<a href="https://www.ietf.org/privacy-statement/" class="p-3">Privacy&nbsp;Statement</a>
119119
<div class="small text-muted p-3">
120120
{% if version_num %}
121-
<a href="/release/about">About</a>
121+
<a href="/release/about">About</a>
122122
<a href="https://github.com/ietf-tools/datatracker/">IETF Datatracker</a>
123-
<a href="/release/{{ version_num }}/">Version {{ version_num }}</a>
124-
{{ revision_date }}
123+
{% if server_mode and server_mode == "production" %}
124+
<a href="https://github.com/ietf-tools/datatracker/releases/tag/{{version_num}}">Version {{ version_num }}{% if patch %}{{patch}}{% endif %}</a>
125+
{% else %}
126+
Version {{ version_num }}{% if patch %}{{patch}}{% endif %}
127+
{% endif %}
128+
{% if branch %}({{ branch }} - {{ git_hash|slice:":8" }}){% endif %}
125129
{% endif %}
126130
Report a bug:
127131
<a href="https://github.com/ietf-tools/datatracker/issues/new/choose">

0 commit comments

Comments
 (0)