[Phpgroupware-cvs] ftp/templates/default main.tpl, 1.5 main_twocol.tpl, 1.2 confirm_delete.tpl, 1.4 bad_connection.tpl, 1.2

[skwashd]

Update of ftp/templates/default

Modified Files:
     Branch: MAIN
            main.tpl lines: +39 -55
            main_twocol.tpl lines: +35 -35
            confirm_delete.tpl lines: +1 -1
            bad_connection.tpl lines: +1 -1

Log Message:
merge from 16

====================================================
Index: ftp/templates/default/main.tpl
diff -u ftp/templates/default/main.tpl:1.4 ftp/templates/default/main.tpl:1.5
--- ftp/templates/default/main.tpl:1.4  Sun May 12 00:02:37 2002
+++ ftp/templates/default/main.tpl      Sun May 15 13:34:13 2005
@@ -1,62 +1,46 @@
 <!-- BEGIN main -->
  <center>{misc_data}</center>
-
- <table border="0" width="95%" align="center" cellspacing="0" cellpadding="0">
-  <tr bgcolor="{th_bg}">
-   <td align="left"><b>FTP</b> - {ftp_location}</td>
-   <td align="right">{relogin_link}</td>
-  </tr>
-  <tr>
-   <td colspan="2" align="right">{nextmatchs_left}&nbsp;{nextmatchs_right}</td>
-  </tr>
- </table>
-
-<table border=0 width="95%" align=center>
- <tr>
-  <td>
-
-   <table border=0 cellpadding=1 cellspacing=1 width=95% align=center>
-    <tr bgcolor="{th_bg}">
-     <td>{lang_name}</td>
-     <td width="5%" align="center">{lang_owner}</td>
-     <td width="5%" align="center">{lang_group}</td>
-     <td width="10%" align="center">{lang_permissions}</td>
-     <td width="7%" align="center">{lang_size}</td>
-     <td width="10%" align="center">{lang_delete}</td>
-     <td width="10%" align="center">{lang_rename}</td>
-    </tr>
-
-    {rowlist_dir}
-    {rowlist_file}
-   </table>
-
-  </td>
- </tr>
- <tr width="95%">
-  <td align="center"><font color="{em_text_color}">
-  {ul_form_open}
-  {ul_select}{ul_submit}
-  {ul_form_close}</font>
-  </td>
- </tr>
- <tr width="95%">
-  <td align="center"><font color="{em_text_color}">
-   {crdir_form_open}
-   {crdir_textfield}{crdir_submit}
-   {crdir_form_close}</font>
-  </td>
- </tr>
+<table border="0" width="95%" align="center" cellspacing="0" cellpadding="0">
+       <tr class="th">
+               {nextmatchs_left}
+               <td colspan="3"><b>FTP</b> - {ftp_location}</td>
+               {nextmatchs_right}
+       </tr>
+       <tr class="th">
+               <td>{lang_name}</td>
+               <td width="5%" align="center">{lang_owner}</td>
+               <td width="5%" align="center">{lang_group}</td>
+               <td width="10%" align="center">{lang_permissions}</td>
+               <td width="7%" align="center">{lang_size}</td>
+               <td width="10%" align="center">{lang_delete}</td>
+               <td width="10%" align="center">{lang_rename}</td>
+       </tr>
+       {rowlist_dir}
+       {rowlist_file}
+       <tr class="th">
+               <td colspan="3">
+                       {ul_form_open}
+                       {ul_select}{ul_submit}
+                       {ul_form_close}
+               </td>
+               <td style="text-align: center;">{relogin_link}</td>
+               <td colspan="3" style="text-align: right;">
+                       {crdir_form_open}
+                       {crdir_textfield}{crdir_submit}
+                       {crdir_form_close}
+               </td>
+       </tr>
 </table>
 <!-- END main -->

 <!-- BEGIN row -->
- <tr bgcolor="{bgcolor}">
-  <td>{name}&nbsp;</td>
-  <td width="5%" align="center">{owner}&nbsp;</td>
-  <td width="5%" align="center">{group}&nbsp;</td>
-  <td width="10%" align="center">{permissions}&nbsp;</td>
-  <td width="7%" align="right">{size}&nbsp;</td>
-  <td width="10%" align="center">{del_link}</td>
-  <td width="10%" align="center">{rename_link}</td>
- </tr>
+       <tr class="{bgclass}">
+               <td>{name}&nbsp;</td>
+               <td width="5%" align="center">{owner}&nbsp;</td>
+               <td width="5%" align="center">{group}&nbsp;</td>
+               <td width="10%" align="center">{permissions}&nbsp;</td>
+               <td width="7%" align="right">{size}&nbsp;</td>
+               <td width="10%" align="center">{del_link}</td>
+               <td width="10%" align="center">{rename_link}</td>
+       </tr>
 <!-- END row -->

