From 75feea184347179949f3aa5fc23f48736f88b0bf Mon Sep 17 00:00:00 2001
From: "Jonathan S. Katz" <jonathan.katz@excoventures.com>
Date: Sun, 15 Apr 2018 23:44:49 -0400
Subject: [PATCH] Update Documentation and Bug Report pages to use modern
 design.

---
 pgweb/misc/views.py               |  3 +-
 templates/docs/archive.html       | 43 +++++++++----------
 templates/docs/index.html         | 71 +++++++++++++++----------------
 templates/docs/manuals.html       | 49 ++++++++++-----------
 templates/misc/bug_completed.html |  2 +-
 templates/pages/docs/faq.html     |  2 +-
 6 files changed, 82 insertions(+), 88 deletions(-)

diff --git a/pgweb/misc/views.py b/pgweb/misc/views.py
index 2942b7bd..1d40bcd8 100644
--- a/pgweb/misc/views.py
+++ b/pgweb/misc/views.py
@@ -51,11 +51,12 @@ def submitbug(request):
 	return render_pgweb(request, 'support', 'base/form.html', {
 		'form': form,
 		'formitemtype': 'bug report',
+		'formtitle': 'Submit Bug Report <i class="fas fa-bug"></i>',
 		'operation': 'Submit',
 		'form_intro': template_to_string('misc/bug_header.html', {
 			'supportedversions': versions,
 		}),
-		'savebutton': 'Create report and send email',
+		'savebutton': 'Submit Report and Send Email',
 	})
 
 
diff --git a/templates/docs/archive.html b/templates/docs/archive.html
index fb11d798..c7843baf 100644
--- a/templates/docs/archive.html
+++ b/templates/docs/archive.html
@@ -2,34 +2,31 @@
 {%block title%}Manual Archive{%endblock%}
 {%block contents%}
 
-<h1>Manual Archive</h1>
+<h1>Manual Archive <i class="fas fa-book"></i></h1>
 
 <p>Following are links to manuals (both online and printable versions) for PostgreSQL releases that are no longer supported.
 If you are still using any of these releases, you are strongly advised to upgrade.</p>
 
-<div class="tblBasic">
-<table border="0" cellpadding="0" cellspacing="0" class="tblBasicGrey">
-<tr>
-	<th class="colMid">Online Version</th>
-	<th class="colLast">PDF Version</th>
-</tr>
-
-{%for v in versions%}
-<tr{%if forloop.last%} class="lastrow"{%endif%}>
-    <td class="colMid">
-          <ul>
-            <li><a href="/docs/{{v.numtree}}/static/{{v.indexname}}">{{v.treestring}}</a></li>
-          </ul>
+<table class="table table-striped">
+  <thead class="thead-light">
+    <tr>
+      <th>Online Version</th>
+      <th>PDF Version</th>
+    </tr>
+  </thead>
+  <tbody>
+		{%for v in versions%}
+		<tr{%if forloop.last%}{%endif%}>
+	    <td>
+          <a href="/docs/{{v.numtree}}/static/{{v.indexname}}">{{v.treestring}}</a>
       </td>
-      <td class="colLast">
-	<ul>
-	  {%if v.a4pdf%}<li>Comprehensive Manual: <a href="/files/documentation/pdf/{{v.numtree}}/postgresql-{{v.numtree}}-A4.pdf">A4 PDF</a> <span class="txtMediumGrey">({{v.a4pdf|filesizeformat}})</span></li>{%endif%}
-	  {%if v.uspdf%}<li>Comprehensive Manual: <a href="/files/documentation/pdf/{{v.numtree}}/postgresql-{{v.numtree}}-US.pdf">US PDF</a> <span class="txtMediumGrey">({{v.uspdf|filesizeformat}})</span></li>{%endif%}
-	  {%if not v.a4pdf and not v4.uspdf%}<li>PDF version not available</li>{%endif%}
-	</ul>
+      <td>
+				  {%if v.a4pdf%}Comprehensive Manual: <a href="/files/documentation/pdf/{{v.numtree}}/postgresql-{{v.numtree}}-A4.pdf">A4 PDF</a> <span class="txtMediumGrey">({{v.a4pdf|filesizeformat}})</span>{%endif%}
+				  {%if v.uspdf%}Comprehensive Manual: <a href="/files/documentation/pdf/{{v.numtree}}/postgresql-{{v.numtree}}-US.pdf">US PDF</a> <span class="txtMediumGrey">({{v.uspdf|filesizeformat}})</span>{%endif%}
+				  {%if not v.a4pdf and not v4.uspdf%}PDF version not available{%endif%}
       </td>
