Skip to content

N
noVNC
Commit 5299db1a authored by Joel Martin's avatar Joel Martin
Browse files
Options

Formatting. Image renames/cleanup. 

- Remove the images using the old font.

- Simplify the naming of the new control bar icon images.

- Change keyboard input type to 'email'. 'url' type doesn't have
  a space bar.

- Some clarifications to main LICENSE.txt file.
parent 938daad1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 125 additions and 824 deletions
LICENSE.txt
View file @ 5299db1a
......@@ -5,7 +5,7 @@ Please refer to the individual source files and/or to the noVNC commit
history: https://github.com/kanaka/noVNC/commits/master
noVNC is licensed under the LGPL (GNU Lesser General Public License)
version 3 with the following exceptions (all LGPL compatible):
version 3 with the following exceptions (all LGPL-3 compatible):
include/input.js : LGPL-2 or any later version
......@@ -21,14 +21,13 @@ version 3 with the following exceptions (all LGPL compatible):
images/ : Creative Commons Attribution-ShareAlike
http://creativecommons.org/licenses/by-sa/3.0/
Uses of the work must be attributed
to the noVNC project.
The LGPL-3 and OFL license texts are included at:
The license texts are included at:
docs/LICENSE.LGPL-3 and
docs/LICENSE.GPL-3
docs/LICENSE.OFL-1.1
Or alternatively the LGPL-3 license text may be found here:
Or alternatively the license texts may be found here:
http://www.gnu.org/licenses/lgpl.html and
http://www.gnu.org/licenses/gpl.html
http://scripts.sil.org/OFL
images/Logo.svg deleted 100644 → 0
View file @ 938daad1
This diff is collapsed.
images/clipboard.png
View replaced file @ 938daad1 View file @ 5299db1a
images/clipboard.png

1.47 KB | W: | H:

images/clipboard.png

501 Bytes | W: | H:

images/clipboard.png
images/clipboard.png
images/clipboard.png
images/clipboard.png
  • 2-up
  • Swipe
  • Onion skin
images/connect.png
View replaced file @ 938daad1 View file @ 5299db1a
images/connect.png

1.48 KB | W: | H:

images/connect.png

404 Bytes | W: | H:

images/connect.png
images/connect.png
images/connect.png
images/connect.png
  • 2-up
  • Swipe
  • Onion skin
images/disconnect.png
View replaced file @ 938daad1 View file @ 5299db1a
images/disconnect.png

2.06 KB | W: | H:

images/disconnect.png

1.35 KB | W: | H:

images/disconnect.png
images/disconnect.png
images/disconnect.png
images/disconnect.png
  • 2-up
  • Swipe
  • Onion skin
images/keyboard.png
View replaced file @ 938daad1 View file @ 5299db1a
images/keyboard.png

1.79 KB | W: | H:

images/keyboard.png

1.25 KB | W: | H:

images/keyboard.png
images/keyboard.png
images/keyboard.png
images/keyboard.png
  • 2-up
  • Swipe
  • Onion skin
images/settings.png
View replaced file @ 938daad1 View file @ 5299db1a
images/settings.png

2.27 KB | W: | H:

images/settings.png

2.44 KB | W: | H:

images/settings.png
images/settings.png
images/settings.png
images/settings.png
  • 2-up
  • Swipe
  • Onion skin
