[Phpgroupware-cvs] CVS: bookmarks/templates/default form.tpl,1.8,1.8.4.1 list.body_tree.tpl,1.3,1.3.4.1

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/bookmarks/templates/default
In directory subversions:/tmp/cvs-serv2342/templates/default

Modified Files:
      Tag: Version-0_9_16-branch
        form.tpl list.body_tree.tpl 
Log Message:
syncing as far as possible 0.9.16 and HEAD


Index: form.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/templates/default/form.tpl,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -C2 -r1.8 -r1.8.4.1
*** form.tpl    14 Jul 2001 01:41:50 -0000      1.8
--- form.tpl    25 Mar 2003 22:55:28 -0000      1.8.4.1
***************
*** 2,87 ****
  
  <form method="post" action="{form_action}">
!  <table border=0 bgcolor="#EEEEEE" align="center" width="80%">
!   <tr bgcolor="{th_bg}">
!    <td colspan="2">&nbsp;<b>{lang_header}</b></td>
!   </tr>
! 
!   <tr>
!    <td>
!     {lang_url}&nbsp;
!     {mail_this_link}
!    </td>
!    <td>{input_url}&nbsp;</td>
!   </tr>
!  
!   <tr>
!    <td>{lang_name}</td>
!    <td>{input_name}&nbsp;</td>
!   </tr>
!  
!   <tr>
!    <td>{lang_desc}</td>
!    <td>{input_desc}&nbsp;</td>
!   </tr>
!  
!   <tr>
!    <td>{lang_keywords}</td>
!    <td>{input_keywords}&nbsp;</td>
!   </tr>
!  
!   <tr>
!    <td width="25%">{lang_category}&nbsp; &nbsp;{category_image}</td>
!    <td width="25%">{input_category}</td>
!   </tr>
! 
!   <tr>
!    <td width="25%">{lang_rating}</td>
!    <td width="25%">{input_rating}</td>
!   </tr>
!  
!   <tr>
!    <td>{lang_access}</td>
!    <td>{input_access}</td>
!   </tr>
  
  {info}
   
!   <tr>
!    <td colspan="2" align="right">
!     {delete_button}
!     {edit_button}
!     &nbsp;&nbsp;&nbsp;
!     {cancel_button}
!     {form_link}
!    </td>
!   </tr>
!  </table>
  </form>
  <!-- END body -->
  
  <!-- BEGIN form_info -->
-   <tr>
-    <td>{lang_owner}</td>
-    <td>{owner_value}&nbsp;</td>
-   </tr>
  
!   <tr>
!    <td>{lang_added}</td>
!    <td>{added_value}&nbsp;</td>
!   </tr>
!   
!   <tr>
!    <td>{lang_visited}</td>
!    <td>{visited_value}&nbsp;</td>
!   </tr>
!  
!   <tr>
!    <td>{lang_visits}</td>
!    <td>{total_visits}&nbsp;</td>
!   </tr>
!  
!   <tr>
!    <td>{lang_updated}</td>
!    <td>{updated_value}&nbsp;</td>
!   </tr>
  <!-- END form_info -->
--- 2,76 ----
  
  <form method="post" action="{form_action}">
! <table border="0" bgcolor="#EEEEEE" align="center" width="80%" 
cellpadding="3">
!       <tr bgcolor="{th_bg}">
!               <td colspan="2">&nbsp;<b>{lang_header}</b></td>
!       </tr>
!       <tr>
!               <td>{lang_url}&nbsp;{mail_this_link}</td>
!               <td>{input_url}&nbsp;</td>
!       </tr>
!       <tr>
!               <td>{lang_name}</td>
!               <td>{input_name}&nbsp;</td>
!       </tr>
!       <tr>
!               <td>{lang_desc}</td>
!               <td>{input_desc}&nbsp;</td>
!       </tr>
!       <tr>
!               <td>{lang_keywords}</td>
!               <td>{input_keywords}&nbsp;</td>
!       </tr>
!       <tr>
!               <td width="25%" valign="top">{lang_category}&nbsp; 
&nbsp;{category_image}</td>
!               <td width="25%">{input_category}</td>
!       </tr>
!       <tr>
!               <td width="25%">{lang_rating}</td>
!               <td width="25%">{input_rating}</td>
!       </tr>
!       <tr>
!               <td>{lang_access}</td>
!               <td>{input_access}</td>
!       </tr>
  
  {info}
   
!       <tr>
!               <td colspan="2" align="right">
!                       {delete_button}
!                       {edit_button}
!                       &nbsp;&nbsp;&nbsp;
!                       {cancel_button}
!                       {form_link}
!               </td>
!       </tr>
! </table>
  </form>
+ 
  <!-- END body -->
  
  <!-- BEGIN form_info -->
  
!       <tr>
!               <td>{lang_owner}</td>
!               <td>{owner_value}&nbsp;</td>
!       </tr>
!       <tr>
!               <td>{lang_added}</td>
!               <td>{added_value}&nbsp;</td>
!       </tr>
!       <tr>
!               <td>{lang_visited}</td>
!               <td>{visited_value}&nbsp;</td>
!       </tr>
!       <tr>
!               <td>{lang_visits}</td>
!               <td>{total_visits}&nbsp;</td>
!       </tr>
!       <tr>
!               <td>{lang_updated}</td>
!               <td>{updated_value}&nbsp;</td>
!       </tr>
! 
  <!-- END form_info -->

Index: list.body_tree.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/templates/default/list.body_tree.tpl,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -r1.3 -r1.3.4.1
*** list.body_tree.tpl  14 Jul 2001 01:41:50 -0000      1.3
--- list.body_tree.tpl  25 Mar 2003 22:55:28 -0000      1.3.4.1
***************
*** 1,19 ****
  <!-- $Id$ -->
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
-  <tr bgcolor="{th_bg}">
-   <td align="left">&nbsp;{showing}</td>
- 
-   <td align="right">
-    {next_matchs_left}
-    &nbsp;&nbsp;
-    {next_matchs_right}&nbsp; &nbsp;
-   </td>
-  </tr>
  
!  <tr align="right">
!   <td colspan="2">
!    <form action="{list_mass_select_form}" method="POST">
!     {lang_massupdate}: &nbsp;{massupdate_delete_icon} 
{massupdate_mail_icon}</td>
!  </tr>
  </table>
  <p>
--- 1,17 ----
  <!-- $Id$ -->
  
! <table width="100%" border="0" cellspacing="0" cellpadding="0">
!       <tr bgcolor="{th_bg}">
!               <td align="left">&nbsp;{showing}</td>
!               <td align="right">
!                       {next_matchs_left}&nbsp;&nbsp;
!                       {next_matchs_right}&nbsp;&nbsp;
!               </td>
!       </tr>
!       <tr align="right">
!               <td colspan="2">
!                       <form action="{list_mass_select_form}" method="POST">
!                       
{lang_massupdate}&nbsp;{massupdate_delete_icon}&nbsp;{massupdate_mail_icon}</td>
!       </tr>
  </table>
  <p>