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.

diff --git a/templates/blocked b/templates/blocked
index 918bf2e..0f70bf2 100644 (file)
--- 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 d83a2a2..c86fce1 100644 (file)
--- 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 c1d4b7b..955ffb7 100644 (file)
--- 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 6f31ace..2610f7a 100644 (file)
--- 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 92647dc..b408ec0 100644 (file)
--- 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 945f8b4..e705207 100644 (file)
--- 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 0f94177..d84bbf3 100644 (file)
--- 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 0793e0c..7830b77 100644 (file)
--- 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 4e9f021..4e57dd7 100644 (file)
--- 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 952fd7e..89f44b3 100644 (file)
--- 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 476616c..d7eae49 100644 (file)
--- 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 ede7f48..e62506b 100644 (file)
--- 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 d54a09f..0991022 100644 (file)
--- 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 4f04672..229d995 100644 (file)
--- 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 f8e0091..e4a7f24 100644 (file)
--- 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 48c9ff8..c2dabfc 100644 (file)
--- 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 74a3ea3..2927793 100644 (file)
--- 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 88fd605..6355565 100644 (file)
--- 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 844dec3..297e060 100644 (file)
--- 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 4e16410..ef0bad0 100644 (file)
--- 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 0c34639..7ecf777 100644 (file)
--- 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 89a8f83..60d1335 100644 (file)
--- 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 8eea9fc..3fe02e2 100644 (file)
--- 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 e2c7ab8..3210d3f 100644 (file)
--- 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 bafff64..622490b 100644 (file)
--- 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 fc17a5e..f0de03b 100644 (file)
--- 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 e295e5c..baf7c81 100644 (file)
--- 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>