-</tr>
-{%endfor%}
+		</tr>
+		{%endfor%}
+  </tbody>
 </table>
-</div>
 {%endblock%}
diff --git a/templates/docs/index.html b/templates/docs/index.html
index ed6c5bd0..e214e374 100644
--- a/templates/docs/index.html
+++ b/templates/docs/index.html
@@ -1,42 +1,41 @@
 {%extends "base/page.html"%}
 {%block title%}Documentation{%endblock%}
 {%block contents%}
-<div id="pgDocsWrap">
-<div id="pgDocs">
-<h1>Documentation</h1>
 
-<p>There is a wealth of PostgreSQL information available online. This section contains <a href="/docs/manuals/">current</a>
-and <a href="/docs/manuals/archive/">archived</a> manuals for PostgreSQL users, as well as
-<a href="/docs/faq/">frequently asked questions</a>.</p>
+  <div class="row">
+    <div class="col-md-9">
+      <section>
+        <h1>Documentation <i class="far fa-file-alt"></i></h1>
+      </section>
+      <p>This section contains <a href="/docs/manuals/">current</a>
+      and <a href="/docs/manuals/archive/">archived</a> manuals for PostgreSQL users. You can read the <a href="/docs/current/static/release.html">release notes</a>, and view a listing of <a href="/docs/books/">books</a>
+      written about PostgreSQL.</p>
+    </div>
+    <div class="col-md-3">
+      <section>
+        <h2>Online Manuals</h2>
+      </section>
+      <dl>
+        <dd>
+          <ul>
+            {% for version in versions %}
+              <li>
+                <a href="/docs/{{ version.numtree }}/static/index.html">{{ version.treestring }}</a>
+              </li>
+            {%endfor%}
+          </ul>
+        </dd>
+        <dt>Translated Manuals</dt>
+        <dd>
+            <ul>
+              <li><a href="http://docs.postgresql.fr" target="_blank">French</a></li>
+              <li><a href="http://www.postgresql.jp/document/" target="_blank">Japanese</a></li>
+              <li><a href="https://postgrespro.ru/docs/postgresql" target="_blank">Russian</a></li>
+            </ul>
+        </dd>
+        <dd><p></p><a href="/docs/manuals/">More manuals</a></dd>
+      </dl>
+    </div>
+  </div>
 
-<p>You can learn <a href="/docs/9.6/static/release-9-6.html">what's new</a> in the latest release, and view a listing of <a href="/docs/books/">books</a>
-written about PostgreSQL (some of which are available in their entirety online).
-<a href="https://wiki.postgresql.org">Technical documentation</a> is also available in this section, or you can check <a href="/support/security/">Security Information</a>.</p>
-
-</div>
-</div>
-
-<div id="pgQuickDocsWrap">
-<div id="pgQuickDocs">
-  <dl>
-    <dt>Online Manuals</dt>
-    <dd>
-      <ul>
-{%for v in versions%}
-        <li><a href="/docs/{{v.numtree}}/static/index.html">{{v.treestring}}</a></li>
-{%endfor%}
-      </ul>
-    </dd>
-    <dt>Translated Manuals</dt>
-    <dd>
-        <ul>
-          <li><a href="http://docs.postgresql.fr">French</a></li>
-          <li><a href="http://www.postgresql.jp/document/">Japanese</a></li>
-          <li><a href="https://postgrespro.ru/docs/postgresql">Russian</a></li>
-        </ul>
-    </dd>
-    <dd><p></p><a href="/docs/manuals/">More manuals</a></dd>
-  </dl>
-</div>
-</div>
 {%endblock%}
diff --git a/templates/docs/manuals.html b/templates/docs/manuals.html
index 52c321e8..be2dfb41 100644
--- a/templates/docs/manuals.html
+++ b/templates/docs/manuals.html
@@ -2,34 +2,31 @@
 {%block title%}Manuals{%endblock%}
 {%block contents%}
 