include/base.css
View file @ 5299db1a
......@@ -48,13 +48,14 @@ html {
#noVNC-control-bar {
position:fixed;
background: #b2bdcd; /* Old browsers */
background: -moz-linear-gradient(top, #b2bdcd 0%, #899cb3 49%, #7e93af 51%, #6e84a3 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#b2bdcd), color-stop(49%,#899cb3), color-stop(51%,#7e93af), color-stop(100%,#6e84a3)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* Opera11.10+ */
background: -ms-linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* IE10+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#b2bdcd', endColorstr='#6e84a3',GradientType=0 ); /* IE6-9 */
background: linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* W3C */
background: -moz-linear-gradient(top, #b2bdcd 0%, #899cb3 49%, #7e93af 51%, #6e84a3 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#b2bdcd), color-stop(49%,#899cb3), color-stop(51%,#7e93af), color-stop(100%,#6e84a3)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* Opera11.10+ */
background: -ms-linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* IE10+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#b2bdcd', endColorstr='#6e84a3',GradientType=0 ); /* IE6-9 */
background: linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* W3C */
display:block;
height:44px;
left:0;
......@@ -307,8 +308,6 @@ background: linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#b2bdcd', endColorstr='#6e84a3',GradientType=0 ); /* IE6-9 */
background: linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* W3C */
/*box-shadow:inset 0.4px 0.4px 0.4px #000000;*/
}
.noVNC_status_button_selected {
......
include/black.css
View file @ 5299db1a
......@@ -21,9 +21,9 @@
.noVNC_status_button {
font-size: 12px;
vertical-align: middle;
border:1px solid #4c4c4c;
background: #4c4c4c; /* Old browsers */
background: -moz-linear-gradient(top, #4c4c4c 0%, #2c2c2c 50%, #000000 51%, #131313 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4c4c4c), color-stop(50%,#2c2c2c), color-stop(51%,#000000), color-stop(100%,#131313)); /* Chrome,Safari4+ */
......@@ -32,17 +32,15 @@
background: -ms-linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* IE10+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4c4c4c', endColorstr='#131313',GradientType=0 ); /* IE6-9 */
background: linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* W3C */
}
.noVNC_status_button_selected {
background: #9dd53a; /* Old browsers */
background: -moz-linear-gradient(top, #9dd53a 0%, #a1d54f 50%, #80c217 51%, #7cbc0a 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9dd53a), color-stop(50%,#a1d54f), color-stop(51%,#80c217), color-stop(100%,#7cbc0a)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* Opera11.10+ */
background: -ms-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* IE10+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9dd53a', endColorstr='#7cbc0a',GradientType=0 ); /* IE6-9 */
background: linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* W3C */
background: #9dd53a; /* Old browsers */
background: -moz-linear-gradient(top, #9dd53a 0%, #a1d54f 50%, #80c217 51%, #7cbc0a 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9dd53a), color-stop(50%,#a1d54f), color-stop(51%,#80c217), color-stop(100%,#7cbc0a)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* Opera11.10+ */
background: -ms-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* IE10+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9dd53a', endColorstr='#7cbc0a',GradientType=0 ); /* IE6-9 */
background: linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* W3C */
}
include/ui.js
View file @ 5299db1a
......@@ -17,6 +17,7 @@ settingsOpen : false,
connSettingsOpen : true,
clipboardOpen: false,
keyboardVisible: false,
// Render default UI and initialize settings menu
load: function() {
var html = '', i, sheet, sheets, llevels;
......@@ -548,9 +549,9 @@ setViewDrag: function(drag) {
if (UI.rfb_state === 'normal' &&
UI.rfb.get_display().get_viewport()) {
$D('noVNC_view_drag_button').style.display = "inline";
vmb.style.display = "inline";
} else {
$D('noVNC_view_drag_button').style.display = "none";
vmb.style.display = "none";
}
if (typeof(drag) === "undefined") {
......@@ -558,10 +559,10 @@ setViewDrag: function(drag) {
drag = !UI.rfb.get_viewportDrag();
}
if (drag) {
$D('noVNC_view_drag_button').className = "noVNC_status_button_selected";
vmb.className = "noVNC_status_button_selected";
UI.rfb.set_viewportDrag(true);
} else {
$D('noVNC_view_drag_button').className = "noVNC_status_button";
vmb.className = "noVNC_status_button";
UI.rfb.set_viewportDrag(false);
}
},
......@@ -571,25 +572,20 @@ showKeyboard: function() {
if(UI.keyboardVisible == false) {
$D('keyboardinput').focus();
UI.keyboardVisible = true;
$D('showKeyboard').className =
"noVNC_status_button_selected";
$D('showKeyboard').className = "noVNC_status_button_selected";
} else if(UI.keyboardVisible == true) {
$D('keyboardinput').blur();
$D('showKeyboard').className =
"noVNC_status_button";
$D('showKeyboard').className = "noVNC_status_button";
UI.keyboardVisible = false;
}
},
keyInputBlur: function() {
$D('showKeyboard').className =
"noVNC_status_button";
$D('showKeyboard').className = "noVNC_status_button";
//Weird bug in iOS if you change keyboardVisible
//here it does not actually occur so next time
//you click keyboard icon it doesnt work.
var t=setTimeout("UI.setKeyboard()",100)
setTimeout("UI.setKeyboard()",100)
},
setKeyboard: function() {
......
vnc.html
View file @ 5299db1a
......@@ -47,32 +47,28 @@
<div id="noVNC-control-bar">
<!--noVNC Mobile Device only Buttons-->
<div class="noVNC-buttons-left">
<input type="image" src="images/drag_sml.png"
<input type="image" src="images/drag.png"
id="noVNC_view_drag_button" class="noVNC_status_button"
title="Move/Drag Viewport"
onclick="UI.setViewDrag();">
<div id="noVNC_mobile_buttons">
<input type="image" src="images/nobutton_mouse.png"
class="noVNC_status_button"
id="noVNC_mouse_button0"
<input type="image" src="images/mouse_none.png"
id="noVNC_mouse_button0" class="noVNC_status_button"
onclick="UI.setMouseButton(1);">
<input type="image" src="images/left_mouse.png"
class="noVNC_status_button"
id="noVNC_mouse_button1"
<input type="image" src="images/mouse_left.png"
id="noVNC_mouse_button1" class="noVNC_status_button"
onclick="UI.setMouseButton(2);">
<input type="image" src="images/middle_mouse.png"
class="noVNC_status_button"
id="noVNC_mouse_button2"
<input type="image" src="images/mouse_middle.png"
id="noVNC_mouse_button2" class="noVNC_status_button"
onclick="UI.setMouseButton(4);">
<input type="image" src="images/right_mouse.png"
class="noVNC_status_button"
id="noVNC_mouse_button4"
<input type="image" src="images/mouse_right.png"
id="noVNC_mouse_button4" class="noVNC_status_button"
onclick="UI.setMouseButton(0);">
<input type="image" src="images/keyboard_sml.png"
<input type="image" src="images/keyboard.png"
id="showKeyboard" class="noVNC_status_button"
value="Keyboard" title="Show Keyboard"
onclick="UI.showKeyboard()"/>
<input type="url"
<input type="email"
autocapitalize="off" autocorrect="off"
id="keyboardinput" class="noVNC_status_button"
onKeyDown="onKeyDown(event);" onblur="UI.keyInputBlur();"/>
......@@ -81,25 +77,25 @@
<!--noVNC Buttons-->
<div class="noVNC-buttons-right">
<input type="image" src="images/ctrlaltdel_sml.png"
class="noVNC_status_button"
value="CtrlAltDel" id="sendCtrlAltDelButton"
<input type="image" src="images/ctrlaltdel.png"
id="sendCtrlAltDelButton" class="noVNC_status_button"
title="Send Ctrl-Alt-Del"
onclick="UI.sendCtrlAltDel();" />
<input type="image" src="images/clipboard_sml.png"
<input type="image" src="images/clipboard.png"
id="clipboardButton" class="noVNC_status_button"
value="Clipboard" title="Clipboard"
title="Clipboard"
onclick="UI.toggleClipboardPanel();" />
<input type="image" src="images/settings_sml.png"
<input type="image" src="images/settings.png"
id="settingsButton" class="noVNC_status_button"
value="Settings" title="Settings"
title="Settings"
onclick="UI.toggleSettingsPanel();" />
<input type="image" src="images/connect_sml.png"
<input type="image" src="images/connect.png"
id="connectButton" class="noVNC_status_button_selected"
value="Connect" title="Connect"
title="Connect"
onclick="UI.toggleConnectPanel()" />
<input type="image" src="images/disconnect_sml.png"
<input type="image" src="images/disconnect.png"
id="disconnectButton" class="noVNC_status_button"
value="Disconnect" title="Disconnect"
title="Disconnect"
onclick="UI.disconnect()" />
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment