Changeset 17

Timestamp:

04/24/07 17:31:13 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

File:

• trunk/phpgwapi/templates/celepar/login.tpl (modified) (2 diffs)

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;
+                else
+                        document.login.login.value = document.login.user.value;                 
+        }
+        
         function getLogin(){
                 var cookie = '{cookie}';
-                document.form_login.login.value = cookie;
+                if( document.login.organization != null)
+                        document.login.user.value= cookie.substring(cookie.indexOf('-')+1,cookie.length);
+                else    
+                        document.login.user.value= cookie;
 
-                if(document.form_login.login.value == '') {
-                        document.form_login.login.focus();
+                if(document.login.user.value == '') {
+                        if(document.login.organization != null)
+                                document.login.organization.focus();
+                        else
+                                document.login.user.focus();
                 }
                 else
-                        document.form_login.passwd.focus();
+                        document.login.passwd.focus();
         }
         
@@ -45 +62 @@
         <table border="0" bordercolor="#cfcfcf" cellpadding="0" cellspacing="0" width="300">
           <tbody><tr>
-                                <FORM name="form_login" method="post" action="{login_url}" {autocomplete}>
+                                <FORM name="login" method="post" action="{login_url}" {autocomplete}>
                                 <input type="hidden" name="passwd_type" value="text">
-                                <input type="hidden" name="account type" value="u">
-                                <tr><td width="60%">&nbsp;</td><td>                                       
+                                <input type="hidden" name="login"><tr><td width="60%">&nbsp;</td><td>
+                                <input type="hidden" name="account type" value="u">          
                 <td bgcolor="#f7f7f7" style="border:1px solid black">
-                                        <table border="0" cellpadding="0" cellspacing="0" class="tableLogin">
-                                                <tr><td width="96" colspan="3">&nbsp;</td></tr>                                                                                         
-                                                <tr><td width="96" class="loginLabel" align="right">Organização:&nbsp;</td>
-                                                <td align="left" style="font-weight:bold" class="loginLabel" colspan=2><a style="font-weight:normal;font-decoration:none;text-decoration:none" href="javascript:void(0)" onclick="alert('Não é preciso mais selecionar a Organização.\r\n Digite apenas o usuário e a senha!')" onmouseover="this.style.cursor='help'"> automático</a></td>
-                                            <tr><td width="96" class="loginLabel" align="right">{lang_username}:&nbsp;</td>
-                                                <td width="96"><input name="login" size="15"></td>
-                                                <td width="43" rowspan="3" colspan=2><img src="phpgwapi/templates/celepar/images/icon_login.gif" width="43" height="64"></td>
+                                        <table  border="0" cellpadding="0" cellspacing="0" class="tableLogin">
+                                                <tr><td height="2px">&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>
                                           <tr>
-                                                <td width="96" class="loginLabel"  align="right">{lang_password}:&nbsp;</td>
-                                                <td width="135"><input name="passwd" type="password" size="15"></td>
-
+                                                <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>         
                                           </tr>
                                           <tr>
                                                 <td width="66">&nbsp;</td>
                                                 <td width="135">
-                                                  <input type="submit" value="{lang_login}" name="submitit" class=button>
+                                                  <input type="submit" value="{lang_login}" name="submitit" class=button onClick="javascript:setLogin()">
                                                 </td>
                                                 </tr>