[Phpgroupware-cvs] CVS: bookmarks/templates/default import.body.tpl,1.6,1.7 maillink.body.tpl,1.6,1.7 search.results.tpl,1.5,1.6

[Michael Totschnig <address@hidden>]

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

Modified Files:
        import.body.tpl maillink.body.tpl search.results.tpl 
Log Message:
syncing 0.9.16 and HEAD


Index: import.body.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/templates/default/import.body.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** import.body.tpl     14 Jul 2001 01:41:50 -0000      1.6
--- import.body.tpl     25 Mar 2003 23:02:22 -0000      1.7
***************
*** 4,23 ****
   <table border=0 bgcolor="#EEEEEE" align="center" width=60%>
   <tr>
!   <td colspan=2>Enter the name of the Netscape bookmark file
!    <br>that you want imported into bookmarker below.
     <br>&nbsp;
    </td>
   </tr>
   <tr>
!   <td align=left>Netscape Bookmark File</td>
    <td align=left><input type="file" name="bkfile"></td>
   </tr>
   <tr>
    <td colspan=2 align=right>
!    <input type="submit" name="import" value="Import Bookmarks">
    </td>
   </tr>
   <tr>
!   <td colspan="2" align="left"><b>Note:</b> This currently works with 
netscape bookmarks only</td>
   </tr>
  <!--  I commented this out, becuase if I can provide the format, I will.  
Even if it means we convert
--- 4,22 ----
   <table border=0 bgcolor="#EEEEEE" align="center" width=60%>
   <tr>
!   <td colspan=2>{lang_name}
     <br>&nbsp;
    </td>
   </tr>
   <tr>
!   <td align=left>{lang_file}</td>
    <td align=left><input type="file" name="bkfile"></td>
   </tr>
   <tr>
    <td colspan=2 align=right>
!    <input type="submit" name="import" value="{lang_import_button}">
    </td>
   </tr>
   <tr>
!   <td colspan="2" align="left">{lang_note}</td>
   </tr>
  <!--  I commented this out, becuase if I can provide the format, I will.  
Even if it means we convert

Index: maillink.body.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/templates/default/maillink.body.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** maillink.body.tpl   14 Jul 2001 01:41:50 -0000      1.6
--- maillink.body.tpl   25 Mar 2003 23:02:22 -0000      1.7
***************
*** 12,16 ****
    <tr>
     <td>{lang_to} <!-- To E-Mail Addresses --></td>
!    <td><input type="text" name="to" size="60" maxlength="255" 
value="{to}"><br><small>(comma separate multiple addresses)</small></td>
    </tr>
  
--- 12,16 ----
    <tr>
     <td>{lang_to} <!-- To E-Mail Addresses --></td>
!    <td><input type="text" name="to" size="60" maxlength="255" 
value="{to}"><br><small>{lang_multiple_addr}</small></td>
    </tr>
  

Index: search.results.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/templates/default/search.results.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** search.results.tpl  14 Jul 2001 01:41:50 -0000      1.5
--- search.results.tpl  25 Mar 2003 23:02:22 -0000      1.6
***************
*** 12,16 ****
  
  <hr>
! <small>Query Condition = {QUERY_CONDITION}
  &nbsp;&nbsp;&nbsp;
  <!-- <a href="javascript:pop_tree_search()">Open Results in Tree View</a> -->
--- 12,16 ----
  
  <hr>
! <small>{LANG_QUERY_CONDITION} = {QUERY_CONDITION}
  &nbsp;&nbsp;&nbsp;
  <!-- <a href="javascript:pop_tree_search()">Open Results in Tree View</a> -->