jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move styling from vnc_lite.html to css 

This clears up some conflicting style attributes as well. HTML
inline-styling is prioritized above css styling.
This commit is contained in:
Samuel Mannehed 2017-10-31 16:37:12 +01:00
parent 8167e459bc
commit dc905e859f
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/styles/lite.css
View File

@ -20,9 +20,13 @@ html {
height:100%; height:100%;
} }
#noVNC_status_bar {
margin-top:0px;
}
#noVNC_status { #noVNC_status {
padding-top: 4px; padding-top: 4px;
height:32px; height: auto;
text-align: center; text-align: center;
color: #fff; color: #fff;
font: bold 12px Helvetica; font: bold 12px Helvetica;
@ -43,6 +47,13 @@ html {
background: linear-gradient(#b4b41e 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); background: linear-gradient(#b4b41e 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%);
} }
.noNVC_shown {
display: inline;
}
.noVNC_hidden {
display: none;
}
/* Do not set width/height for VNC_canvas or incorrect /* Do not set width/height for VNC_canvas or incorrect
* scaling will occur. Canvas size depends on remote VNC * scaling will occur. Canvas size depends on remote VNC
* settings and noVNC settings. */ * settings and noVNC settings. */

16
vnc_lite.html
View File

@ -106,7 +106,6 @@
var html; var html;
var form = document.createElement('form'); var form = document.createElement('form');
form.style = 'margin-bottom: 0px';
form.innerHTML = '<label></label>' form.innerHTML = '<label></label>'
form.innerHTML += '<input type=password size=10 id="password_input">'; form.innerHTML += '<input type=password size=10 id="password_input">';
form.onsubmit = setPassword; form.onsubmit = setPassword;
@ -146,7 +145,7 @@
default: default:
level = "warn"; level = "warn";
} }
document.getElementById('noVNC_status_bar').setAttribute("class", "noVNC_status_" + level); document.getElementById('noVNC_status_bar').className = "noVNC_status_" + level;
document.getElementById('noVNC_status').textContent = text; document.getElementById('noVNC_status').textContent = text;
} }
function updateState(rfb, state, oldstate) { function updateState(rfb, state, oldstate) {
@ -206,13 +205,12 @@
var xvpbuttons; var xvpbuttons;
xvpbuttons = document.getElementById('noVNC_xvp_buttons'); xvpbuttons = document.getElementById('noVNC_xvp_buttons');
if (ver >= 1) { if (ver >= 1) {
xvpbuttons.style.display = 'inline'; xvpbuttons.className= "noVNC_shown";
} else { } else {
xvpbuttons.style.display = 'none'; xvpbuttons.className = "noVNC_hidden";
} }
} }
document.getElementById('sendCtrlAltDelButton').style.display = "inline";
document.getElementById('sendCtrlAltDelButton').onclick = sendCtrlAltDel; document.getElementById('sendCtrlAltDelButton').onclick = sendCtrlAltDel;
document.getElementById('xvpShutdownButton').onclick = xvpShutdown; document.getElementById('xvpShutdownButton').onclick = xvpShutdown;
document.getElementById('xvpRebootButton').onclick = xvpReboot; document.getElementById('xvpRebootButton').onclick = xvpReboot;
@ -280,15 +278,15 @@
</head> </head>
<body> <body>
<div id="noVNC_status_bar" style="margin-top: 0px;"> <div id="noVNC_status_bar">
<table border=0 width="100%"><tr> <table border=0 width="100%"><tr>
<td><div id="noVNC_status" style="position: relative; height: auto;"> <td><div id="noVNC_status">
Loading Loading
</div></td> </div></td>
<td width="1%"><div id="noVNC_buttons"> <td width="1%"><div id="noVNC_buttons">
<input type=button value="Send CtrlAltDel" <input type=button value="Send CtrlAltDel"
id="sendCtrlAltDelButton"> id="sendCtrlAltDelButton" class="noVNC_shown">
<span id="noVNC_xvp_buttons"> <span id="noVNC_xvp_buttons" class="noVNC_hidden">
<input type=button value="Shutdown" <input type=button value="Shutdown"
id="xvpShutdownButton"> id="xvpShutdownButton">
<input type=button value="Reboot" <input type=button value="Reboot"