-<h1>Manuals</h1>
-<p></p>
+<h1>Manuals <i class="fas fa-book"></i></h1>
 
-<div class="tblBasic">
-<table border="0" cellpadding="0" cellspacing="0" class="tblBasicGrey">
-<tr>
-	<th class="colMid">Online Version</th>
-	<th class="colLast">PDF Version</th>
-</tr>
-{%for v in versions%}
-<tr{%if forloop.last%} class="lastrow"{%endif%}>
-    <td class="colMid">
-          <ul>
-            <li><a href="/docs/{{v.numtree}}/static/index.html">{{v.treestring}}</a></li>
-	  </ul>
-    </td>
-    <td class="colLast">
-	{%if v.a4pdf or v.uspdf%}
-	<ul>
-	  {%if v.a4pdf%}<li>Comprehensive Manual: <a href="/files/documentation/pdf/{{v.numtree}}/postgresql-{{v.numtree}}-A4.pdf">A4 PDF</a> <span class="txtMediumGrey">({{v.a4pdf|filesizeformat}})</span></li>{%endif%}
-	  {%if v.uspdf%}<li>Comprehensive Manual: <a href="/files/documentation/pdf/{{v.numtree}}/postgresql-{{v.numtree}}-US.pdf">US PDF</a> <span class="txtMediumGrey">({{v.uspdf|filesizeformat}})</span></li>{%endif%}
-	</ul>
-	{%endif%}
-    </td>
-</tr>
-{%endfor%}
+<table class="table table-striped">
+  <thead class="thead-light">
+    <tr>
+      <th>Online Version</th>
+      <th>PDF Version</th>
+    </tr>
+  </thead>
+  <tbody>
+		{%for v in versions%}
+		<tr{%if forloop.last%}{%endif%}>
+		    <td>
+	        <a href="/docs/{{v.numtree}}/static/index.html">{{v.treestring}}</a>
+		    </td>
+		    <td>
+			{%if v.a4pdf or v.uspdf%}
+			  {%if v.a4pdf%}Comprehensive Manual: <a href="/files/documentation/pdf/{{v.numtree}}/postgresql-{{v.numtree}}-A4.pdf">A4 PDF</a> <span class="txtMediumGrey">({{v.a4pdf|filesizeformat}})</span>{%endif%}
+			  {%if v.uspdf%}Comprehensive Manual: <a href="/files/documentation/pdf/{{v.numtree}}/postgresql-{{v.numtree}}-US.pdf">US PDF</a> <span class="txtMediumGrey">({{v.uspdf|filesizeformat}})</span>{%endif%}
+        {%if not v.a4pdf and not v4.uspdf%}PDF version not available{%endif%}
+      {%endif%}
+		</tr>
+		{%endfor%}
+  </tbody>
 </table>
-</div>
 
 <p>Please see the <a href="/docs/manuals/archive/">manual archive</a> for documentation for older releases.
 The DocBook SGML source for the manuals is available as part of the PostgreSQL source download available in
diff --git a/templates/misc/bug_completed.html b/templates/misc/bug_completed.html
index b36c58d5..4474d239 100644
--- a/templates/misc/bug_completed.html
+++ b/templates/misc/bug_completed.html
@@ -1,7 +1,7 @@
 {%extends "base/page.html"%}
 {%block title%}Bug report{%endblock%}
 {%block contents%}
-<h1>Bug report</h1>
+<h1>Bug report <i class="fas fa-bug"></i></h1>
 <p>
 Your bug report has been received, and given id #{{bugid}}. It has been posted
 to the <a href="/list/pgsql-bugs/">pgsql-bugs</a>
diff --git a/templates/pages/docs/faq.html b/templates/pages/docs/faq.html
index 95e3a4c4..61a9612c 100644
--- a/templates/pages/docs/faq.html
+++ b/templates/pages/docs/faq.html
@@ -2,7 +2,7 @@
 {%block title%}Frequently Asked Questions{%endblock%}
 {%block contents%}
 
-<h1>Frequently Asked Questions</h1>
+<h1>Frequently Asked Questions <i class="fa fa-question-circle"></i></h1>
 
 <h2>General</h2>
 
-- 
2.39.5