on 1/31/03 6:37 PM, Sam Varshavchik <[EMAIL PROTECTED]> wrote:

> I'd like to see a sample patch for a sample html template, diffed against
> the current release

[snip]

> Fix one file.  Let me kick the tires.  If it looks good, send me a patch for
> two or three more HTML templates.  And if that looks good too, then do the
> rest.

Ok, here are four more files "fixed".  Combined with folders.html from last
time, this takes care of the most commonly used functionality.  The files
changed this time are:

    login.html
    newmsg.html
    preferences.html
    folder.html

The diff -U3 output for these files is attached, as 4 correspondingly named
.txt files.

So now that I have done this, should I have combined the 4 diffs into a
single file?  Would that have been easier to use with patch?  (I read up on
diff and patch, but it is still a little bit theoretical to me.)

-Kurt Bigler


--- en-us-orig/login.html       Mon Feb  3 21:45:33 2003
+++ en-us/login.html    Tue Feb 11 00:19:04 2003
@@ -36,7 +36,7 @@
         alt="" border=0@@#]</td>
     </tr>
     <tr style="background-color: #cccccc">
-      <td>&nbsp;</td>
+      <td></td>
       <!-- This is where you put all the content for the login -->
       <td><!-- Insert Logo for site branding -->
         [#@logo.gif, width="263" height="35" alt="SqWebMail Copyright
@@ -79,12 +79,12 @@
         </form>
       </td>
       <!-- This is the end of the content for the login -->
-      <td>&nbsp;</td>
+      <td></td>
     </tr>
     <tr style="line-height: 0">
       <td align="left" valign="bottom">[#@graybottomleft.gif, width=11
         height=11 alt="" border="0"@@#]</td>
-      <td style="background-color: #cccccc">&nbsp;</td>
+      <td style="background-color: #cccccc"></td>
       <td align="right" valign="bottom">[#@graybottomright.gif, width="11"
         height=11 alt="" border=0@@#]</td>
     </tr>
--- en-us-orig/newmsg.html      Mon Feb  3 21:45:33 2003
+++ en-us/newmsg.html   Tue Feb 11 00:30:27 2003
@@ -73,7 +73,7 @@
       <td align="left" valign="top"
         style="line-height: 0">[#@graytopleft.gif, width="11" height="11"
         alt="" border="0"@@#]</td>
-      <td bgcolor="#cccccc">&nbsp;</td>
+      <td bgcolor="#cccccc"></td>
       <td align="right" valign="top"
         style="line-height: 0">[#@graytopright.gif, width="11" height="11"
         alt="" border="0"@@#]</td>
@@ -96,7 +96,7 @@
     <tr style="line-height: 0">
       <td align="left" valign="bottom">[#@graybottomleft.gif, width="11"
         height="11" alt="" border="0"@@#]</td>
-      <td bgcolor="#cccccc">&nbsp;</td>
+      <td bgcolor="#cccccc"></td>
       <td align="right" valign="bottom">[#@graybottomright.gif, width="11"
         height="11" alt="" border="0"@@#]</td>
     </tr>
@@ -111,13 +111,14 @@
     <tr style="line-height: 0">
       <td align="left" valign="top">[#@bluetopleft.gif, width="11"
         height="11" alt="" border="0"@@#]</td>
-      <td bgcolor="#99ccff" valign="middle" width="100%">&nbsp;</td>
+      <td bgcolor="#99ccff" valign="middle" width="100%"></td>
       <td style="line-height: 0" align="right"
         valign="top">[#@bluetopright.gif, width="11" height="11" alt=""
         border="0"@@#]</td>
     </tr>
     <tr>
-      <td bgcolor="#99ccff" valign="middle" width="100%" colspan="3">
+      <td bgcolor="#99ccff"></td>
+      <td bgcolor="#99ccff" valign="middle" width="100%">
         <table width="100%" border="0">
           <tbody>
             <tr>
@@ -129,11 +130,12 @@
           </tbody>
         </table>
       </td>
+      <td bgcolor="#99ccff"></td>
     </tr>
     <tr style="line-height: 0">
       <td align="left" valign="bottom">[#@bluebottomleft.gif, width="11"
         height="11" alt="" border="0"@@#]</td>
-      <td bgcolor="#99ccff" valign="middle">&nbsp;</td>
+      <td bgcolor="#99ccff" valign="middle"></td>
       <td align="right" valign="bottom">[#@bluebottomright.gif, width="11"
         height="11" alt="" border="0"@@#]</td>
     </tr>
--- en-us-orig/preferences.html Mon Feb  3 21:45:33 2003
+++ en-us/preferences.html      Tue Feb 11 00:35:41 2003
@@ -28,7 +28,7 @@
       <td align="left" valign="top"
         style="line-height: 0">[#@graytopleft.gif, width="11" height="11"
         alt="" border="0"@@#]</td>
-      <td bgcolor="#cccccc">&nbsp;</td>
+      <td bgcolor="#cccccc"></td>
       <td align="right" valign="top"
         style="line-height: 0">[#@graytopright.gif, width="11" height="11"
         alt="" border="0"@@#]</td>
@@ -51,7 +51,7 @@
     <tr style="line-height: 0">
       <td align="left" valign="bottom">[#@graybottomleft.gif, width="11"
         height="11" alt="" border="0"@@#]</td>
-      <td bgcolor="#cccccc">&nbsp;</td>
+      <td bgcolor="#cccccc"></td>
       <td align="right" valign="bottom">[#@graybottomright.gif, width="11"
         height="11" alt="" border="0"@@#]</td>
     </tr>
@@ -66,13 +66,14 @@
     <tr style="line-height: 0">
       <td align="left" valign="top">[#@bluetopleft.gif, width="11"
         height="11" alt="" border="0"@@#]</td>
-      <td bgcolor="#99ccff" valign="middle" width="100%">&nbsp;</td>
+      <td bgcolor="#99ccff" valign="middle" width="100%"></td>
       <td style="line-height: 0" align="right"
         valign="top">[#@bluetopright.gif, width="11" height="11" alt=""
         border="0"@@#]</td>
     </tr>
     <tr>
-      <td bgcolor="#99ccff" colspan="3" valign="middle" width="100%"><!-- here -->
+      <td bgcolor="#99ccff"></td>
+      <td bgcolor="#99ccff" valign="middle" width="100%"><!-- here -->
 
         <form method="post" name="preferences" action="[#R#]">
           [#P#]<input type="hidden" name="form" value="preferences">[#x#]
@@ -277,11 +278,12 @@
           </table>
         </form>
       </td>
+      <td bgcolor="#99ccff"></td>
     </tr>
     <tr style="line-height: 0">
       <td align="left" valign="bottom">[#@bluebottomleft.gif, width="11"
         height="11" alt="" border="0"@@#]</td>
-      <td bgcolor="#99ccff" valign="middle">&nbsp;</td>
+      <td bgcolor="#99ccff" valign="middle"></td>
       <td align="right" valign="bottom">[#@bluebottomright.gif, width="11"
         height="11" alt="" border="0"@@#]</td>
     </tr>
--- en-us-orig/folder.html      Mon Feb  3 21:45:33 2003
+++ en-us/folder.html   Tue Feb 11 00:28:19 2003
@@ -46,7 +46,7 @@
       <td align="left" valign="top"
         style="line-height: 0">[#@graytopleft.gif, width="11" height="11"
         alt="" border="0"@@#]</td>
-      <td bgcolor="#cccccc">&nbsp;</td>
+      <td bgcolor="#cccccc"></td>
       <td align="right" valign="top"
         style="line-height: 0">[#@graytopright.gif, width="11" height="11"
         alt="" border="0"@@#]</td>
@@ -69,7 +69,7 @@
     <tr style="line-height: 0">
       <td align="left" valign="bottom">[#@graybottomleft.gif, width="11"
         height="11" alt="" border="0"@@#]</td>
-      <td bgcolor="#cccccc">&nbsp;</td>
+      <td bgcolor="#cccccc"></td>
       <td align="right" valign="bottom">[#@graybottomright.gif, width="11"
         height="11" alt="" border="0"@@#]</td>
     </tr>
@@ -112,13 +112,14 @@
                         <td align="left" valign="top">[#@bluetopleft.gif,
                           width="11" height="11" alt="" border="0"@@#]</td>
                         <td bgcolor="#99ccff" valign="middle"
-                          width="100%">&nbsp;</td>
+                          width="100%"></td>
                         <td style="line-height: 0" align="right"
                           valign="top">[#@bluetopright.gif, width="11"
                           height="11" alt="" border="0"@@#]</td>
                       </tr>
                       <tr>
-                        <td bgcolor="#99ccff" colspan="3" valign="middle"
+                        <td bgcolor="#99ccff"></td>
+                        <td bgcolor="#99ccff" valign="middle"
                         width="100%">
                           <table border="0" width="100%">
                             <tbody>
@@ -129,12 +130,13 @@
                             </tbody>
                           </table>
                         </td>
+                        <td bgcolor="#99ccff"></td>
                       </tr>
                       <tr style="line-height: 0">
                         <td align="left"
                           valign="bottom">[#@bluebottomleft.gif, width="11"
                           height="11" alt="" border="0"@@#]</td>
-                        <td bgcolor="#99ccff" valign="middle">&nbsp;</td>
+                        <td bgcolor="#99ccff" valign="middle"></td>
                         <td align="right"
                           valign="bottom">[#@bluebottomright.gif, width="11"
                           height="11" alt="" border="0"@@#]</td>

Reply via email to