[Phpgroupware-cvs] admin setup/phpgw_en.lang templates/base/config...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    admin
Changes by:     Sigurd Nes <sigurdne>   07/08/23 09:39:14

Modified files:
        setup          : phpgw_en.lang 
        templates/base : config.tpl 

Log message:
        differentiate login logo and "inside" logo

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/setup/phpgw_en.lang?cvsroot=phpgroupware&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/admin/templates/base/config.tpl?cvsroot=phpgroupware&r1=1.11&r2=1.12

Patches:
Index: setup/phpgw_en.lang
===================================================================
RCS file: /sources/phpgroupware/admin/setup/phpgw_en.lang,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- setup/phpgw_en.lang 14 Feb 2006 08:48:21 -0000      1.46
+++ setup/phpgw_en.lang 23 Aug 2007 09:39:14 -0000      1.47
@@ -138,6 +138,7 @@
 enter some random text for app_session <br>encryption (requires mcrypt)        
admin   en      Enter some random text for app_session <br>encryption (requires 
mcrypt)
 enter the background color for the login page  admin   en      Enter the 
background color for the login page
 enter the background color for the site title  admin   en      Enter the 
background color for the site title
+enter the file name of your login logo admin   en      Enter the file name of 
your login logo
 enter the file name of your logo       admin   en      Enter the file name of 
your logo
 enter the full path for temporary files.<br>examples: /tmp, c:\temp    admin   
en      Enter the full path for temporary files.<br>Examples: /tmp, C:\TEMP
 enter the full path for users and group files.<br>examples: /files, e:\files   
admin   en      Enter the full path for users and group files.<br>Examples: 
/files, E:\FILES

Index: templates/base/config.tpl
===================================================================
RCS file: /sources/phpgroupware/admin/templates/base/config.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- templates/base/config.tpl   19 Mar 2007 10:16:28 -0000      1.11
+++ templates/base/config.tpl   23 Aug 2007 09:39:14 -0000      1.12
@@ -129,21 +129,26 @@
    </tr>
 
    <tr class="row_off">
-    <td>{lang_Enter_the_file_name_of_your_logo}:</td>
+    <td>{lang_Enter_the_file_name_of_your_logo_at_login}:</td>
     <td><input name="newsettings[login_logo_file]" 
value="{value_login_logo_file}"></td>
    </tr>
 
    <tr class="row_on">
+    <td>{lang_Enter_the_file_name_of_your_logo}:</td>
+    <td><input name="newsettings[logo_file]" value="{value_logo_file}"></td>
+   </tr>
+
+   <tr class="row_off">
     <td>{lang_Enter_the_url_where_your_logo_should_link_to}:</td>
     <td>http://<input name="newsettings[login_logo_url]" 
value="{value_login_logo_url}"></td>
    </tr>
 
-   <tr class="row_off">
+   <tr class="row_on">
     <td>{lang_Enter_the_title_of_your_logo}:</td>
     <td><input name="newsettings[login_logo_title]" 
value="{value_login_logo_title}"></td>
    </tr>
 
-   <tr class="row_on">
+   <tr class="row_off">
     <td>{lang_Show_'powered_by'_logo_on}:</td>
     <td>
      <select name="newsettings[showpoweredbyon]">
@@ -153,7 +158,7 @@
     </td>
    </tr>
 
-   <tr class="row_off">
+   <tr class="row_on">
     <td>{lang_enable_fckeditor_wysiwyg_html_editor}:</td><td>
      <select name="newsettings[enable_fckeditor]">
       <option value="">{lang_No}</option>
@@ -162,7 +167,7 @@
     </td>
    </tr>
 
-   <tr class="row_on">
+   <tr class="row_off">
     <td>{lang_enable_tinymce_wysiwyg_html_editor}:</td><td>
      <select name="newsettings[enable_tinymce]">
       <option value="">{lang_No}</option>