====================================================
Index: ftp/templates/default/main_twocol.tpl
diff -u ftp/templates/default/main_twocol.tpl:1.1 
ftp/templates/default/main_twocol.tpl:1.2
--- ftp/templates/default/main_twocol.tpl:1.1   Tue Nov  7 21:00:08 2000
+++ ftp/templates/default/main_twocol.tpl       Sun May 15 13:34:13 2005
@@ -1,35 +1,35 @@
-<table border=0 width="95%" align=center>
-   <tr><td>
-      <table border=0 width="95%" align=center>
-         <tr bgcolor="{em_bgcolor}">
-            <td><font 
color="{em_text_color}">{home_link}{ftp_location}</font></td>
-            <td align=right><font 
color="{em_text_color}">{relogin_link}</font></td>
-         </tr>
-      </table>
-   </td></tr>
-   <tr><td>
-         <table><tr><td valign=top>
-      <table border=0 cellpadding=1 cellspacing=1 width=95% align=center>
-         {rowlist_1}
-      </table>
-         </td><td valign=top>
-      <table border=3 cellpadding=1 cellspacing=1 width=95% align=center>
-         {rowlist_2}
-      </table>
-         </td></tr></table>
-   </td></tr>
-   <tr bgcolor="{em_bgcolor}" width="95%">
-      <td align="center" bgcolor="{em_bgcolor}"><font color="{em_text_color}">
-         {ul_form_open}
-         {ul_select}{ul_submit}
-         {ul_form_close}
-      </font></td>
-   </tr>
-   <tr bgcolor="{em_bgcolor}" width="95%">
-      <td align="center"><font color="{em_text_color}">
-         {crdir_form_open}
-         {crdir_textfield}{crdir_submit}
-         {crdir_form_close}
-      </font></td>
-   </tr>
-</table>
+<table border=0 width="95%" align=center>
+   <tr><td>
+      <table border=0 width="95%" align=center>
+         <tr bgcolor="{em_bgcolor}">
+            <td><font 
color="{em_text_color}">{home_link}{ftp_location}</font></td>
+            <td align=right><font 
color="{em_text_color}">{relogin_link}</font></td>
+         </tr>
+      </table>
+   </td></tr>
+   <tr><td>
+         <table><tr><td valign=top>
+      <table border=0 cellpadding=1 cellspacing=1 width=95% align=center>
+         {rowlist_1}
+      </table>
+         </td><td valign=top>
+      <table border=3 cellpadding=1 cellspacing=1 width=95% align=center>
+         {rowlist_2}
+      </table>
+         </td></tr></table>
+   </td></tr>
+   <tr bgcolor="{em_bgcolor}" width="95%">
+      <td align="center" bgcolor="{em_bgcolor}"><font color="{em_text_color}">
+         {ul_form_open}
+         {ul_select}{ul_submit}
+         {ul_form_close}
+      </font></td>
+   </tr>
+   <tr bgcolor="{em_bgcolor}" width="95%">
+      <td align="center"><font color="{em_text_color}">
+         {crdir_form_open}
+         {crdir_textfield}{crdir_submit}
+         {crdir_form_close}
+      </font></td>
+   </tr>
+</table>

====================================================
Index: ftp/templates/default/confirm_delete.tpl
diff -u ftp/templates/default/confirm_delete.tpl:1.3 
ftp/templates/default/confirm_delete.tpl:1.4
--- ftp/templates/default/confirm_delete.tpl:1.3        Sun May 12 00:02:37 2002
+++ ftp/templates/default/confirm_delete.tpl    Sun May 15 13:34:13 2005
@@ -1,7 +1,7 @@
 {delete_form_begin}
 <table align="center" width="40%" cellspacing="0" cellpadding="0">
  <tr bgcolor="{th_bg}">
-  <td><b>{delete_form_question}</b></td>
+  <td><b>
{delete_form_question}</b></td>
  </tr>
  <tr bgcolor="{row_on}">
   <td align="center">{delete_form_confirm} &nbsp; {delete_form_cancel}</td>

====================================================
Index: ftp/templates/default/bad_connection.tpl
diff -u ftp/templates/default/bad_connection.tpl:1.1 
ftp/templates/default/bad_connection.tpl:1.2
--- ftp/templates/default/bad_connection.tpl:1.1        Tue Nov  7 21:00:08 2000
+++ ftp/templates/default/bad_connection.tpl    Sun May 15 13:34:13 2005
@@ -1 +1 @@
-<center><font color="#ff0000" size="+2">{error_message}</font></center>
+<center><font color="#ff0000" size="+2">{error_message}</font></center>