From a2f1da2576306c55f97a25bdc05cb7745feb869e Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Mon, 23 Jan 2017 13:00:51 +0000
Subject: [PATCH] templates: Move the site-specific documentation block before
the generic one
While most Privoxy installations don't have a site-specific
documentation block, in cases were it exists it's likely to
be more relevant than the generic one.
Showing it first makes it less likely that users stop reading
before they reach it, especially on pages that don't fit on
the screen.
---
templates/blocked | 36 +++++++++++++-------------
templates/cgi-error-404 | 8 +++---
templates/cgi-error-bad-param | 8 +++---
templates/cgi-error-disabled | 8 +++---
templates/cgi-error-file | 8 +++---
templates/cgi-error-file-read-only | 8 +++---
templates/cgi-error-modified | 8 +++---
templates/cgi-error-parse | 8 +++---
templates/client-tags | 8 +++---
templates/connect-failed | 8 +++---
templates/connection-timeout | 8 +++---
templates/default | 8 +++---
templates/edit-actions-add-url-form | 8 +++---
templates/edit-actions-for-url | 8 +++---
templates/edit-actions-list | 8 +++---
templates/edit-actions-remove-url-form | 8 +++---
templates/edit-actions-url-form | 8 +++---
templates/forwarding-failed | 8 +++---
templates/no-server-data | 8 +++---
templates/no-such-domain | 8 +++---
templates/show-request | 8 +++---
templates/show-status | 8 +++---
templates/show-status-file | 8 +++---
templates/show-url-info | 8 +++---
templates/show-version | 8 +++---
templates/toggle | 8 +++---
templates/untrusted | 8 +++---
27 files changed, 122 insertions(+), 122 deletions(-)
diff --git a/templates/blocked b/templates/blocked
index 918bf2e0..0f70bf29 100644
--- a/templates/blocked
+++ b/templates/blocked
@@ -210,24 +210,6 @@
<ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul> \
</td> \
</tr> \
- \
- <tr> \
- <td class="info" colspan="2"> \
- <big><b>Support and Service:</b></big> \
- <p> \
- The Privoxy Team values your feedback. \
- </p> \
- <p> \
- Please have a look at the User Manual to learn how to \
- <a title="Privoxy User Manual: Contacting the developers, Bug Reporting and Feature Requests" \
- href="@user-manual@contact.html">get support or report problems</a>. \
- <p> \
- If you want to support the Privoxy Team, you can \
- <a href="https://www.privoxy.org/faq/general.html#PARTICIPATE">participate</a> \
- or <a href="https://www.privoxy.org/faq/general.html#DONATE">donate</a>. \
- </p> \
- </td> \
- </tr> \
\
<!-- @if-have-help-info-start --> \
<tr> \
@@ -247,6 +229,24 @@
</td> \
</tr> \
<!-- if-have-help-info-end@ --> \
+ \
+ <tr> \
+ <td class="info" colspan="2"> \
+ <big><b>Support and Service:</b></big> \
+ <p> \
+ The Privoxy Team values your feedback. \
+ </p> \
+ <p> \
+ Please have a look at the User Manual to learn how to \
+ <a title="Privoxy User Manual: Contacting the developers, Bug Reporting and Feature Requests" \
+ href="@user-manual@contact.html">get support or report problems</a>. \
+ <p> \
+ If you want to support the Privoxy Team, you can \
+ <a href="https://www.privoxy.org/faq/general.html#PARTICIPATE">participate</a> \
+ or <a href="https://www.privoxy.org/faq/general.html#DONATE">donate</a>. \
+ </p> \
+ </td> \
+ </tr> \
\
</table> \
');
diff --git a/templates/cgi-error-404 b/templates/cgi-error-404
index d83a2a27..c86fce14 100644
--- a/templates/cgi-error-404
+++ b/templates/cgi-error-404
@@ -125,23 +125,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info" colspan="2">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info" colspan="2">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/cgi-error-bad-param b/templates/cgi-error-bad-param
index c1d4b7be..955ffb72 100644
--- a/templates/cgi-error-bad-param
+++ b/templates/cgi-error-bad-param
@@ -132,23 +132,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/cgi-error-disabled b/templates/cgi-error-disabled
index 6f31acea..2610f7a1 100644
--- a/templates/cgi-error-disabled
+++ b/templates/cgi-error-disabled
@@ -145,23 +145,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/cgi-error-file b/templates/cgi-error-file
index 92647dc4..b408ec07 100644
--- a/templates/cgi-error-file
+++ b/templates/cgi-error-file
@@ -115,23 +115,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/cgi-error-file-read-only b/templates/cgi-error-file-read-only
index 945f8b4e..e7052077 100644
--- a/templates/cgi-error-file-read-only
+++ b/templates/cgi-error-file-read-only
@@ -122,23 +122,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/cgi-error-modified b/templates/cgi-error-modified
index 0f94177b..d84bbf3e 100644
--- a/templates/cgi-error-modified
+++ b/templates/cgi-error-modified
@@ -133,23 +133,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/cgi-error-parse b/templates/cgi-error-parse
index 0793e0ca..7830b77e 100644
--- a/templates/cgi-error-parse
+++ b/templates/cgi-error-parse
@@ -152,23 +152,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/client-tags b/templates/client-tags
index 4e9f0210..4e57dd76 100644
--- a/templates/client-tags
+++ b/templates/client-tags
@@ -128,23 +128,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/connect-failed b/templates/connect-failed
index 952fd7ef..89f44b35 100644
--- a/templates/connect-failed
+++ b/templates/connect-failed
@@ -132,23 +132,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info" colspan="2">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info" colspan="2">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/connection-timeout b/templates/connection-timeout
index 476616c6..d7eae49c 100644
--- a/templates/connection-timeout
+++ b/templates/connection-timeout
@@ -62,23 +62,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info" colspan="2">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info" colspan="2">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/default b/templates/default
index ede7f48c..e62506b9 100644
--- a/templates/default
+++ b/templates/default
@@ -107,23 +107,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/edit-actions-add-url-form b/templates/edit-actions-add-url-form
index d54a09f8..09910224 100644
--- a/templates/edit-actions-add-url-form
+++ b/templates/edit-actions-add-url-form
@@ -122,23 +122,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url
index 4f046723..229d995b 100644
--- a/templates/edit-actions-for-url
+++ b/templates/edit-actions-for-url
@@ -1166,23 +1166,23 @@ function show_limit_connect_opts(tf)
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
<!-- @if-one-form-only-start -->
diff --git a/templates/edit-actions-list b/templates/edit-actions-list
index f8e0091a..e4a7f248 100644
--- a/templates/edit-actions-list
+++ b/templates/edit-actions-list
@@ -255,23 +255,23 @@ function a_p(link,section)
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
</body>
diff --git a/templates/edit-actions-remove-url-form b/templates/edit-actions-remove-url-form
index 48c9ff8a..c2dabfcb 100644
--- a/templates/edit-actions-remove-url-form
+++ b/templates/edit-actions-remove-url-form
@@ -108,23 +108,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
</body>
diff --git a/templates/edit-actions-url-form b/templates/edit-actions-url-form
index 74a3ea3d..2927793f 100644
--- a/templates/edit-actions-url-form
+++ b/templates/edit-actions-url-form
@@ -126,23 +126,23 @@ function validate(text)
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
</body>
diff --git a/templates/forwarding-failed b/templates/forwarding-failed
index 88fd6050..6355565f 100644
--- a/templates/forwarding-failed
+++ b/templates/forwarding-failed
@@ -143,23 +143,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info" colspan="2">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info" colspan="2">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/no-server-data b/templates/no-server-data
index 844dec32..297e0608 100644
--- a/templates/no-server-data
+++ b/templates/no-server-data
@@ -71,23 +71,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info" colspan="2">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info" colspan="2">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/no-such-domain b/templates/no-such-domain
index 4e164106..ef0bad04 100644
--- a/templates/no-such-domain
+++ b/templates/no-such-domain
@@ -134,23 +134,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info" colspan="2">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info" colspan="2">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/show-request b/templates/show-request
index 0c346390..7ecf7772 100644
--- a/templates/show-request
+++ b/templates/show-request
@@ -130,23 +130,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/show-status b/templates/show-status
index 89a8f830..60d1335b 100644
--- a/templates/show-status
+++ b/templates/show-status
@@ -367,23 +367,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/show-status-file b/templates/show-status-file
index 8eea9fc7..3fe02e2d 100644
--- a/templates/show-status-file
+++ b/templates/show-status-file
@@ -122,23 +122,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/show-url-info b/templates/show-url-info
index e2c7ab88..3210d3f7 100644
--- a/templates/show-url-info
+++ b/templates/show-url-info
@@ -268,23 +268,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/show-version b/templates/show-version
index bafff64f..622490bb 100644
--- a/templates/show-version
+++ b/templates/show-version
@@ -135,23 +135,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/toggle b/templates/toggle
index fc17a5eb..f0de03b6 100644
--- a/templates/toggle
+++ b/templates/toggle
@@ -125,23 +125,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
diff --git a/templates/untrusted b/templates/untrusted
index e295e5ca..baf7c81d 100644
--- a/templates/untrusted
+++ b/templates/untrusted
@@ -167,23 +167,23 @@
</td>
</tr>
+<!-- @if-have-help-info-start -->
<tr>
<td class="info" colspan="2">
-#include mod-support-and-service
+#include mod-local-help
</td>
</tr>
+<!-- if-have-help-info-end@ -->
-<!-- @if-have-help-info-start -->
<tr>
<td class="info" colspan="2">
-#include mod-local-help
+#include mod-support-and-service
</td>
</tr>
-<!-- if-have-help-info-end@ -->
</table>
--
2.49.0