Applying [Patch 552094] New templates for edit-actions-list

This cleans up the templates by:
- Removing the (confusing) alternating color scheme.
- Making everything left-justified.

diff --git a/templates/cgi-style.css b/templates/cgi-style.css
index 206fd42..d9b0915 100644 (file)
--- a/templates/cgi-style.css
+++ b/templates/cgi-style.css
@@ -1,7 +1,7 @@
 /*
  * CSS for Privoxy CGI and script output
  *
- * $Id: cgi-style.css,v 1.5 2002/04/24 02:14:36 oes Exp $
+ * $Id: cgi-style.css,v 1.6 2002/04/26 12:56:18 oes Exp $
  */
 
 /*
@@ -72,7 +72,7 @@ td.buttons {
   padding: 2px;
 }
 
-a.cmd, td.buttons a {
+a.cmd, td.indentbuttons a, td.buttons a {
   white-space: nowrap;
   width: auto;
   padding: 2px;
@@ -84,10 +84,10 @@ a.cmd, td.buttons a {
   border-bottom: 1px solid #000000;
   border-right:  1px solid #000000;
 }
-a.cmd:hover, td.buttons a:hover {
+a.cmd:hover, td.indentbuttons a:hover, td.buttons a:hover {
   background-color: #eeeeee;
 }
-a.cmd:active, td.buttons a:active {
+a.cmd:active, td.indentbuttons a:active, td.buttons a:active {
   border-top:    1px solid #000000;
   border-left:   1px solid #000000;
   border-bottom: 1px solid #ffffff;

diff --git a/templates/edit-actions-list b/templates/edit-actions-list
index a293560..3e587d9 100644 (file)
--- a/templates/edit-actions-list
+++ b/templates/edit-actions-list
@@ -148,9 +148,6 @@
 
   <style type="text/css">
 
-table.wide {
-  padding: 5px;
-}
 table.framed {
   border: solid black 1px;
   margin: 10px 0px;
@@ -158,23 +155,16 @@ table.framed {
 tr.actions {
   background-color: #eeffee;
 }
-tr.url1 {
-  background-color: #d0d0ff;
-}
-tr.url2 {
-  background-color: #eeeeff;
-}
-tr.rule {
-  background-color: #c0c0c0;
-  height: 3px;
-  max-height: 3px;
-  font-size: 1px
+tr.url {
+  background-color: #ddddff;
 }
 tr.adv {
   background-color: #FFFFD0;
 }
 td.header {
   font-weight: bold;
+  font-size: 110%;
+  padding: 10px 15px 2px 15px;
 }
 td.url {
   font-weight: bold;
@@ -182,18 +172,18 @@ td.url {
 td.action {
   font-weight: bold;
   font-style: italic;
+  padding: 2px 30px;
 }
 td.nbr, td.buttons {
   white-space: nowrap;
 }
+td.indentbuttons {
+  padding: 2px 30px;
+}
 </style>
 
 <script type="text/javascript">
 <!--
-function not_yet()
-{
-   window.alert("The feature you are trying to use has not been implemented yet.");
-}
 
 // Non-JS capable browsers will follow the link to a HTML "are you sure?" page
 // JavaScript-capable browsers will call this function, which does a
@@ -276,55 +266,25 @@ function rm_p(pattern,curtext)
     <!-- @if-all-urls-present-then@ -->
     <tr>
       <td class="container">
-        <div class="buttons">
-          <table border="0" width="100%" cellspacing="0" cellpadding="3" class="framed">
-            <tr class="actions" valign="top">
-              <td class="header" align="right">Actions:</td>
-              <td class="buttons" align="center">
-                <p><a name="l@all-urls-s@" href="eafu?f=@f@&amp;v=@v@&amp;s=@all-urls-s@">Edit</a></p>
-                @all-urls-buttons@
-              </td>
-              <td class="action" align="left">@all-urls-actions@</td>
-            </tr>
-            <tr class="rule">
-              <td colspan="3"><img src="t" width="2" height="1" alt="----"></td>
-            </tr>
-            <tr class="url1" valign="top">
-              <td class="header" align="right">URL pattern:</td>
-              <td align="center">&nbsp;</td>
-              <td align="left"><b>/ (Matches all URLs!)</b></td>
-            </tr>
-            <tr class="rule">
-              <td colspan="3"><img src="t" width="2" height="1" alt="-"></td>
-            </tr>
-            <tr class="adv" valign="top">
-              <td class="header" align="right"><b>Advanced:</b></td>
-              <td colspan="2" class="buttons">
-                <table border="0" cellspacing="0" cellpadding="4">
-                  <tr valign="middle" align="center">
-                    <td class="nbr"> &nbsp; </td>
-                    <td class="nbr"> &nbsp; <a href="eafua?f=@f@&amp;v=@v@&amp;s=@all-urls-s@#l@all-urls-s-next@">Insert
-                      new section below</a> &nbsp;
-                    </td>
-                  </tr>
-                  <tr valign="middle" align="center">
-                    <td class="nbr"> &nbsp; </td>
-                    <td class="nbr"> &nbsp; </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </div>
+<table border="0" width="100%" cellspacing="2" cellpadding="3" class="framed">
+<tr class="actions"><td class="header">Actions</td></tr>
+<tr class="actions"><td class="indentbuttons">
+<a name="l@all-urls-s@" href="eafu?f=@f@&amp;v=@v@&amp;s=@all-urls-s@">Edit</a>
+@all-urls-buttons@
+</td></tr>
+<tr class="actions"><td class="action">@all-urls-actions@</td></tr>
+<tr class="url"><td class="header">URL patterns</td></tr>
+<tr class="url"><td class="indentbuttons">/ &nbsp; <i>(Matches all requests)</a></td></tr>
+<tr class="adv"><td class="header">Advanced</td></tr>
+<tr class="adv"><td class="indentbuttons">
+<a href="easa?f=@f@&amp;v=@v@&amp;s=@all-urls-s@#l@all-urls-s-next@">Insert new section below</a>
+</td></tr>
+</table>
       </td>
     </tr>
     <!-- @else-not-all-urls-present@@endif-all-urls-present@ -->
 
-    <tr>
-      <td class="container">
-        <div class="buttons">@sections@</div>
-      </td>
-    </tr>
+@sections@
 
     <tr>
       <td class="box">

diff --git a/templates/edit-actions-list-button b/templates/edit-actions-list-button
index 1b130d4..5503bc0 100644 (file)
--- a/templates/edit-actions-list-button
+++ b/templates/edit-actions-list-button
@@ -33,5 +33,4 @@
 #    $Log: edit-actions-list-url,v $
 #
 #############################################################################
-<p><a href="eas?f=@f@&amp;v=@v@&amp;s=@all-urls-s@&amp;p=@button-name@#l@all-urls-s@">Set to @button-name@</a></p>
-
+ &nbsp; <a href="eas?f=@f@&amp;v=@v@&amp;s=@all-urls-s@&amp;p=@button-name@#l@all-urls-s@">Set to @button-name@</a>

diff --git a/templates/edit-actions-list-section b/templates/edit-actions-list-section
index 04d88bd..36908ac 100644 (file)
--- a/templates/edit-actions-list-section
+++ b/templates/edit-actions-list-section
@@ -31,6 +31,9 @@
 #
 # Revisions   :
 #    $Log: edit-actions-list-section,v $
+#    Revision 1.12  2002/04/26 12:58:11  oes
+#    Central "button" link style in cgi-style.css
+#
 #    Revision 1.11  2002/04/24 02:14:03  oes
 #    Changed shortcuts, Cosmetics
 #
@@ -81,38 +84,20 @@
 # edit-actions page is ~300k.  Before it was optimized, it was ~550k.
 #
 #############################################################################
-<table border="0" width="100%" cellspacing="0" cellpadding="3" class="framed">
-<tr class="actions" valign="top">
- <td class="header" align="right">Actions:</td>
- <td class="buttons" align="center"><a name="l@s@" href="eafu?f=@f@&amp;v=@v@&amp;s=@s@">Edit</a></td>
- <td class="action" align="left">@actions@</td>
-</tr>
-<tr class="rule">
- <td colspan="3"><img src="t" width="2" height="1" alt="----"></td>
-</tr>
-<tr class="url1" valign="top">
- <td class="header" align="right">URL patterns:</td>
- <td class="buttons" align="center"><a href="eaa?f=@f@&amp;v=@v@&amp;s=@s@">Add</a></td>
- <td align="left">&nbsp;</td>
-</tr>
+<tr><td class="container">
+<table border="0" width="100%" cellspacing="2" cellpadding="3" class="framed">
+<tr class="actions"><td class="header">Actions</td></tr>
+<tr class="actions"><td class="indentbuttons"><a name="l@s@" href="eafu?f=@f@&amp;v=@v@&amp;s=@s@">Edit</a></td></tr>
+<tr class="actions"><td class="action">@actions@</td></tr>
+<tr class="url"><td class="header">URL patterns</td></tr>
+<tr class="url"><td class="indentbuttons"><a href="eaa?f=@f@&amp;v=@v@&amp;s=@s@">Add</a></td></tr>
 @urls@
-<tr class="rule">
- <td colspan="3"><img src="t" width="2" height="1" alt="-"></td>
-</tr>
-<tr class="adv" valign="top">
- <td class="header" align="right"><b>Advanced:</b></td>
- <td class="buttons" colspan="2">
-  <table border="0" cellspacing="0" cellpadding="4">
-   <tr class="buttons" valign="middle" align="center">
-    <td class="nbr"> &nbsp; @if-s-prev-exists-start@<a href="eass?f=@f@&amp;v=@v@&amp;s1=@s-prev@&amp;s2=@s@#l@s-prev@">Move section up</a> &nbsp; @if-s-prev-exists-end@</td>
-    <td class="nbr"> &nbsp; <a href="easa?f=@f@&amp;v=@v@&amp;s=@s@#l@s-next@">Insert new section below</a> &nbsp; </td>
-   </tr>
-   <tr valign="middle" align="center">
-    <td class="nbr"> &nbsp; @if-s-next-exists-start@<a href="eass?f=@f@&amp;v=@v@&amp;s1=@s@&amp;s2=@s-next@#l@s@">Move section down</a> &nbsp; @if-s-next-exists-end@</td>
-    <td class="nbr"> &nbsp; @if-empty-section-start@<a href="easr?f=@f@&amp;v=@v@&amp;s=@s@#l@s@">Delete whole section</a>&nbsp; @if-empty-section-end@</td>
-   </tr>
-  </table>
- </td>
-</tr>
+<tr class="adv"><td class="header">Advanced</td></tr>
+<tr class="adv"><td class="indentbuttons">
+@if-s-prev-exists-start@<a href="eass?f=@f@&amp;v=@v@&amp;s1=@s-prev@&amp;s2=@s@#l@s-prev@">Move section up</a> &nbsp; @if-s-prev-exists-end@
+@if-s-next-exists-start@<a href="eass?f=@f@&amp;v=@v@&amp;s1=@s@&amp;s2=@s-next@#l@s@">Move section down</a> &nbsp; @if-s-next-exists-end@
+<a href="easa?f=@f@&amp;v=@v@&amp;s=@s@#l@s-next@">Insert new section below</a>
+@if-empty-section-start@ &nbsp; <a href="easr?f=@f@&amp;v=@v@&amp;s=@s@#l@s@">Delete whole section</a>@if-empty-section-end@
+</td></tr>
 </table>
-
+</td></tr>

diff --git a/templates/edit-actions-list-url b/templates/edit-actions-list-url
index 89c8433..23fdd29 100644 (file)
--- a/templates/edit-actions-list-url
+++ b/templates/edit-actions-list-url
@@ -31,6 +31,9 @@
 #
 # Revisions   :
 #    $Log: edit-actions-list-url,v $
+#    Revision 1.8  2002/04/26 12:58:11  oes
+#    Central "button" link style in cgi-style.css
+#
 #    Revision 1.7  2002/03/26 22:29:56  swa
 #    we have a new homepage!
 #
@@ -68,9 +71,8 @@
 # edit-actions page is ~300k.  Before it was optimized, it was ~550k.
 #
 #############################################################################
-<tr class="url@url-1-2@" valign="top"><td align="left">&nbsp;</td>
-<td align="center" class="buttons"><a name="l@p@"
+<tr class="url" valign="top">
+<td class="indentbuttons"><a name="l@p@"
 href="ear?f=@f@&amp;v=@v@&amp;p=@p@" onclick="return rm_p(@p@,'@url@');">Remove</a>&nbsp;&nbsp;&nbsp;<a
-href="eau?f=@f@&amp;v=@v@&amp;p=@p@">Edit</a>&nbsp;</td>
-<td class="url" align="left">@url-html@</td>
+href="eau?f=@f@&amp;v=@v@&amp;p=@p@">Edit</a>&nbsp; @url-html@</td>
 </tr>