Button to welcome page on disconnect instead of forcing it
This commit is contained in:
@ -204,10 +204,11 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body" id="disconnectionModalDescription">
|
<div class="modal-body" id="disconnectionModalDescription">
|
||||||
Connection was lost with the server you were connected to. Moved back to welcome screen.
|
Connection was lost with the server you were connected to, probably caused by a server stop.
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button type="button" class="btn btn-secondary" data-dismiss="modal" id="disconnectionModalCloseButton">Close</button>
|
<button type="button" class="btn btn-primary" data-dismiss="modal" id="disconnectionModalCloseButton">Close</button>
|
||||||
|
<button type="button" class="btn btn-secondary" data-dismiss="modal" id="disconnectionModalWelcomeScreenButton">Welcome screen</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -25,6 +25,8 @@ function openServer(serverName){
|
|||||||
//Change server name and related info
|
//Change server name and related info
|
||||||
$("#serverTitle").text(serverName);
|
$("#serverTitle").text(serverName);
|
||||||
$("#consoleTextArea").text("");
|
$("#consoleTextArea").text("");
|
||||||
|
$("#commandInput").prop("disabled", false);
|
||||||
|
$("#sendCommandButton").prop("disabled", false);
|
||||||
|
|
||||||
//New server, new variables:
|
//New server, new variables:
|
||||||
autoPasswordCompleted = false;
|
autoPasswordCompleted = false;
|
||||||
@ -199,7 +201,9 @@ function writeRamInfo(free, used, total){
|
|||||||
*/
|
*/
|
||||||
function closedConnection(serverName){
|
function closedConnection(serverName){
|
||||||
if(connectionManager.activeConnection.serverName == serverName){
|
if(connectionManager.activeConnection.serverName == serverName){
|
||||||
backToHomepage();
|
//Disable command input and button
|
||||||
|
$("#commandInput").prop("disabled", true);
|
||||||
|
$("#sendCommandButton").prop("disabled", true);
|
||||||
|
|
||||||
//Inform user
|
//Inform user
|
||||||
$('#disconnectionModal').modal('show');
|
$('#disconnectionModal').modal('show');
|
||||||
|
@ -182,6 +182,13 @@ $("#navbarHomeLink").click(function() {
|
|||||||
backToHomepage();
|
backToHomepage();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* On DisconnectedModal, back to welcome screen clicked
|
||||||
|
*/
|
||||||
|
$("#disconnectionModalWelcomeScreenButton").click(function() {
|
||||||
|
backToHomepage();
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* On Settings link clicked
|
* On Settings link clicked
|
||||||
*/
|
*/
|
||||||
|
@ -32,7 +32,7 @@ function setLanguage(locale){
|
|||||||
"passwordModalCloseButton": "Close",
|
"passwordModalCloseButton": "Close",
|
||||||
"passwordSendButton": "Login",
|
"passwordSendButton": "Login",
|
||||||
"disconnectionModalLongTitle": "Disconnected",
|
"disconnectionModalLongTitle": "Disconnected",
|
||||||
"disconnectionModalDescription": "Connection was lost with the server you were connected to, probably caused by a server stop. Moved back to welcome screen.",
|
"disconnectionModalDescription": "Connection was lost with the server you were connected to, probably caused by a server stop.",
|
||||||
"disconnectionModalCloseButton": "Close",
|
"disconnectionModalCloseButton": "Close",
|
||||||
"settingsLink": "Settings",
|
"settingsLink": "Settings",
|
||||||
"settingsModalLongTitle": "WebConsole Settings",
|
"settingsModalLongTitle": "WebConsole Settings",
|
||||||
@ -68,7 +68,7 @@ function setLanguage(locale){
|
|||||||
"passwordModalCloseButton": "Cerrar",
|
"passwordModalCloseButton": "Cerrar",
|
||||||
"passwordSendButton": "Iniciar sesión",
|
"passwordSendButton": "Iniciar sesión",
|
||||||
"disconnectionModalLongTitle": "Desconectado",
|
"disconnectionModalLongTitle": "Desconectado",
|
||||||
"disconnectionModalDescription": "Se ha perdido la conexión con el servidor al que estabas conectado. Esto puede ser debido a que el servidor se ha cerrado. Se ha vuelto a la ventana principal.",
|
"disconnectionModalDescription": "Se ha perdido la conexión con el servidor al que estabas conectado. Esto puede ser debido a que el servidor se ha cerrado.",
|
||||||
"disconnectionModalCloseButton": "Cerrar",
|
"disconnectionModalCloseButton": "Cerrar",
|
||||||
"settingsLink": "Configuración",
|
"settingsLink": "Configuración",
|
||||||
"settingsModalLongTitle": "Configuración de WebConsole",
|
"settingsModalLongTitle": "Configuración de WebConsole",
|
||||||
@ -176,7 +176,7 @@ function setLanguage(locale){
|
|||||||
"passwordModalCloseButton": "关闭",
|
"passwordModalCloseButton": "关闭",
|
||||||
"passwordSendButton": "登录",
|
"passwordSendButton": "登录",
|
||||||
"disconnectionModalLongTitle": "已断开",
|
"disconnectionModalLongTitle": "已断开",
|
||||||
"disconnectionModalDescription": "与服务器的通信中断, 可能是因为服务器停止运行. 已回到欢迎界面.",
|
"disconnectionModalDescription": "与服务器的通信中断, 可能是因为服务器停止运行.",
|
||||||
"disconnectionModalCloseButton": "关闭",
|
"disconnectionModalCloseButton": "关闭",
|
||||||
"settingsLink": "设定值",
|
"settingsLink": "设定值",
|
||||||
"settingsModalLongTitle": "WebConsole 设定值",
|
"settingsModalLongTitle": "WebConsole 设定值",
|
||||||
@ -212,7 +212,7 @@ function setLanguage(locale){
|
|||||||
"passwordModalCloseButton": "Fermer",
|
"passwordModalCloseButton": "Fermer",
|
||||||
"passwordSendButton": "S'identifier",
|
"passwordSendButton": "S'identifier",
|
||||||
"disconnectionModalLongTitle": "Débranché",
|
"disconnectionModalLongTitle": "Débranché",
|
||||||
"disconnectionModalDescription": "La connexion a été perdue avec le serveur auquel vous étiez connecté, probablement en raison d'un arrêt du serveur. Revenu à l'écran d'accueil.",
|
"disconnectionModalDescription": "La connexion a été perdue avec le serveur auquel vous étiez connecté, probablement en raison d'un arrêt du serveur.",
|
||||||
"disconnectionModalCloseButton": "Fermer",
|
"disconnectionModalCloseButton": "Fermer",
|
||||||
"settingsLink": "Réglages",
|
"settingsLink": "Réglages",
|
||||||
"settingsModalLongTitle": "Réglages de WebConsole",
|
"settingsModalLongTitle": "Réglages de WebConsole",
|
||||||
@ -248,7 +248,7 @@ function setLanguage(locale){
|
|||||||
"passwordModalCloseButton": "Zavřít",
|
"passwordModalCloseButton": "Zavřít",
|
||||||
"passwordSendButton": "Přihlásit se",
|
"passwordSendButton": "Přihlásit se",
|
||||||
"disconnectionModalLongTitle": "Odpojeno",
|
"disconnectionModalLongTitle": "Odpojeno",
|
||||||
"disconnectionModalDescription": "Připojení se ztratilo se serverem, ke kterému jste byli připojeni, pravděpodobně způsobené zastavením serveru. Vrátil se zpět na uvítací obrazovku.",
|
"disconnectionModalDescription": "Připojení se ztratilo se serverem, ke kterému jste byli připojeni, pravděpodobně způsobené zastavením serveru.",
|
||||||
"disconnectionModalCloseButton": "Zavřít",
|
"disconnectionModalCloseButton": "Zavřít",
|
||||||
"settingsLink": "Nastavení",
|
"settingsLink": "Nastavení",
|
||||||
"settingsModalLongTitle": "Nastavení WebConsole",
|
"settingsModalLongTitle": "Nastavení WebConsole",
|
||||||
|
Reference in New Issue
Block a user