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-base/www/skin/classic/base/css/base.css | 25 +++++++++++++++++++--- .../www/skin/classic/base/html/base.phtml | 2 +- .../classic/base/javascript/base.jquery.min.js | 9 ++++++++ .../module-password/html/changeMyPassword.phtml | 8 +++---- .../module-password/html/changePassword.phtml | 6 +++--- .../www/skin/default/base/html/base.phtml | 10 +++++---- 6 files changed, 45 insertions(+), 15 deletions(-) (limited to 'mayor-orig/mayor-base/www/skin') diff --git a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css index e2d5559b..54b53fb8 100644 --- a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css +++ b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css @@ -121,7 +121,7 @@ #nav li.active { background: #3facc7; } #nav li a { display: block; padding: 3px 10px; color: white; } - #nav > li > a { padding: 0px 20px; line-height: 60px; vertical-align: middle; display: table-cell; min-width: 70px; + #nav > li > a { padding: 0px 20px; line-height: 60px; vertical-align: middle; display: table-cell; min-width: 40px; -webkit-transition: all 0.1s ease; transition: all 0.1s ease; } @@ -365,6 +365,18 @@ #mayorGlobalLogin form input {margin:2px;} #mayorGlobalLogin table { height:60px;} + + #mayorGlobalLogin form button.dologin { + background-color:inherit; + border: solid 0px white;padding:0px; + height:13px; + font-size:13px; + } + #mayorGlobalLogin form button.dologin:hover span { color: lightgreen; } + #mayorGlobalLogin form button.dologin.hint span { color: orange; + -webkit-animation:colorchange 1s infinite alternate; + } + #mayorGlobalLogin form button.api { background-color: inherit; border: solid 0px #fff; @@ -400,7 +412,8 @@ border-top: solid 4px lightblue; padding:0px; height:20px; width:100%; background-color:rgba(250,250,250,0.9); position:fixed; - top:60px;left:0px; z-index:3 + top:60px; + left:0px; z-index:2 } #mayorErrorSmall.mayorErrorSmallError { @@ -410,7 +423,8 @@ border-top: solid 4px orange; padding:0px; height:20px; width:100%; background-color:rgba(250,250,250,0.9); position:fixed; - top:60px;left:0px; z-index:3 + top:60px; + left:0px; z-index:2 } @@ -768,5 +782,10 @@ border: solid 0px #eee; 100%{background-position:0% 50%} } +@-webkit-keyframes colorchange { + 0% { color: lightgreen; } + 50% { color: orange; } + 100% { color: white; } +} diff --git a/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml b/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml index cb843d14..5e75c5c2 100644 --- a/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml +++ b/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml @@ -317,7 +317,7 @@ function html_mayor_head($sessionID,$page,$sub,$f,$lang,$MENU,$skin = _DEFAULT_S echo '
'; //echo $down_svg.' '._LOGIN.''; - echo ''; + echo ''; echo _LOGIN; echo ''; echo $loginout_img; diff --git a/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js b/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js index 54cc16da..f4b27b06 100644 --- a/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js +++ b/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js @@ -173,6 +173,15 @@ $(document).ready(function() { }); $('#logo').on('dragstart', function(event) { event.preventDefault(); }); + $('#bejelentkezesSzoveg').click(function(event) { + var a = $('#mayorGlobalLoginUserAccount'); + var b = $('#mayorGlobalLoginPassword'); + if ($(a).val()!='' || $(b).val()!='') { + $('#mayorGlobalLogin form.passwordAuth button').click(); + $('button.dologin').addClass('hint'); + event.preventDefault(); + } + }); // onLoadUpdate $('.onLoadUpdate').each( function(index, element) { diff --git a/mayor-orig/mayor-base/www/skin/classic/module-password/html/changeMyPassword.phtml b/mayor-orig/mayor-base/www/skin/classic/module-password/html/changeMyPassword.phtml index 20680e8e..fa8fe55d 100644 --- a/mayor-orig/mayor-base/www/skin/classic/module-password/html/changeMyPassword.phtml +++ b/mayor-orig/mayor-base/www/skin/classic/module-password/html/changeMyPassword.phtml @@ -32,7 +32,7 @@ echo _USERNAME; echo ''."\n"; echo ''."\n"; - echo ''."\n"; + echo ''."\n"; echo $userAccount; echo ''."\n"; echo ''."\n"; @@ -43,7 +43,7 @@ echo constant('_'.strtoupper($toPolicy).'_PASSWORD'); echo ''."\n"; echo ''."\n"; - echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; @@ -52,7 +52,7 @@ echo _NEW_PASSWORD; echo ''."\n"; echo ''."\n"; - echo ''; + echo ''; // echo ''; echo ''."\n"; echo ''."\n"; @@ -62,7 +62,7 @@ echo _VERIFICATION; echo ''."\n"; echo ''."\n"; - echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; diff --git a/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml b/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml index 87f34b3c..59dab0ea 100644 --- a/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml +++ b/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml @@ -56,7 +56,7 @@ echo ''."\n"; echo ''."\n"; echo ''."\n"; - echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; } @@ -66,7 +66,7 @@ echo _NEW_PASSWORD; echo ''."\n"; echo ''."\n"; - echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; @@ -75,7 +75,7 @@ echo _VERIFICATION; echo ''."\n"; echo ''."\n"; - echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; 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 '
'; 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 '
'; formBegin(array('class'=>'check passwordAuth','action'=>$secure_url)); echo ''; - echo ''; + echo ''; echo '
'; echo ''; - echo ''; + echo ''; echo ''; echo ''; - echo ''; + echo ''; formEnd(); echo '		'; if (__GOOGLEAPI_ENABLED===true) { -- cgit v1.2.3