From f59e5426741b023569aa06bccbb20a86850e0651 Mon Sep 17 00:00:00 2001 From: jongfoster Date: Thu, 17 Jan 2002 21:33:00 +0000 Subject: [PATCH] Replacing all references to the URL of the config interface with @default-cgi@ --- templates/cgi-error-bad-param | 3 +++ templates/cgi-error-modified | 2 +- templates/cgi-error-parse | 2 +- templates/edit-actions-add-url-form | 7 +++++-- templates/edit-actions-for-url | 5 ++++- templates/edit-actions-list | 7 +++++-- templates/edit-actions-list-section | 19 +++++++++++-------- templates/edit-actions-list-url | 11 +++++++---- templates/edit-actions-remove-url-form | 7 +++++-- templates/edit-actions-url-form | 7 +++++-- templates/show-status | 2 +- templates/toggle | 10 +++++----- templates/toggle-mini | 4 ++-- 13 files changed, 55 insertions(+), 31 deletions(-) diff --git a/templates/cgi-error-bad-param b/templates/cgi-error-bad-param index 2a79b0d9..38a17860 100644 --- a/templates/cgi-error-bad-param +++ b/templates/cgi-error-bad-param @@ -109,6 +109,9 @@ "?" mark) are wrong or missing.

Possible causes:

You can go back into the edit interface using the menu below, or by clicking here.

diff --git a/templates/cgi-error-parse b/templates/cgi-error-parse index a86cfb1d..969f1703 100644 --- a/templates/cgi-error-parse +++ b/templates/cgi-error-parse @@ -112,7 +112,7 @@ badly using the web-based editor, please file a bug report!

When you've fixed the problem, you can go back into the edit interface using the menu below, or by clicking here.

diff --git a/templates/edit-actions-add-url-form b/templates/edit-actions-add-url-form index a0604e93..73512986 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.2 2002/01/17 21:21:03 jongfoster +# DOS->Unix line endings +# # Revision 1.1 2001/11/13 00:58:18 jongfoster # New version of actions file editor templates # @@ -121,7 +124,7 @@ function validate(text)

Add URL Pattern

-

@@ -130,7 +133,7 @@ function validate(text)
    - Cancel + Cancel

diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url index 034de523..2004c16e 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.7 2002/01/17 21:21:03 jongfoster +# DOS->Unix line endings +# # Revision 1.6 2001/11/22 21:58:41 jongfoster # Adding action +no-cookies-keep # @@ -283,7 +286,7 @@ function show_wafer_opts(tf) -
+ diff --git a/templates/edit-actions-list b/templates/edit-actions-list index 36a7d642..863cd1cb 100644 --- a/templates/edit-actions-list +++ b/templates/edit-actions-list @@ -31,6 +31,9 @@ # # Revisions : # $Log: edit-actions-list,v $ +# Revision 1.5 2002/01/17 21:21:05 jongfoster +# DOS->Unix line endings +# # Revision 1.4 2001/11/13 00:58:18 jongfoster # New version of actions file editor templates # @@ -139,7 +142,7 @@ function not_yet() function remove_pattern(section,pattern,curtext) { if (window.confirm("Are you sure you want to delete this URL pattern?\nPattern is: "+unescape(curtext))) - { window.location.href="http://i.j.b/edit-actions-remove-url?filename=@filename@&ver=@ver@§ion="+section+"&pattern="+pattern+"#s"+section+"urls"; } + { window.location.href="@default-cgi@edit-actions-remove-url?filename=@filename@&ver=@ver@§ion="+section+"&pattern="+pattern+"#s"+section+"urls"; } return false; } @@ -180,7 +183,7 @@ function remove_pattern(section,pattern,curtext) diff --git a/templates/edit-actions-list-section b/templates/edit-actions-list-section index 68c07bf9..68ea8145 100644 --- a/templates/edit-actions-list-section +++ b/templates/edit-actions-list-section @@ -1,6 +1,6 @@ ############################################################################## # -# File : $Source: /cvsroot/ijbswa/current/cgi.c,v $ +# File : $Source: /cvsroot/ijbswa/current/templates/edit-actions-list-section,v $ # # Purpose : Template which forms part of edit-actions-list # @@ -30,7 +30,10 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Revisions : -# $Log$ +# $Log: edit-actions-list-section,v $ +# Revision 1.3 2001/11/13 00:58:18 jongfoster +# New version of actions file editor templates +# # ############################################################################# # @@ -45,17 +48,17 @@

