Changeset 25 for trunk/phpgwapi

Timestamp:

05/10/07 17:16:06 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/phpgwapi/templates/celepar

Files:

• login.tpl (modified) (2 diffs)
• navbar.inc.php (modified) (1 diff)
• navbar.tpl (modified) (1 diff)

trunk/phpgwapi/templates/celepar/login.tpl

@@ -12 +12 @@
 <script language="Javascript">
 <!--
-        function submitIt(event){
-                /*if(event.keyCode == 13)
-                        document.login.submit();*/              
-        }
 
         function setLogin(){
-                if( document.login.organization != null)
-                        document.login.login.value = document.login.organization.value+'-'+document.login.user.value;
+                if( document.form_login.organization != null)
+                        document.form_login.login.value = document.form_login.organization.value+'-'+document.form_login.user.value;
                 else
-                        document.login.login.value = document.login.user.value;                 
+                        document.form_login.login.value = document.form_login.user.value;                       
         }
         
         function getLogin(){
                 var cookie = '{cookie}';
-                if( document.login.organization != null)
-                        document.login.user.value= cookie.substring(cookie.indexOf('-')+1,cookie.length);
+                if( document.form_login.organization != null)
+                        document.form_login.user.value= cookie.substring(cookie.indexOf('-')+1,cookie.length);
                 else    
-                        document.login.user.value= cookie;
+                        document.form_login.user.value= cookie;
 
-                if(document.login.user.value == '') {
-                        if(document.login.organization != null)
-                                document.login.organization.focus();
+                if(document.form_login.user.value == '') {
+                        if(document.form_login.organization != null)
+                                document.form_login.organization.focus();
                         else
-                                document.login.user.focus();
+                                document.form_login.user.focus();
                 }
                 else
-                        document.login.passwd.focus();
+                        document.form_login.passwd.focus();
         }
         
@@ -59 +55 @@
     <td bgcolor="#e8eef7"  height="100%">
     <table cellpadding="0" height="100%" cellspacing="0" width="100%" border="0"><tr><td width="60%">&nbsp;</td><td>
-        <div align="center" class="msgInicial">{cd}<br>{lang_message}<br>{website_title} - 01<br><br></div>
+        <div align="center" class="msgInicial">{cd}<br>{lang_message}<br>{website_title}{frontend_name}<br><br></div>
         <table border="0" bordercolor="#cfcfcf" cellpadding="0" cellspacing="0" width="300">
           <tbody><tr>
-                                <FORM name="login" method="post" action="{login_url}" {autocomplete}>
+                                <FORM name="form_login" method="post" action="{login_url}" {autocomplete}>
                                 <input type="hidden" name="passwd_type" value="text">
-                                <input type="hidden" name="login"><tr><td width="60%">&nbsp;</td><td>
-                                <input type="hidden" name="account type" value="u">          
+                                <input type="hidden" name="account type" value="u">
+                                <input type="hidden" name="login">
+                                <tr><td width="60%">&nbsp;</td><td>                                       
                 <td bgcolor="#f7f7f7" style="border:1px solid black">
-                                        <table  border="0" cellpadding="0" cellspacing="0" class="tableLogin">
-                                                <tr><td height="2px">&nbsp;</td></tr>
+                                        <table border="0" cellpadding="0" cellspacing="0" class="tableLogin">
+                                                <tr><td width="96" colspan="3">&nbsp;</td></tr>                                                                                         
                                                 {select_organization}
-                                          <tr>
-                                                <td width="96" class="loginLabel">{lang_username}:&nbsp;</td>
-                                                <td width="105"><input name="user" size="15"></td>
-                                                <td>{select_domain}</td>
-                                                <td width="43" rowspan="3"><img src="phpgwapi/templates/celepar/images/icon_login.gif" width="43" height="64"></td>
+                                            <tr><td width="96" class="loginLabel" align="right">{lang_username}:&nbsp;</td>
+                                                <td width="96"><input name="user" size="15"></td>
+                                                <td width="43" rowspan="3" colspan=2><img src="phpgwapi/templates/celepar/images/icon_login.gif" width="43" height="64"></td>
                                           </tr>
                                           <tr>
-                                                <td width="66" class="loginLabel">{lang_password}:&nbsp;</td>
-                                                <td width="135"><input name="passwd" type="password" size="15" onKeyDown="javascript:submitIt(event)"></td>
-                                                <td>&nbsp;</td>         
+                                                <td width="96" class="loginLabel"  align="right">{lang_password}:&nbsp;</td>
+                                                <td width="135"><input name="passwd" type="password" size="15"></td>
+
                                           </tr>
                                           <tr>

trunk/phpgwapi/templates/celepar/navbar.inc.php

@@ -225 +225 @@
                         . lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
                         . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                        
+                        if($GLOBALS['phpgw_info']['server']['use_frontend_name'])
+                                $var['frontend_name'] = " - ".$GLOBALS['phpgw_info']['server']['use_frontend_name'];
 
                         if($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)

trunk/phpgwapi/templates/celepar/navbar.tpl

@@ -70 +70 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
  <tr>
-  <td width="30%" align="left" id="user_info" nowrap>{user_info} - 01</td>
+  <td width="30%" align="left" id="user_info" nowrap>{user_info}{frontend_name}</td>
   <td width="30%" id="admin_info" nowrap>{current_users}</td>
   <td style="padding-right:10px" width="*" align="right" valign="center" nowrap="true">