Commit 702bc2cfcf29e6400b47f39e69bbd2aaec539cf9
1 parent
28fc52ff
Exists in
master
and in
7 other branches
--no commit message
Showing
2 changed files
with
13 additions
and
6 deletions
Show diff stats
classesjs/dicionario.js
@@ -1754,7 +1754,7 @@ it:"" | @@ -1754,7 +1754,7 @@ it:"" | ||
1754 | }], | 1754 | }], |
1755 | "x32":[ | 1755 | "x32":[ |
1756 | { | 1756 | { |
1757 | -pt:"Enviar senha", | 1757 | +pt:"Recuperar senha", |
1758 | en:"Send password", | 1758 | en:"Send password", |
1759 | es:"Enviar la contraseña", | 1759 | es:"Enviar la contraseña", |
1760 | it:"" | 1760 | it:"" |
ferramentas/loginusuario/index.js
@@ -101,19 +101,26 @@ i3GEOF.loginusuario = { | @@ -101,19 +101,26 @@ i3GEOF.loginusuario = { | ||
101 | String com o código html | 101 | String com o código html |
102 | */ | 102 | */ |
103 | html:function(){ | 103 | html:function(){ |
104 | - var u = i3GEO.util.pegaCookie("i3geousuarionome")+" - "+i3GEO.util.pegaCookie("i3geousuariologin"), | 104 | + var usuario = i3GEO.util.pegaCookie("i3geousuariologin"), |
105 | + u = "", | ||
105 | ins = ""; | 106 | ins = ""; |
106 | - if(!i3GEO.util.pegaCookie("i3geousuariologin") || !i3GEO.util.pegaCookie("i3GeoLogin") || i3GEO.util.pegaCookie("i3geousuariologin") == "" || i3GEO.util.pegaCookie("i3GeoLogin") == ""){ | 107 | + if(!usuario || !i3GEO.util.pegaCookie("i3GeoLogin") || i3GEO.util.pegaCookie("i3geousuariologin") == "" || i3GEO.util.pegaCookie("i3GeoLogin") == ""){ |
107 | u = "-"; | 108 | u = "-"; |
108 | } | 109 | } |
110 | + else{ | ||
111 | + u = usuario+" - "+i3GEO.util.pegaCookie("i3geousuariologin"); | ||
112 | + } | ||
113 | + if(!usuario || usuario == "null"){ | ||
114 | + usuario = ""; | ||
115 | + } | ||
109 | ins = '<p class="paragrafo" >'+$trad("x30")+': <b><i>'+u+"</i></b>" + | 116 | ins = '<p class="paragrafo" >'+$trad("x30")+': <b><i>'+u+"</i></b>" + |
110 | '<p class="paragrafo" >'+$trad("x27")+':<br>' + | 117 | '<p class="paragrafo" >'+$trad("x27")+':<br>' + |
111 | - '<input id=i3geousuario type=text style="width:250px;" value="'+i3GEO.util.pegaCookie("i3geousuariologin")+'"/>' + | 118 | + '<input id=i3geousuario type=text style="width:250px;" value="'+usuario+'"/>' + |
112 | '<p class="paragrafo" >'+$trad("x28")+':<br>' + | 119 | '<p class="paragrafo" >'+$trad("x28")+':<br>' + |
113 | '<input id=i3geosenha type=password style="width:250px;" value=""/><br>' + | 120 | '<input id=i3geosenha type=password style="width:250px;" value=""/><br>' + |
114 | '<p class="paragrafo" ><input id=i3GEOFloginusuario size=20 type=button value="'+$trad("x29")+'" /> <input id=i3GEOFlogoutusuario size=20 type=button value="Logout" />' + | 121 | '<p class="paragrafo" ><input id=i3GEOFloginusuario size=20 type=button value="'+$trad("x29")+'" /> <input id=i3GEOFlogoutusuario size=20 type=button value="Logout" />' + |
115 | '<p class="paragrafo" onclick="i3GEOF.loginusuario.recuperarSenha()" style="cursor:pointer;color:blue;">'+$trad("x32")+'</p>' + | 122 | '<p class="paragrafo" onclick="i3GEOF.loginusuario.recuperarSenha()" style="cursor:pointer;color:blue;">'+$trad("x32")+'</p>' + |
116 | - '<p class="paragrafo" onclick="i3GEOF.loginusuario.alterarSenha()" style="cursor:pointer;color:blue;">'+$trad("x52")+'</p><br>'; | 123 | + '<p class="paragrafo" onclick="i3GEOF.loginusuario.alterarSenha()" style="cursor:pointer;color:blue;">'+$trad("x52")+'</p><br><br><br>'; |
117 | return ins; | 124 | return ins; |
118 | }, | 125 | }, |
119 | /* | 126 | /* |
@@ -131,7 +138,7 @@ i3GEOF.loginusuario = { | @@ -131,7 +138,7 @@ i3GEOF.loginusuario = { | ||
131 | titulo = "Login "; | 138 | titulo = "Login "; |
132 | janela = i3GEO.janela.cria( | 139 | janela = i3GEO.janela.cria( |
133 | "260px", | 140 | "260px", |
134 | - "210px", | 141 | + "220px", |
135 | "", | 142 | "", |
136 | "", | 143 | "", |
137 | "", | 144 | "", |