From f8e10b0e3ce35c32fe782e5871275b27650aa31b Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Tue, 23 Jan 2007 16:03:17 +0000
Subject: [PATCH] - Add favicon links. - Remove useless W3C validator links.
---
templates/cgi-error-404 | 7 +------
templates/cgi-error-bad-param | 7 +------
templates/cgi-error-disabled | 1 +
templates/cgi-error-file | 1 +
templates/cgi-error-file-read-only | 1 +
templates/cgi-error-modified | 7 +------
templates/cgi-error-parse | 1 +
templates/connect-failed | 1 +
templates/default | 1 +
templates/edit-actions-add-url-form | 11 +++++------
templates/edit-actions-for-url | 9 +++++++++
templates/edit-actions-list | 12 +++++-------
templates/edit-actions-remove-url-form | 11 +++++------
templates/edit-actions-url-form | 11 +++++------
templates/no-such-domain | 1 +
templates/show-request | 6 +-----
templates/show-status | 1 +
templates/show-status-file | 6 +-----
templates/show-url-info | 1 +
templates/show-version | 6 +-----
templates/toggle | 7 +------
templates/toggle-mini | 1 +
templates/untrusted | 1 +
23 files changed, 47 insertions(+), 64 deletions(-)
diff --git a/templates/cgi-error-404 b/templates/cgi-error-404
index 925ff954..c12b5648 100644
--- a/templates/cgi-error-404
+++ b/templates/cgi-error-404
@@ -75,6 +75,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
</head>
<body>
@@ -142,12 +143,6 @@
</tr>
<!-- if-have-help-info-end@ -->
- <tr>
- <td colspan="2">
- <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
- </td>
- </tr>
-
</table>
</body>
diff --git a/templates/cgi-error-bad-param b/templates/cgi-error-bad-param
index 32f90fa6..a1e3f055 100644
--- a/templates/cgi-error-bad-param
+++ b/templates/cgi-error-bad-param
@@ -75,6 +75,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
</head>
<body>
@@ -149,12 +150,6 @@
</tr>
<!-- if-have-help-info-end@ -->
- <tr>
- <td>
- <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
- </td>
- </tr>
-
</table>
</body>
diff --git a/templates/cgi-error-disabled b/templates/cgi-error-disabled
index 1a64b883..0db4abe0 100644
--- a/templates/cgi-error-disabled
+++ b/templates/cgi-error-disabled
@@ -75,6 +75,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
</head>
<body>
diff --git a/templates/cgi-error-file b/templates/cgi-error-file
index ffe4c9cc..4b696802 100644
--- a/templates/cgi-error-file
+++ b/templates/cgi-error-file
@@ -75,6 +75,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
</head>
<body>
diff --git a/templates/cgi-error-file-read-only b/templates/cgi-error-file-read-only
index d9b7baea..bfce2779 100644
--- a/templates/cgi-error-file-read-only
+++ b/templates/cgi-error-file-read-only
@@ -75,6 +75,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
</head>
<body>
diff --git a/templates/cgi-error-modified b/templates/cgi-error-modified
index 5c5cee31..3b04b4b3 100644
--- a/templates/cgi-error-modified
+++ b/templates/cgi-error-modified
@@ -75,6 +75,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
</head>
<body>
@@ -150,12 +151,6 @@
</tr>
<!-- if-have-help-info-end@ -->
- <tr>
- <td>
- <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
- </td>
- </tr>
-
</table>
</body>
diff --git a/templates/cgi-error-parse b/templates/cgi-error-parse
index 0c640a4c..695131c4 100644
--- a/templates/cgi-error-parse
+++ b/templates/cgi-error-parse
@@ -75,6 +75,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
</head>
<body>
diff --git a/templates/connect-failed b/templates/connect-failed
index e10481ca..165c6050 100644
--- a/templates/connect-failed
+++ b/templates/connect-failed
@@ -82,6 +82,7 @@
<meta http-equiv="Content-Script-Type" content="text/javascript">
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
+ <link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
<style type="text/css">
#include cgi-style.css
</style>
diff --git a/templates/default b/templates/default
index dcc8f17d..065aedc2 100644
--- a/templates/default
+++ b/templates/default
@@ -75,6 +75,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
</head>
<body>
diff --git a/templates/edit-actions-add-url-form b/templates/edit-actions-add-url-form
index 2edc02ff..fd23ef07 100644
--- a/templates/edit-actions-add-url-form
+++ b/templates/edit-actions-add-url-form
@@ -31,6 +31,10 @@
#
# Revisions :
# $Log: edit-actions-add-url-form,v $
+# Revision 1.16 2006/07/18 14:49:13 david__schmidt
+# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+# with what was really the latest development (the v_3_0_branch branch)
+#
# Revision 1.14.2.2 2002/08/23 02:22:53 hal9
# Fix a perl brain fart with <li> in comments.
#
@@ -112,6 +116,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
<title>Privoxy@@my-hostname@: Add URL Pattern</title>
@@ -196,12 +201,6 @@
</tr>
<!-- if-have-help-info-end@ -->
- <tr>
- <td>
- <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
- </td>
- </tr>
-
</table>
</body>
diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url
index e9557c06..c96e3132 100644
--- a/templates/edit-actions-for-url
+++ b/templates/edit-actions-for-url
@@ -32,6 +32,14 @@
#
# Revisions :
# $Log: edit-actions-for-url,v $
+# Revision 1.40 2006/12/21 13:01:03 fabiankeil
+# Prepare for "split-large-forms".
+#
+# Mention that redirect{} now also understands
+# a single pcrs job as argument.
+#
+# Add some table summaries and remove useless validator link.
+#
# Revision 1.39 2006/10/04 17:37:54 fabiankeil
# JavaScript fix for bug report #1570678.
#
@@ -238,6 +246,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
<title>Privoxy@@my-hostname@: Edit actions</title>
diff --git a/templates/edit-actions-list b/templates/edit-actions-list
index a16368e8..b516fffe 100644
--- a/templates/edit-actions-list
+++ b/templates/edit-actions-list
@@ -5,7 +5,7 @@
# Purpose : Template used to edit the actions file.
#
#
-# Copyright : Written by and Copyright (C) 2001-2006 the SourceForge
+# Copyright : Written by and Copyright (C) 2001-2007 the SourceForge
# Privoxy team. http://www.privoxy.org/
#
# Original Author: Copyright (C) 2001 Jonathan Foster
@@ -31,6 +31,9 @@
#
# Revisions :
# $Log: edit-actions-list,v $
+# Revision 1.31 2006/09/10 14:39:24 hal9
+# Fix typo + minor change.
+#
# Revision 1.30 2006/09/09 01:12:15 hal9
# Soften actions files update interval.
#
@@ -188,6 +191,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
<title>Privoxy: Edit actions file @f@.action</title>
@@ -386,12 +390,6 @@ function a_p(link,section)
</tr>
<!-- if-have-help-info-end@ -->
- <tr>
- <td>
- <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
- </td>
- </tr>
-
</table>
</body>
diff --git a/templates/edit-actions-remove-url-form b/templates/edit-actions-remove-url-form
index ebd14e64..36ea8418 100644
--- a/templates/edit-actions-remove-url-form
+++ b/templates/edit-actions-remove-url-form
@@ -33,6 +33,10 @@
#
# Revisions :
# $Log: edit-actions-remove-url-form,v $
+# Revision 1.16 2006/07/18 14:49:14 david__schmidt
+# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+# with what was really the latest development (the v_3_0_branch branch)
+#
# Revision 1.14.2.2 2002/08/23 02:22:53 hal9
# Fix a perl brain fart with <li> in comments.
#
@@ -117,6 +121,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
<title>Privoxy@@my-hostname@: Remove URL Pattern</title>
</head>
@@ -181,12 +186,6 @@
</tr>
<!-- if-have-help-info-end@ -->
- <tr>
- <td>
- <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
- </td>
- </tr>
-
</table>
</body>
diff --git a/templates/edit-actions-url-form b/templates/edit-actions-url-form
index 2d3e0b1f..2ea59f4f 100644
--- a/templates/edit-actions-url-form
+++ b/templates/edit-actions-url-form
@@ -31,6 +31,10 @@
#
# Revisions :
# $Log: edit-actions-url-form,v $
+# Revision 1.16 2006/07/18 14:49:14 david__schmidt
+# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+# with what was really the latest development (the v_3_0_branch branch)
+#
# Revision 1.14.2.2 2002/08/23 02:22:53 hal9
# Fix a perl brain fart with <li> in comments.
#
@@ -115,6 +119,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
<title>Privoxy@@my-hostname@: Edit URL Pattern</title>
@@ -199,12 +204,6 @@ function validate(text)
</tr>
<!-- if-have-help-info-end@ -->
- <tr>
- <td>
- <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
- </td>
- </tr>
-
</table>
</body>
diff --git a/templates/no-such-domain b/templates/no-such-domain
index 634be630..08cf5dab 100644
--- a/templates/no-such-domain
+++ b/templates/no-such-domain
@@ -84,6 +84,7 @@
<meta http-equiv="Content-Script-Type" content="text/javascript">
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
+ <link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
<style type="text/css">
#include cgi-style.css
</style>
diff --git a/templates/show-request b/templates/show-request
index 9b6cb800..30a25292 100644
--- a/templates/show-request
+++ b/templates/show-request
@@ -80,6 +80,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
</head>
<body>
@@ -147,11 +148,6 @@
</tr>
<!-- if-have-help-info-end@ -->
- <tr>
- <td>
- <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
- </td>
- </tr>
</table>
</body>
diff --git a/templates/show-status b/templates/show-status
index fc0d01a2..6bf4bfa4 100644
--- a/templates/show-status
+++ b/templates/show-status
@@ -114,6 +114,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
</head>
<body>
diff --git a/templates/show-status-file b/templates/show-status-file
index 2a8f1382..4fa9333e 100644
--- a/templates/show-status-file
+++ b/templates/show-status-file
@@ -83,6 +83,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
</head>
<body>
@@ -139,11 +140,6 @@
</tr>
<!-- if-have-help-info-end@ -->
- <tr>
- <td>
- <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
- </td>
- </tr>
</table>
</body>
diff --git a/templates/show-url-info b/templates/show-url-info
index 86d03e87..1b4a69b9 100644
--- a/templates/show-url-info
+++ b/templates/show-url-info
@@ -89,6 +89,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
</head>
<body>
diff --git a/templates/show-version b/templates/show-version
index 2ccc273b..9bdbbbaa 100644
--- a/templates/show-version
+++ b/templates/show-version
@@ -91,6 +91,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
</head>
<body>
@@ -152,11 +153,6 @@
</tr>
<!-- if-have-help-info-end@ -->
- <tr>
- <td>
- <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
- </td>
- </tr>
</table>
</body>
diff --git a/templates/toggle b/templates/toggle
index c60e0c13..3d63eb11 100644
--- a/templates/toggle
+++ b/templates/toggle
@@ -76,6 +76,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
</head>
<body>
@@ -172,12 +173,6 @@
</tr>
<!-- if-have-help-info-end@ -->
-
- <tr>
- <td>
- <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
- </td>
- </tr>
</table>
</body>
diff --git a/templates/toggle-mini b/templates/toggle-mini
index bf06fbaf..3b5d5c95 100644
--- a/templates/toggle-mini
+++ b/templates/toggle-mini
@@ -76,6 +76,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+ <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
</head>
<body>
diff --git a/templates/untrusted b/templates/untrusted
index 017a5383..bd4015a6 100644
--- a/templates/untrusted
+++ b/templates/untrusted
@@ -93,6 +93,7 @@
<meta http-equiv="Content-Script-Type" content="text/javascript">
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="robots" content="noindex,nofollow">
+ <link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
<style type="text/css">
#include cgi-style.css
</style>
--
2.49.0