From: oes <oes@users.sourceforge.net> Date: Wed, 10 Apr 2002 13:33:20 +0000 (+0000) Subject: Made templates modular X-Git-Tag: v_2_9_14~90 X-Git-Url: http://www.privoxy.org/gitweb/%22https:/@default-cgi@/man-page/static/gitweb.js?a=commitdiff_plain;h=3c6406b7e0431bfac8206b6558d29d28051458e8;p=privoxy.git Made templates modular --- diff --git a/templates/cgi-error-404 b/templates/cgi-error-404 index c2631bf5..ee70d494 100644 --- a/templates/cgi-error-404 +++ b/templates/cgi-error-404 @@ -85,10 +85,9 @@ 404 </td> <td class="title" style="width: 100%"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -96,12 +95,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning" colspan="2"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -130,50 +126,18 @@ <tr> <td class="info" colspan="2"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info" colspan="2"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more - information about this Privoxy installation. - </p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/cgi-error-bad-param b/templates/cgi-error-bad-param index 82dc93d8..a9803dba 100644 --- a/templates/cgi-error-bad-param +++ b/templates/cgi-error-bad-param @@ -82,10 +82,9 @@ <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -93,12 +92,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -137,48 +133,18 @@ <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/cgi-error-disabled b/templates/cgi-error-disabled index 29f6e78e..fd7f01f9 100644 --- a/templates/cgi-error-disabled +++ b/templates/cgi-error-disabled @@ -82,10 +82,9 @@ <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -93,12 +92,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -124,48 +120,18 @@ <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/cgi-error-file b/templates/cgi-error-file index 7349300b..dab262a5 100644 --- a/templates/cgi-error-file +++ b/templates/cgi-error-file @@ -82,10 +82,9 @@ <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -93,12 +92,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -120,48 +116,18 @@ <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/cgi-error-modified b/templates/cgi-error-modified index 8ffe55ef..c42bc691 100644 --- a/templates/cgi-error-modified +++ b/templates/cgi-error-modified @@ -82,10 +82,9 @@ <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -93,12 +92,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -138,48 +134,18 @@ <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p> -<!-- if-have-proxy-info-end@ --> +#include mod-local-help -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/cgi-error-parse b/templates/cgi-error-parse index fdd1d496..723eb677 100644 --- a/templates/cgi-error-parse +++ b/templates/cgi-error-parse @@ -82,10 +82,9 @@ <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -93,12 +92,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -157,48 +153,18 @@ <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p> -<!-- if-have-proxy-info-end@ --> +#include mod-local-help -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/connect-failed b/templates/connect-failed index 550274ca..8e6de608 100644 --- a/templates/connect-failed +++ b/templates/connect-failed @@ -93,10 +93,9 @@ 503 </td> <td class="title" style="width: 100%"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -104,12 +103,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning" colspan="2"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -135,48 +131,18 @@ <tr> <td class="info" colspan="2"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info" colspan="2"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/default b/templates/default index c227e3b4..f11c3f69 100644 --- a/templates/default +++ b/templates/default @@ -82,10 +82,9 @@ <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -93,12 +92,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -112,48 +108,18 @@ <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/edit-actions-add-url-form b/templates/edit-actions-add-url-form index 8bda9722..9b701614 100644 --- a/templates/edit-actions-add-url-form +++ b/templates/edit-actions-add-url-form @@ -31,6 +31,9 @@ # # Revisions : # $Log: edit-actions-add-url-form,v $ +# Revision 1.12 2002/04/08 17:08:14 oes +# Cosmetic: make status in title lowercase +# # Revision 1.11 2002/04/05 16:01:33 oes # Correct HTML, external Stylesheets, eye candy, some fixes # @@ -123,10 +126,9 @@ <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -134,12 +136,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -171,48 +170,18 @@ <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url index e58aa17d..4c6d7597 100644 --- a/templates/edit-actions-for-url +++ b/templates/edit-actions-for-url @@ -32,6 +32,9 @@ # # Revisions : # $Log: edit-actions-for-url,v $ +# Revision 1.21 2002/04/08 17:05:18 oes +# Inline a style exception +# # Revision 1.20 2002/04/05 16:01:30 oes # Correct HTML, external Stylesheets, eye candy, some fixes # @@ -338,10 +341,9 @@ function show_wafer_opts(tf) <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -349,12 +351,9 @@ function show_wafer_opts(tf) # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -789,48 +788,18 @@ function show_wafer_opts(tf) <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/edit-actions-list b/templates/edit-actions-list index 5c15076e..683a806b 100644 --- a/templates/edit-actions-list +++ b/templates/edit-actions-list @@ -31,6 +31,9 @@ # # Revisions : # $Log: edit-actions-list,v $ +# Revision 1.16 2002/04/08 17:08:14 oes +# Cosmetic: make status in title lowercase +# # Revision 1.15 2002/04/05 16:01:32 oes # Correct HTML, external Stylesheets, eye candy, some fixes # @@ -215,10 +218,9 @@ function rm_p(pattern,curtext) <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -226,12 +228,9 @@ function rm_p(pattern,curtext) # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -261,48 +260,18 @@ function rm_p(pattern,curtext) <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p> -<!-- if-have-proxy-info-end@ --> +#include mod-local-help -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/edit-actions-remove-url-form b/templates/edit-actions-remove-url-form index cdfda304..ad9b359b 100644 --- a/templates/edit-actions-remove-url-form +++ b/templates/edit-actions-remove-url-form @@ -33,6 +33,9 @@ # # Revisions : # $Log: edit-actions-remove-url-form,v $ +# Revision 1.12 2002/04/08 17:08:14 oes +# Cosmetic: make status in title lowercase +# # Revision 1.11 2002/04/05 16:01:30 oes # Correct HTML, external Stylesheets, eye candy, some fixes # @@ -113,10 +116,9 @@ <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -124,12 +126,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -156,50 +155,18 @@ <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information - about this Privoxy installation. - </p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/edit-actions-url-form b/templates/edit-actions-url-form index b2d7ff82..6efed8e6 100644 --- a/templates/edit-actions-url-form +++ b/templates/edit-actions-url-form @@ -31,6 +31,9 @@ # # Revisions : # $Log: edit-actions-url-form,v $ +# Revision 1.12 2002/04/08 17:08:14 oes +# Cosmetic: make status in title lowercase +# # Revision 1.11 2002/04/05 16:01:32 oes # Correct HTML, external Stylesheets, eye candy, some fixes # @@ -126,10 +129,9 @@ function validate(text) <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -137,12 +139,9 @@ function validate(text) # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -174,50 +173,18 @@ function validate(text) <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information - about this Privoxy installation. - </p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/mod-local-help b/templates/mod-local-help new file mode 100644 index 00000000..21d65963 --- /dev/null +++ b/templates/mod-local-help @@ -0,0 +1,12 @@ + <h2>Local Privoxy support:</h2> + +<!-- @if-have-proxy-info-start --> + <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p> +<!-- if-have-proxy-info-end@ --> + +<!-- @if-have-adminaddr-info-start --> + <p>Address e-mail questions about this service to + <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, + who will be glad to help you. + </p> +<!-- if-have-adminaddr-info-end@ --> diff --git a/templates/mod-support-and-service b/templates/mod-support-and-service new file mode 100644 index 00000000..52769478 --- /dev/null +++ b/templates/mod-support-and-service @@ -0,0 +1,24 @@ + <h2>Support and Service via Sourceforge:</h2> + <p> + We value your feedback. To provide you with the best support, + we ask that you: + </p> + <ul> + <li> + use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the + <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. + </li> + <li> + submit banners and all problems with the actions file only through the + <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions + file feedback system</a>. + </li> + <li> + submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. + Make sure that the bug has not yet been submitted. + </li> + <li> + submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature + request tracker</a>. + </li> + </ul> diff --git a/templates/mod-title b/templates/mod-title new file mode 100644 index 00000000..18296044 --- /dev/null +++ b/templates/mod-title @@ -0,0 +1,4 @@ + <h1> + This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, + @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ + </h1> diff --git a/templates/mod-unstable-warning b/templates/mod-unstable-warning new file mode 100644 index 00000000..bb35ccf7 --- /dev/null +++ b/templates/mod-unstable-warning @@ -0,0 +1,6 @@ + <h2>Warning:</h2> + <p> + <b>Please note that this <em class="warning">@code-status@</em> release + of the proxy software is not intended for production systems! + <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> + </p> diff --git a/templates/no-such-domain b/templates/no-such-domain index d27b1294..f220b5c9 100644 --- a/templates/no-such-domain +++ b/templates/no-such-domain @@ -95,10 +95,9 @@ 404 </td> <td class="title" style="width: 100%"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -106,12 +105,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning" colspan="2"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -137,48 +133,18 @@ <tr> <td class="info" colspan="2"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info" colspan="2"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/show-request b/templates/show-request index e476bbc7..0871a114 100644 --- a/templates/show-request +++ b/templates/show-request @@ -87,10 +87,9 @@ <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -98,12 +97,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -135,48 +131,18 @@ <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/show-status b/templates/show-status index 5336d850..7108722c 100644 --- a/templates/show-status +++ b/templates/show-status @@ -122,10 +122,9 @@ <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -133,12 +132,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -169,7 +165,7 @@ <!-- @if-have-no-stats-start --> There haven't been any requests so far. <!-- if-have-no-stats-end@ --> - </p> + </p> </td> </tr> <!-- if-statistics-end@ --> @@ -193,91 +189,93 @@ <tr> <td class="box"> <h2>Conditional #defines:</h2> - <table border="1" style="margin-left: 10px"> - <tr> - <th>#define</th> <th>Enabled?</th> <th>Effects when enabled</th> - </tr> - <tr> - <td><code>FEATURE_ACL</code></td> - <td>@if-FEATURE_ACL-then@ Yes @else-not-FEATURE_ACL@ No @endif-FEATURE_ACL@</td> - <td>Allows the use of an ACL to control access to the proxy by IP address.</td> - </tr> - <tr> - <td><code>FEATURE_CGI_EDIT_ACTIONS</code></td> - <td>@if-FEATURE_CGI_EDIT_ACTIONS-then@ Yes @else-not-FEATURE_CGI_EDIT_ACTIONS@ No @endif-FEATURE_CGI_EDIT_ACTIONS@</td> - <td>Allows the use of the web-based actions file - editor@if-FEATURE_CGI_EDIT_ACTIONS-then@, which is <a href="@default-cgi@edit-actions">here</a>@else-not-FEATURE_CGI_EDIT_ACTIONS@@endif-FEATURE_CGI_EDIT_ACTIONS@.</td> - </tr> - <tr> - <td><code>FEATURE_COOKIE_JAR</code></td> - <td>@if-FEATURE_COOKIE_JAR-then@ Yes @else-not-FEATURE_COOKIE_JAR@ No @endif-FEATURE_COOKIE_JAR@</td> - <td>Allows the use of a "cookie jar" file to capture cookies.</td> - </tr> - <tr> - <td><code>FEATURE_FAST_REDIRECTS</code></td> - <td>@if-FEATURE_FAST_REDIRECTS-then@ Yes @else-not-FEATURE_FAST_REDIRECTS@ No @endif-FEATURE_FAST_REDIRECTS@</td> - <td>Allows the +fast-redirects action, to bypass redirect and logging scripts.</td> - </tr> - <tr> - <td><code>FEATURE_FORCE_LOAD</code></td> - <td>@if-FEATURE_FORCE_LOAD-then@ Yes @else-not-FEATURE_FORCE_LOAD@ No @endif-FEATURE_FORCE_LOAD@</td> - <td>Allows bypassing all filtering for a single page using the prefix "<code>@FORCE_PREFIX@</code>".</td> - </tr> - <tr> - <td><code>FEATURE_IMAGE_BLOCKING</code></td> - <td>@if-FEATURE_IMAGE_BLOCKING-then@ Yes @else-not-FEATURE_IMAGE_BLOCKING@ No @endif-FEATURE_IMAGE_BLOCKING@</td> - <td>Allows the +image ation, to send "blocked" images instead of HTML.</td> - </tr> - <tr> - <td><code>FEATURE_IMAGE_DETECT_MSIE</code></td> - <td>@if-FEATURE_IMAGE_DETECT_MSIE-then@ Yes @else-not-FEATURE_IMAGE_DETECT_MSIE@ No @endif-FEATURE_IMAGE_DETECT_MSIE@</td> - <td>Enables automatic detection of image and HTML requests from - Microsoft Internet Explorer users, overriding the setting of - +image in the actions file.</td> - </tr> - <tr> - <td><code>FEATURE_KILL_POPUPS</code></td> - <td>@if-FEATURE_KILL_POPUPS-then@ Yes @else-not-FEATURE_KILL_POPUPS@ No @endif-FEATURE_KILL_POPUPS@</td> - <td>Allows the +no-popups action, to block JavaScript popups.</td> - </tr> - <tr> - <td><code>FEATURE_NO_GIFS</code></td> - <td>@if-FEATURE_NO_GIFS-then@ Yes @else-not-FEATURE_NO_GIFS@ No @endif-FEATURE_NO_GIFS@</td> - <td>Use PNG instead of GIF for the built-in images.</td> - </tr> - <tr> - <td><code>FEATURE_PTHREAD</code></td> - <td>@if-FEATURE_PTHREAD-then@ Yes @else-not-FEATURE_PTHREAD@ No @endif-FEATURE_PTHREAD@</td> - <td>Use POSIX threads rather than native threads</td> - </tr> - <tr> - <td><code>FEATURE_STATISTICS</code></td> - <td>@if-FEATURE_STATISTICS-then@ Yes @else-not-FEATURE_STATISTICS@ No @endif-FEATURE_STATISTICS@</td> - <td>Enables the statistics function.</td> - </tr> - <tr> - <td><code>FEATURE_TOGGLE</code></td> - <td>@if-FEATURE_TOGGLE-then@ Yes @else-not-FEATURE_TOGGLE@ No @endif-FEATURE_TOGGLE@</td> - <td>Allow Privoxy to be "disabled" so it is just a normal non-blocking non-anonymizing proxy.</td> - </tr> - <tr> - <td><code>FEATURE_TRUST</code></td> - <td>@if-FEATURE_TRUST-then@ Yes @else-not-FEATURE_TRUST@ No @endif-FEATURE_TRUST@</td> - <td>Allows the use of trust files.</td> - </tr> - <tr> - <td><code>STATIC_PCRE</code></td> - <td>@if-STATIC_PCRE-then@ Yes @else-not-STATIC_PCRE@ No @endif-STATIC_PCRE@</td> - <td>Use the supplied statically-linked PCRE library. This is set automatically - by <code>./configure</code> if you do not have the libpcre installed.</td> - </tr> - <tr> - <td><code>STATIC_PCRS</code></td> - <td>@if-STATIC_PCRS-then@ Yes @else-not-STATIC_PCRS@ No @endif-STATIC_PCRS@</td> - <td>Use the supplied statically-linked PCRS library. This is set automatically - by <code>./configure</code> if you do not have the libpcrs installed.</td> - </tr> - </table> + <p> + <table border="1" style="margin-left: 10px"> + <tr> + <th>#define</th> <th>Enabled?</th> <th>Effects when enabled</th> + </tr> + <tr> + <td><code>FEATURE_ACL</code></td> + <td>@if-FEATURE_ACL-then@ Yes @else-not-FEATURE_ACL@ No @endif-FEATURE_ACL@</td> + <td>Allows the use of an ACL to control access to the proxy by IP address.</td> + </tr> + <tr> + <td><code>FEATURE_CGI_EDIT_ACTIONS</code></td> + <td>@if-FEATURE_CGI_EDIT_ACTIONS-then@ Yes @else-not-FEATURE_CGI_EDIT_ACTIONS@ No @endif-FEATURE_CGI_EDIT_ACTIONS@</td> + <td>Allows the use of the web-based actions file + editor@if-FEATURE_CGI_EDIT_ACTIONS-then@, which is <a href="@default-cgi@edit-actions">here</a>@else-not-FEATURE_CGI_EDIT_ACTIONS@@endif-FEATURE_CGI_EDIT_ACTIONS@.</td> + </tr> + <tr> + <td><code>FEATURE_COOKIE_JAR</code></td> + <td>@if-FEATURE_COOKIE_JAR-then@ Yes @else-not-FEATURE_COOKIE_JAR@ No @endif-FEATURE_COOKIE_JAR@</td> + <td>Allows the use of a "cookie jar" file to capture cookies.</td> + </tr> + <tr> + <td><code>FEATURE_FAST_REDIRECTS</code></td> + <td>@if-FEATURE_FAST_REDIRECTS-then@ Yes @else-not-FEATURE_FAST_REDIRECTS@ No @endif-FEATURE_FAST_REDIRECTS@</td> + <td>Allows the +fast-redirects action, to bypass redirect and logging scripts.</td> + </tr> + <tr> + <td><code>FEATURE_FORCE_LOAD</code></td> + <td>@if-FEATURE_FORCE_LOAD-then@ Yes @else-not-FEATURE_FORCE_LOAD@ No @endif-FEATURE_FORCE_LOAD@</td> + <td>Allows bypassing all filtering for a single page using the prefix "<code>@FORCE_PREFIX@</code>".</td> + </tr> + <tr> + <td><code>FEATURE_IMAGE_BLOCKING</code></td> + <td>@if-FEATURE_IMAGE_BLOCKING-then@ Yes @else-not-FEATURE_IMAGE_BLOCKING@ No @endif-FEATURE_IMAGE_BLOCKING@</td> + <td>Allows the +image ation, to send "blocked" images instead of HTML.</td> + </tr> + <tr> + <td><code>FEATURE_IMAGE_DETECT_MSIE</code></td> + <td>@if-FEATURE_IMAGE_DETECT_MSIE-then@ Yes @else-not-FEATURE_IMAGE_DETECT_MSIE@ No @endif-FEATURE_IMAGE_DETECT_MSIE@</td> + <td>Enables automatic detection of image and HTML requests from + Microsoft Internet Explorer users, overriding the setting of + +image in the actions file.</td> + </tr> + <tr> + <td><code>FEATURE_KILL_POPUPS</code></td> + <td>@if-FEATURE_KILL_POPUPS-then@ Yes @else-not-FEATURE_KILL_POPUPS@ No @endif-FEATURE_KILL_POPUPS@</td> + <td>Allows the +no-popups action, to block JavaScript popups.</td> + </tr> + <tr> + <td><code>FEATURE_NO_GIFS</code></td> + <td>@if-FEATURE_NO_GIFS-then@ Yes @else-not-FEATURE_NO_GIFS@ No @endif-FEATURE_NO_GIFS@</td> + <td>Use PNG instead of GIF for the built-in images.</td> + </tr> + <tr> + <td><code>FEATURE_PTHREAD</code></td> + <td>@if-FEATURE_PTHREAD-then@ Yes @else-not-FEATURE_PTHREAD@ No @endif-FEATURE_PTHREAD@</td> + <td>Use POSIX threads rather than native threads</td> + </tr> + <tr> + <td><code>FEATURE_STATISTICS</code></td> + <td>@if-FEATURE_STATISTICS-then@ Yes @else-not-FEATURE_STATISTICS@ No @endif-FEATURE_STATISTICS@</td> + <td>Enables the statistics function.</td> + </tr> + <tr> + <td><code>FEATURE_TOGGLE</code></td> + <td>@if-FEATURE_TOGGLE-then@ Yes @else-not-FEATURE_TOGGLE@ No @endif-FEATURE_TOGGLE@</td> + <td>Allow Privoxy to be "disabled" so it is just a normal non-blocking non-anonymizing proxy.</td> + </tr> + <tr> + <td><code>FEATURE_TRUST</code></td> + <td>@if-FEATURE_TRUST-then@ Yes @else-not-FEATURE_TRUST@ No @endif-FEATURE_TRUST@</td> + <td>Allows the use of trust files.</td> + </tr> + <tr> + <td><code>STATIC_PCRE</code></td> + <td>@if-STATIC_PCRE-then@ Yes @else-not-STATIC_PCRE@ No @endif-STATIC_PCRE@</td> + <td>Use the supplied statically-linked PCRE library. This is set automatically + by <code>./configure</code> if you do not have the libpcre installed.</td> + </tr> + <tr> + <td><code>STATIC_PCRS</code></td> + <td>@if-STATIC_PCRS-then@ Yes @else-not-STATIC_PCRS@ No @endif-STATIC_PCRS@</td> + <td>Use the supplied statically-linked PCRS library. This is set automatically + by <code>./configure</code> if you do not have the libpcrs installed.</td> + </tr> + </table> + </p> </td> </tr> @@ -290,51 +288,18 @@ <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> -<!-- @if-have-proxy-info-start --> - <p> - You can consult the <a href="@proxy-info-url@">online documentation</a> for more information - about this Privoxy installation. - </p> -<!-- if-have-proxy-info-end@ --> +#include mod-local-help -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/show-status-file b/templates/show-status-file index dfe4df0e..04e085ff 100644 --- a/templates/show-status-file +++ b/templates/show-status-file @@ -90,10 +90,9 @@ <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -101,12 +100,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -127,51 +123,18 @@ <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p> - You can consult the <a href="@proxy-info-url@">online documentation</a> for more information - about this Privoxy installation. - </p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/show-url-info b/templates/show-url-info index 1acab1c7..fa2e1241 100644 --- a/templates/show-url-info +++ b/templates/show-url-info @@ -96,10 +96,9 @@ <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -107,12 +106,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -164,51 +160,18 @@ <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p> - You can consult the <a href="@proxy-info-url@">online documentation</a> for more information - about this Privoxy installation. - </p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/show-version b/templates/show-version index ab98fc3e..bc7890a1 100644 --- a/templates/show-version +++ b/templates/show-version @@ -98,10 +98,9 @@ <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -109,12 +108,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -140,51 +136,18 @@ <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> -<!-- @if-have-proxy-info-start --> - <p> - You can consult the <a href="@proxy-info-url@">online documentation</a> for more information - about this Privoxy installation. - </p> -<!-- if-have-proxy-info-end@ --> +#include mod-local-help -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/toggle b/templates/toggle index e1534504..72fafd26 100644 --- a/templates/toggle +++ b/templates/toggle @@ -83,10 +83,9 @@ <table cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="title"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -94,12 +93,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -162,51 +158,18 @@ <tr> <td class="info"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p> - You can consult the <a href="@proxy-info-url@">online documentation</a> for more information - about this Privoxy installation. - </p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ --> diff --git a/templates/untrusted b/templates/untrusted index dbdfe894..d9c45294 100644 --- a/templates/untrusted +++ b/templates/untrusted @@ -104,10 +104,9 @@ UNTRUSTED </td> <td class="title" style="width: 100%"> - <h1> - This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ - </h1> + +#include mod-title + </td> </tr> @@ -115,12 +114,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in <tr> <td class="warning" colspan="2"> - <h2>Warning:</h2> - <p> - <b>Please note that this <em class="warning">@code-status@</em> release - of the proxy software is not intended for production systems! - <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> - </p> + +#include mod-unstable-warning + </td> </tr> <!-- if-unstable-end@ --> @@ -170,50 +166,18 @@ <tr> <td class="info" colspan="2"> - <h2>Support and Service via Sourceforge:</h2> - <p> - We value your feedback. To provide you with the best support, - we ask that you: - </p> - <ul> - <li> - use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the - <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. - </li> - <li> - submit banners and all problems with the actions file only through the - <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions - file feedback system</a>. - </li> - <li> - submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug tracker</a>. - Make sure that the bug has not yet been submitted. - </li> - <li> - submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature - request tracker</a>. - </li> - </ul> + +#include mod-support-and-service + </td> </tr> <!-- @if-have-help-info-start --> <tr> <td class="info" colspan="2"> - <h2>Local Privoxy support:</h2> - -<!-- @if-have-proxy-info-start --> - <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more - information about this Privoxy installation. - </p> -<!-- if-have-proxy-info-end@ --> - -<!-- @if-have-adminaddr-info-start --> - <p>Address e-mail questions about this service to - <a href="mailto:@admin-address@"><code>@admin-address@</code></a>, - who will be glad to help you. - </p> -<!-- if-have-adminaddr-info-end@ --> + +#include mod-local-help + </td> </tr> <!-- if-have-help-info-end@ -->