Editing Actions File - @filename@.action

- Insert new section at top + Insert new section at top

- - - @@ -63,7 +66,7 @@ @urls@ - @@ -73,13 +76,13 @@
Actions:Edit @actions@
----
URLs:Add  
-
  Move section up     - Insert new section below  
  Move section down     - Delete whole section  
diff --git a/templates/edit-actions-list-url b/templates/edit-actions-list-url index 389317ed..c3a99dd4 100644 --- a/templates/edit-actions-list-url +++ b/templates/edit-actions-list-url @@ -1,6 +1,6 @@ ############################################################################## # -# File : $Source: /cvsroot/ijbswa/current/cgi.c,v $ +# File : $Source: /cvsroot/ijbswa/current/templates/edit-actions-list-url,v $ # # Purpose : Template which forms part of edit-actions-list # @@ -30,7 +30,10 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Revisions : -# $Log$ +# $Log: edit-actions-list-url,v $ +# Revision 1.3 2001/11/13 00:58:18 jongfoster +# New version of actions file editor templates +# # ############################################################################# # @@ -45,9 +48,9 @@   Remove   Edit  +class="cmd" href="@default-cgi@edit-actions-url-form?filename=@filename@&ver=@ver@&section=@sectionid@&pattern=@urlid@&oldval=@url@">Edit  @url-html@ diff --git a/templates/edit-actions-remove-url-form b/templates/edit-actions-remove-url-form index 0b5a2c6f..c7e9de74 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.2 2002/01/17 21:21:05 jongfoster +# DOS->Unix line endings +# # Revision 1.1 2001/11/13 00:58:18 jongfoster # New version of actions file editor templates # @@ -113,9 +116,9 @@ td.dark { background-color: #dddddd }

Are you sure you want to delete this URL pattern? The pattern is:

@oldval@

- OK + OK   - Cancel + Cancel

diff --git a/templates/edit-actions-url-form b/templates/edit-actions-url-form index 724a889a..0bec38f6 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.2 2002/01/17 21:21:05 jongfoster +# DOS->Unix line endings +# # Revision 1.1 2001/11/13 00:58:18 jongfoster # New version of actions file editor templates # @@ -123,7 +126,7 @@ function validate(text)

Edit URL Pattern

-

@@ -133,7 +136,7 @@ function validate(text)
    - Cancel + Cancel

diff --git a/templates/show-status b/templates/show-status index 00edc58a..2517178e 100644 --- a/templates/show-status +++ b/templates/show-status @@ -202,7 +202,7 @@ FEATURE_CGI_EDIT_ACTIONS @if-FEATURE_CGI_EDIT_ACTIONS-then@ Yes @else-not-FEATURE_CGI_EDIT_ACTIONS@ No @endif-FEATURE_CGI_EDIT_ACTIONS@ Allows the use of the web-based actions file - editor@if-FEATURE_CGI_EDIT_ACTIONS-then@, which is here@else-not-FEATURE_CGI_EDIT_ACTIONS@@endif-FEATURE_CGI_EDIT_ACTIONS@. + editor@if-FEATURE_CGI_EDIT_ACTIONS-then@, which is here@else-not-FEATURE_CGI_EDIT_ACTIONS@@endif-FEATURE_CGI_EDIT_ACTIONS@. FEATURE_COOKIE_JAR diff --git a/templates/toggle b/templates/toggle index 25278403..6f10fff2 100644 --- a/templates/toggle +++ b/templates/toggle @@ -110,7 +110,7 @@ adverts, filtering cookies, regex-filtering, etc.

When disabled, JunkBuster behaves as a normal HTTP proxy, and will not affect your web browsing.

-

Click +

Click here to @if-enabled-then@disable@else-not-enabled@enable@endif-enabled@ JunkBuster.

@@ -137,11 +137,11 @@ (Netscape), and run them with a single click.

Credit: The site which gave me the general idea for these diff --git a/templates/toggle-mini b/templates/toggle-mini index f2156bf2..f45f3ad0 100644 --- a/templates/toggle-mini +++ b/templates/toggle-mini @@ -79,9 +79,9 @@

-JunkBuster is +JunkBuster is @if-enabled-then@Enabled@else-not-enabled@Disabled@endif-enabled@. -@if-enabled-then@[Disable]@else-not-enabled@[Enable]@endif-enabled@
[Close] -- 2.50.1