Skip to content

Commit bc9018d

Browse files
mhagandermhagander
committed
Make docspage inherit from base.html
There was 99+% overlap between these, leading to some details missed between them. The fact that the whole base is reproduced inside docspage.html is probably legacy from a long time ago. So instead make docspage.html inherit from base and set the required parametrs. The only output difference in this is that the rel=canonical link moves to a different part in the <head>, but it's still in <head>. As a bonus, this also fixes the gitrev tag for theme.js, that commit 97942bc only fixed for base and not docs, and it fixes the footer link to policies that e7099c9 only updated for base and not docs.
1 parent b509e54 commit bc9018d

File tree

1 file changed

+8
-88
lines changed

1 file changed

+8
-88
lines changed

‎templates/docs/docspage.html‎

Lines changed: 8 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,15 @@
1-
<!doctype html>
2-
<html lang="en">
3-
<head>
4-
<title>PostgreSQL: Documentation: {{page.display_version}}: {{page.title}}</title>
5-
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
6-
<meta http-equiv="Content-Type" content="text/xhtml; charset=utf-8" />
7-
{%block meta%}{%endblock%} {# used for custom meta tags such as description which we don't want for every page #}
8-
<meta name="theme-color" content="#336791"/>
9-
<meta name="copyright" content="The PostgreSQL Global Development Group" />{%if og%}
10-
<meta property="og:url" content="https://www.postgresql.org{{og.url}}" />
11-
<meta property="og:type" content="article" />
12-
<meta property="article:published_time" content="{{og.time|date:"c"}}" />
13-
{%if not og.noimage%} <meta property="og:image" content="https://www.postgresql.org/media/img/about/press/elephant.png" />{%endif%}
14-
<meta property="og:title" content="{{og.title}}" />
15-
{%if og.description%} <meta property="og:description" content="{{og.description|truncatewords:"20"}}" />{%endif%}
16-
<meta property="og:site_name" content="{{og.sitename|default:"PostgreSQL"}}" />{%endif%}
1+
{% extends "base/base.html" %}
2+
3+
{% block title %}Documentation: {{page.display_version}}: {{page.title}}{% endblock %}
4+
5+
{% block extrahead %}
176
{%if not page.version.supported%} <meta name="robots" content="nofollow" />{%endif%}
187
{% if canonical_version %}
198
<link rel="canonical" href="https://www.postgresql.org/docs/{{ canonical_version }}/{{ page.file }}" />
209
{% endif %}
21-
<link href="/media/css/fontawesome.css?{{gitrev}}" rel="stylesheet">
22-
<link rel="stylesheet" href="/media/css/bootstrap-4.4.1.min.css">
23-
<link rel="shortcut icon" href="/favicon.ico" />
24-
{%if newstags %}
25-
{%comment%}Default RSS links are only shown on pages that have newstags set{%endcomment%}
26-
<link rel="alternate" type="application/rss+xml" title="All PostgreSQL News" href="/news.rss" />
27-
{%for t in newstags%}
28-
<link rel="alternate" type="application/rss+xml" title="PostgreSQL News about {{t.name}}" href="/news/{{t.urlname}}.rss" />
29-
{%endfor%}
30-
<link rel="alternate" type="application/rss+xml" title="PostgreSQL Events" href="/events.rss" />
31-
{%endif%}
32-
<link rel="stylesheet" type="text/css" href="/dyncss/base.css?{{gitrev}}">
10+
{% endblock %}
3311

34-
<script src="/media/js/theme.js"></script>
35-
36-
{%block extrahead%}{%endblock%}
37-
</head>
38-
<body>
39-
<div class="container-fluid">
40-
<div class="row justify-content-md-center">
41-
<div class="col">
42-
<!-- Header -->
43-
<nav class="navbar navbar-expand-lg navbar-light bg-light">
44-
<a class="navbar-brand p-0" href="/">
45-
<img class="logo" src="/media/img/about/press/elephant.png" alt="PostgreSQL Elephant Logo">
46-
</a>
47-
<input type="checkbox" id="navbar-toggler" aria-controls="pgNavbar" aria-expanded="false" aria-label="Toggle navigation">
48-
<label for="navbar-toggler" id="navbar-toggler-label" class="navbar-toggler" tabindex="0"><span class="navbar-toggler-icon"></span></label>
49-
<div class="navbar-collapse" id="pgNavbar">
50-
<ul class="navbar-nav mr-auto">
51-
<li class="nav-item p-2"><a href="/" title="Home">Home</a></li>
52-
<li class="nav-item p-2"><a href="/about/" title="About">About</a></li>
53-
<li class="nav-item p-2"><a href="/download/" title="Download">Download</a></li>
54-
<li class="nav-item p-2"><a href="/docs/" title="Documentation">Documentation</a></li>
55-
<li class="nav-item p-2"><a href="/community/" title="Community">Community</a></li>
56-
<li class="nav-item p-2"><a href="/developer/" title="Developers">Developers</a></li>
57-
<li class="nav-item p-2"><a href="/support/" title="Support">Support</a></li>
58-
<li class="nav-item p-2"><a href="/about/donate/" title="Donate">Donate</a></li>
59-
<li class="nav-item p-2"><a href="/account/" title="Your account">Your account</a></li>
60-
</ul>
61-
<form role="search" method="get" action="/search/">
62-
<div class="input-group">
63-
<input id="q" name="q" type="text" size="20" maxlength="255" accesskey="s" class="form-control" placeholder="Search for...">
64-
<span class="input-group-btn">
65-
<button class="btn btn-default" type="submit"><i class="fas fa-search"></i></button>
66-
</span>
67-
</div><!-- /input-group -->
68-
</form>
69-
<form id="form-theme" class="form-inline d-none">
70-
<button id="btn-theme" class="btn btn-default ml-1" type="button"></button>
71-
</form>
72-
</div>
73-
</nav>
74-
</div>
75-
</div>
76-
<div class="row justify-content-center pg-shout-box">
77-
<div class="col text-white text-center">{%include "base/esi.html" with includepage="/include/topbar" %}</div>
78-
</div>
79-
</div>
12+
{% block layoutblock %}
8013
<div class="container-fluid margin">
8114
<div class="row">
8215
<div id="pgContentWrap" class="col-11">
@@ -166,17 +99,4 @@ <h2>Submit correction</h2>
16699
</div> <!-- pgContentWrap -->
167100
</div>
168101
</div>
169-
<!-- Footer -->
170-
<footer id="footer">
171-
<!-- Copyright -->
172-
<div class="container">
173-
<a href="/about/privacypolicy">Privacy Policy</a> |
174-
<a href="/about/policies/coc/">Code of Conduct</a> |
175-
<a href="/about/">About PostgreSQL</a> |
176-
<a href="/about/contact/">Contact</a><br/>
177-
<p>Copyright &copy; 1996-{% now "Y" %} The PostgreSQL Global Development Group</p>
178-
</div>
179-
</footer>
180-
<script src="/media/js/main.js?{{gitrev}}"></script>
181-
</body>
182-
</html>
102+
{% endblock %}

0 commit comments

Comments
 (0)