diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php index 9dfa2860c..1fdd112e0 100644 --- a/web/lang/en_gb.php +++ b/web/lang/en_gb.php @@ -102,6 +102,7 @@ $SLANG = array( 'AlarmRGBUnset' => 'You must set an alarm RGB colour', 'Alert' => 'Alert', 'All' => 'All', + 'AllTokensRevoked' => 'All Tokens Revoked', 'AnalysisFPS' => 'Analysis FPS', 'AnalysisUpdateDelay' => 'Analysis Update Delay', 'API' => 'API', diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css index 069952d40..99692bff6 100644 --- a/web/skins/classic/css/base/skin.css +++ b/web/skins/classic/css/base/skin.css @@ -350,10 +350,53 @@ fieldset > legend { .alert, .warnText, .warning, .disabledText { color: #ffa801; } + + .alarm, .errorText, .error { color: #ff3f34; } +.timedErrorBox { + color:white; + background:#e74c3c; + border-radius:5px; + padding:5px; + -moz-animation: inAndOut 5s ease-in forwards; + -webkit-animation: inAndOut 5s ease-in forwards; + animation: inAndOut 5s ease-in forwards; +} + +/* + the timed classed auto disappear after 5s +*/ +.timedWarningBox { + color:white; + background:#e67e22; + border-radius:5px; + padding:5px; + -moz-animation: inAndOut 5s ease-in forwards; + -webkit-animation: inAndOut 5s ease-in forwards; + animation: inAndOut 5s ease-in forwards; +} + +.timedSuccessBox { + color:white; + background:#27ae60; + border-radius:5px; + padding:5px; + -moz-animation: inAndOut 5s ease-in forwards; + -webkit-animation: inAndOut 5s ease-in forwards; + animation: inAndOut 5s ease-in forwards; +} + +@keyframes inAndOut { + 0% {opacity:0;} + 10% {opacity:1;} + 90% {opacity:1;} + 100% {opacity:0;} +} + + .fakelink { color: #7f7fb2; cursor: pointer; diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php index c0b437855..fa6a1fe61 100644 --- a/web/skins/classic/views/options.php +++ b/web/skins/classic/views/options.php @@ -330,7 +330,7 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI { $minTokenTime = time(); dbQuery ('UPDATE Users SET TokenMinExpiry=?', array ($minTokenTime)); - echo "All Tokens Revoked"; + echo "translate('AllTokensRevoked')"; } function updateSelected() @@ -338,14 +338,13 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI dbQuery("UPDATE Users SET APIEnabled=0"); foreach( $_REQUEST["tokenUids"] as $markUid ) { $minTime = time(); - // echo "UPDATE Users SET TokenMinExpiry=".$minTime." WHERE Id=".$markUid."
"; dbQuery('UPDATE Users SET TokenMinExpiry=? WHERE Id=?', array($minTime, $markUid)); } foreach( $_REQUEST["apiUids"] as $markUid ) { dbQuery('UPDATE Users SET APIEnabled=1 WHERE Id=?', array($markUid)); - // echo "UPDATE Users SET APIEnabled=1"." WHERE Id=".$markUid."
"; + } - echo "Updated"; + echo "translate('Updated'); } if(array_key_exists('revokeAllTokens',$_POST)){