From 7891f65fb7544f3b1a126f8e0688889d6a6954f3 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Sun, 12 Jan 2020 12:53:59 +0100
Subject: Rev: 4589

---
 mayor-orig/mayor-base/www/skin/default/base/html/base.phtml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'mayor-orig/mayor-base/www/skin/default')

diff --git a/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml b/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml
index 7c226647..19dfa38e 100644
--- a/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml
+++ b/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml
@@ -365,9 +365,11 @@ l53 -52 55 54 55 55 42 -43 43 -42 -55 -55 -54 -55 54 -55 55 -55 -43 -42 -42
     }
 
     function mayorGlobalLogin($loggedIn=false) {
-	global $AUTH;
+	global $AUTH,$page;
 	if (is_array($AUTH['private']['allowOnly'])) $_class='class="restricted"'; else $_class = '';
 
+	if ($page=="auth") return;
+
 	echo '<div id="mayorGlobalLogin" '.$_class.'>';
 	    if ($loggedIn) {
 		if (defined('_MAYORAUTHRESULT') && defined('_AUTH_FAILURE') && intval(_MAYORAUTHRESULT)>=intval(_AUTH_FAILURE)) {
@@ -378,13 +380,13 @@ l53 -52 55 54 55 55 42 -43 43 -42 -55 -55 -54 -55 54 -55 55 -55 -43 -42 -42
 		echo '<table><tr><td style="padding-right:10px;">';
 		formBegin(array('class'=>'check passwordAuth','action'=>$secure_url));
 		echo '<span class="icon-adult '.$_class.'"></span>';
-		echo '<input '.$_focus.' type="text" name="userAccount" autocomplete="off" />';
+		echo '<input '.$_focus.' type="text" name="userAccount" placeholder="felhasználónév" autocomplete="username" id="mayorGlobalLoginUserAccount" />';
 		echo '<br/>';
 		echo '<span class="icon-key '.$_class.'"></span>';
-		echo '<input type="password" name="userPassword" />';
+		echo '<input type="password" name="userPassword" placeholder="jelszó" autocomplete="current-password" id="mayorGlobalLoginPassword" />';
 		echo '<input type="hidden" name="toPolicy" value="private" />';
 		echo '<input type="hidden" name="action" value="mayorGlobalLogin" />';
-		echo '<button type="submit" style="background-color:inherit;border: solid 0px white;padding:0px;"><span class="icon-play-alt"></span></button>';
+		echo '<button type="submit" class="dologin"><span class="icon-play-alt"></span></button>';
 		formEnd();
 		echo '</td><td style="">';
 		if (__GOOGLEAPI_ENABLED===true) {
-- 
cgit v1.2.3