Se realizan correcciones varias derivadas del primer testing.

[mecon/intranet.git] / sistema / local_lib / HTML_Login.php

diff --git a/sistema/local_lib/HTML_Login.php b/sistema/local_lib/HTML_Login.php
index d92a5e507f7f7feee732eba52a7dc68dbf3042c0..03c5cb977361f9e026a2d6aba14e9d3333f6ed2d 100644 (file)
--- a/sistema/local_lib/HTML_Login.php
+++ b/sistema/local_lib/HTML_Login.php
@@ -1,7 +1,7 @@
 <?php
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 // +--------------------------------------------------------------------+
 <?php
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 // +--------------------------------------------------------------------+

-// |                      Ministerio de Economía                        |
+// |                      Ministerio de Econom�                        |

 // |                             Intranet                              |
 // +--------------------------------------------------------------------+
 // | This file is part of Intranet.                                    |
 // |                             Intranet                              |
 // +--------------------------------------------------------------------+
 // | This file is part of Intranet.                                    |


@@ -24,11 +24,11 @@
 // | Autor:  Gonzalo Merayo <gmeray@mecon.gov.ar>                                                    |
 // +--------------------------------------------------------------------+
 //
 // | Autor:  Gonzalo Merayo <gmeray@mecon.gov.ar>                                                    |
 // +--------------------------------------------------------------------+
 //

-// $Id: xmi2code.tpl.php 1 2003-06-23 18:29:20Z gmeray $
+// $Id$

 //
 
 
 //
 
 

-require_once 'HTML/Image.php';
+require_once 'MECON/HTML/Image.php';

 
 // +X2C includes
 require_once 'HTML/Table.php';
 
 // +X2C includes
 require_once 'HTML/Table.php';


@@ -64,7 +64,7 @@ class HTML_Login extends HTML_Table {
      */
     function getCSS() // ~X2C
     {
      */
     function getCSS() // ~X2C
     {

-        return "css/login.css";
+        return "/sistemas/intranet/css/login.css";

     }
     // -X2C
 
     }
     // -X2C
 


@@ -79,20 +79,26 @@ class HTML_Login extends HTML_Table {
                                   'cellPadding' => 0,
                                  'cellSpacing' => 2,
                                  'width'       => '100%'));
                                   'cellPadding' => 0,
                                  'cellSpacing' => 2,
                                  'width'       => '100%'));

-      $img = new HTML_Image('images/login_candados.gif');
+      $img = new MECON_HTML_Image('/sistemas/intranet/images/login_candados.gif');
+      $img2 = new MECON_HTML_Image('/sistemas/intranet/images/login_flechita.gif');

       $int->addRow(array($img->toHTML().'Usuarios',
       $int->addRow(array($img->toHTML().'Usuarios',

-                         $img->toHTML().'Usuario:',
+                         $img2->toHTML().'Usuario@organismo:',

                         '<INPUT maxLength=50 name=usuario size=10>',
                         '<INPUT maxLength=50 name=usuario size=10>',

-                        $img->toHTML().'Contraseña:',
+                        $img2->toHTML().'Contrase&ntilde;a:',

                         '<INPUT maxLength=50 name=password size=10 type=password>'.
                         '<INPUT maxLength=50 name=password size=10 type=password>'.

-                        '<INPUT value="'.$_GET['redirect'].'" name=redirect type=hidden>',
+                        '<INPUT value="'.@$_GET['redirect'].@$_POST['redirect'].'" name=redirect type=hidden>',

                         '<INPUT name = Submit type=submit value=Enviar>'));
       $int->updateColAttributes(0, array('class'   => 'titulo_tabla',
                                          'bgColor' => '#003366'));
       $int->updateColAttributes(1, array('class'   => 'titulo'));
       $int->updateColAttributes(3, array('class'   => 'titulo'));
                         '<INPUT name = Submit type=submit value=Enviar>'));
       $int->updateColAttributes(0, array('class'   => 'titulo_tabla',
                                          'bgColor' => '#003366'));
       $int->updateColAttributes(1, array('class'   => 'titulo'));
       $int->updateColAttributes(3, array('class'   => 'titulo'));

+      if(isset($this->login_incorrecto) && $this->login_incorrecto == true)
+      {
+        $login_incorrecto = new MECON_HTML_Image('/sistemas/intranet/images/login_incorrecto.gif');
+        $login_incorrecto = '<div align=left>'.$login_incorrecto->toHTML().'</div>';
+      }else $login_incorrecto='';

       $this->addRow(array($int));
       $this->addRow(array($int));

-      return '<FORM ACTION = "login.php" METHOD = "POST">'.parent::toHTML().'</FORM>';
+      return $login_incorrecto.'<FORM ACTION = "login" METHOD = "POST">'.parent::toHTML().'</FORM>';

     }
     // -X2C
 
     }
     // -X2C