Moved error display from chat to cef, cleaned up css code

This commit is contained in:
hydrant
2018-09-21 23:14:43 +02:00
parent 0b5680ac1a
commit d06fd928ac
3 changed files with 46 additions and 48 deletions

View File

@@ -7,10 +7,7 @@
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="Dependences/bootstrap-3.3.7/css/bootstrap.min.css">
<script src="Dependences/jquery-3.3.1.min.js"></script> <script src="Dependences/jquery-3.3.1.min.js"></script>
<script src="Dependences/bootstrap-3.3.7/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="style.css" /> <link rel="stylesheet" href="style.css" />
</head> </head>

View File

@@ -1,13 +1,13 @@
/** /**
* @overview Life of German Reallife - Login Main main.js * @overview Life of German Reallife - Login Main main.js
* @author VegaZ * @author VegaZ, hydrant
* @copyright (c) 2008 - 2018 Life of German * @copyright (c) 2008 - 2018 Life of German
*/ */
var loginBrowser; var loginBrowser;
loginBrowser = mp.browsers.new('package://Login/login.html'); loginBrowser = mp.browsers.new('package://Login/login.html');
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
mp.gui.cursor.show(true); mp.gui.cursor.show(true, true);
mp.events.add('loginInformationToServer', (password) => { mp.events.add('loginInformationToServer', (password) => {
@@ -21,12 +21,12 @@ mp.events.add('registerInformationToServer', (password) => {
}); });
mp.events.add('registerSuccess', () => { mp.events.add('registerSuccess', () => {
mp.gui.chat.push("Erfolgreich registriert!")
if (loginBrowser) if (loginBrowser)
{ {
loginBrowser.destroy(); loginBrowser.destroy();
} }
mp.gui.cursor.show(false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
}); });
@@ -36,14 +36,14 @@ mp.events.add('loginSuccess', () => {
{ {
loginBrowser.destroy(); loginBrowser.destroy();
} }
mp.gui.cursor.show(false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
}); });
mp.events.add('loginFail', (reason) => { mp.events.add('loginFail', (reason) => {
mp.gui.chat.push(reason); showCefError(reason);
}); });
@@ -51,14 +51,16 @@ mp.events.add('loginDeny', (reason) => {
if (loginBrowser) { if (loginBrowser) {
loginBrowser.destroy(); loginBrowser.destroy();
} }
mp.gui.cursor.show(false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
mp.gui.chat.push(reason); showCefError(reason);
}); });
mp.events.add('registerFail', (reason) => { mp.events.add('registerFail', (reason) => {
showCefError(reason);
mp.gui.chat.push(reason);
}); });
function showCefError(error) {
loginBrowser.execute(`showError(\`` + error + `\`)`);
}

View File

@@ -1,6 +1,6 @@
/** /**
* @overview Life of German Reallife - Login CSS style.css * @overview Life of German Reallife - Login CSS style.css
* @author Orangebox * @author Orangebox, hydrant
* @copyright (c) 2008 - 2018 Life of German * @copyright (c) 2008 - 2018 Life of German
*/ */
@@ -145,7 +145,6 @@ button {
} }
body { body {
background: url(bg_gta_cnr.png);
font-family: "Roboto", sans-serif; font-family: "Roboto", sans-serif;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
} }