From 702bc2cfcf29e6400b47f39e69bbd2aaec539cf9 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Thu, 25 Oct 2012 15:05:50 +0000
Subject: [PATCH] 

---
 classesjs/dicionario.js           |  2 +-
 ferramentas/loginusuario/index.js | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/classesjs/dicionario.js b/classesjs/dicionario.js
index 07b7049..856d59f 100644
--- a/classesjs/dicionario.js
+++ b/classesjs/dicionario.js
@@ -1754,7 +1754,7 @@ it:""
 }],
 "x32":[
 {
-pt:"Enviar senha",
+pt:"Recuperar senha",
 en:"Send password",
 es:"Enviar la contraseņa",
 it:""
diff --git a/ferramentas/loginusuario/index.js b/ferramentas/loginusuario/index.js
index b1f6c19..fda7397 100644
--- a/ferramentas/loginusuario/index.js
+++ b/ferramentas/loginusuario/index.js
@@ -101,19 +101,26 @@ i3GEOF.loginusuario = {
 	String com o c&oacute;digo html
 	*/
 	html:function(){
-		var u = i3GEO.util.pegaCookie("i3geousuarionome")+" - "+i3GEO.util.pegaCookie("i3geousuariologin"),
+		var usuario = i3GEO.util.pegaCookie("i3geousuariologin"),
+			u = "",
 			ins = "";
-		if(!i3GEO.util.pegaCookie("i3geousuariologin") || !i3GEO.util.pegaCookie("i3GeoLogin") || i3GEO.util.pegaCookie("i3geousuariologin") == "" || i3GEO.util.pegaCookie("i3GeoLogin") == ""){
+		if(!usuario || !i3GEO.util.pegaCookie("i3GeoLogin") || i3GEO.util.pegaCookie("i3geousuariologin") == "" || i3GEO.util.pegaCookie("i3GeoLogin") == ""){
 			u = "-";
 		}
+		else{
+			u = usuario+" - "+i3GEO.util.pegaCookie("i3geousuariologin");
+		}
+		if(!usuario || usuario == "null"){
+			usuario = "";
+		}
 		ins = '<p class="paragrafo" >'+$trad("x30")+': <b><i>'+u+"</i></b>" +
 		'<p class="paragrafo" >'+$trad("x27")+':<br>' +
-		'<input id=i3geousuario type=text style="width:250px;" value="'+i3GEO.util.pegaCookie("i3geousuariologin")+'"/>' +
+		'<input id=i3geousuario type=text style="width:250px;" value="'+usuario+'"/>' +
 		'<p class="paragrafo" >'+$trad("x28")+':<br>' +
 		'<input id=i3geosenha type=password style="width:250px;" value=""/><br>' +
 		'<p class="paragrafo" ><input id=i3GEOFloginusuario size=20  type=button value="'+$trad("x29")+'" />&nbsp;<input id=i3GEOFlogoutusuario size=20  type=button value="Logout" />' +
 		'<p class="paragrafo" onclick="i3GEOF.loginusuario.recuperarSenha()" style="cursor:pointer;color:blue;">'+$trad("x32")+'</p>' +
-		'<p class="paragrafo" onclick="i3GEOF.loginusuario.alterarSenha()" style="cursor:pointer;color:blue;">'+$trad("x52")+'</p><br>';
+		'<p class="paragrafo" onclick="i3GEOF.loginusuario.alterarSenha()" style="cursor:pointer;color:blue;">'+$trad("x52")+'</p><br><br><br>';
 		return ins;
 	},
 	/*
@@ -131,7 +138,7 @@ i3GEOF.loginusuario = {
 		titulo = "Login &nbsp;&nbsp;&nbsp;";
 		janela = i3GEO.janela.cria(
 			"260px",
-			"210px",
+			"220px",
 			"",
 			"",
 			"",
--
libgit2 0.21.2