diff options
author | Joel Martin <github@martintribe.org> | 2011-09-29 09:32:09 -0500 |
---|---|---|
committer | Joel Martin <github@martintribe.org> | 2011-09-29 09:32:09 -0500 |
commit | 5299db1a004faec901eb31a2a6040b72c3bf4a6c (patch) | |
tree | 316c91a8e5a316adf3827d16462e68ab65aa14a4 | |
parent | 938daad1c914b8b43bc8b11ac2acec664e7d36bc (diff) | |
download | novnc-mobile.tar.gz |
Formatting. Image renames/cleanup.mobile
- 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.
-rw-r--r-- | LICENSE.txt | 9 | ||||
-rw-r--r-- | images/Logo.svg | 687 | ||||
-rw-r--r-- | images/clipboard.png | bin | 1509 -> 501 bytes | |||
-rw-r--r-- | images/clipboard_sml.png | bin | 501 -> 0 bytes | |||
-rw-r--r-- | images/connect.png | bin | 1513 -> 404 bytes | |||
-rw-r--r-- | images/connect_sml.png | bin | 404 -> 0 bytes | |||
-rw-r--r-- | images/ctrlaltdel.png (renamed from images/ctrlaltdel_sml.png) | bin | 317 -> 317 bytes | |||
-rw-r--r-- | images/disconnect.png | bin | 2105 -> 1378 bytes | |||
-rw-r--r-- | images/disconnect_sml.png | bin | 1378 -> 0 bytes | |||
-rw-r--r-- | images/drag.png (renamed from images/drag_sml.png) | bin | 963 -> 963 bytes | |||
-rw-r--r-- | images/full_512x512.png | bin | 23962 -> 0 bytes | |||
-rw-r--r-- | images/keyboard.png | bin | 1838 -> 1283 bytes | |||
-rw-r--r-- | images/keyboard_sml.png | bin | 1283 -> 0 bytes | |||
-rw-r--r-- | images/mouse_left.png (renamed from images/left_mouse.png) | bin | 511 -> 511 bytes | |||
-rw-r--r-- | images/mouse_middle.png (renamed from images/middle_mouse.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | images/mouse_none.png (renamed from images/nobutton_mouse.png) | bin | 497 -> 497 bytes | |||
-rw-r--r-- | images/mouse_right.png (renamed from images/right_mouse.png) | bin | 513 -> 513 bytes | |||
-rw-r--r-- | images/move.png | bin | 1493 -> 0 bytes | |||
-rw-r--r-- | images/screen_640x435.png | bin | 20648 -> 0 bytes | |||
-rw-r--r-- | images/settings.png | bin | 2326 -> 2495 bytes | |||
-rw-r--r-- | images/settings_sml.png | bin | 2495 -> 0 bytes | |||
-rw-r--r-- | include/base.css | 63 | ||||
-rw-r--r-- | include/black.css | 52 | ||||
-rw-r--r-- | include/ui.js | 70 | ||||
-rw-r--r-- | vnc.html | 68 |
25 files changed, 125 insertions, 824 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index e04046c..755ace3 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -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 diff --git a/images/Logo.svg b/images/Logo.svg deleted file mode 100644 index 36a7ea6..0000000 --- a/images/Logo.svg +++ /dev/null @@ -1,687 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="512" - height="512" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - version="1.0" - sodipodi:docname="noVNC_Logo_13.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/joelm/Downloads/noVNC_Logo12.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - style="display:inline"> - <defs - id="defs4"> - <linearGradient - id="linearGradient7584"> - <stop - id="stop7586" - offset="0" - style="stop-color:#171717;stop-opacity:1;" /> - <stop - id="stop7588" - offset="1" - style="stop-color:#000000;stop-opacity:1;" /> - </linearGradient> - <linearGradient - id="linearGradient5965"> - <stop - style="stop-color:#030303;stop-opacity:1;" - offset="0" - id="stop5967" /> - <stop - id="stop5973" - offset="0.5" - style="stop-color:#090909;stop-opacity:1;" /> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="1" - id="stop5969" /> - </linearGradient> - <linearGradient - id="linearGradient5932"> - <stop - style="stop-color:#000000;stop-opacity:0.87450981;" - offset="0" - id="stop5934" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="1" - id="stop5936" /> - </linearGradient> - <linearGradient - id="linearGradient5333"> - <stop - style="stop-color:#ffffff;stop-opacity:0.05;" - offset="0" - id="stop5335" /> - <stop - style="stop-color:#4c4c4c;stop-opacity:0;" - offset="1" - id="stop5337" /> - </linearGradient> - <linearGradient - id="linearGradient4694"> - <stop - style="stop-color:#ffffff;stop-opacity:0.03529412;" - offset="0" - id="stop4696" /> - <stop - style="stop-color:#4c4c4c;stop-opacity:0;" - offset="1" - id="stop4698" /> - </linearGradient> - <linearGradient - id="linearGradient6989"> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0" - id="stop6991" /> - <stop - style="stop-color:#0f0f0f;stop-opacity:1;" - offset="1" - id="stop6993" /> - </linearGradient> - <linearGradient - id="linearGradient6790"> - <stop - style="stop-color:#434343;stop-opacity:1;" - offset="0" - id="stop6792" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="1" - id="stop6794" /> - </linearGradient> - <linearGradient - id="linearGradient6736"> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0" - id="stop6738" /> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="1" - id="stop6740" /> - </linearGradient> - <linearGradient - id="linearGradient6720"> - <stop - style="stop-color:#303030;stop-opacity:1;" - offset="0" - id="stop6722" /> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="1" - id="stop6724" /> - </linearGradient> - <linearGradient - id="linearGradient6702"> - <stop - id="stop4688" - offset="0" - style="stop-color:#000000;stop-opacity:0;" /> - <stop - id="stop6714" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient6662"> - <stop - style="stop-color:#010000;stop-opacity:1;" - offset="0" - id="stop6664" /> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="1" - id="stop6666" /> - </linearGradient> - <marker - inkscape:stockid="Arrow1Send" - orient="auto" - refY="0" - refX="0" - id="Arrow1Send" - style="overflow:visible"> - <path - id="path4730" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - transform="matrix(-0.2,0,0,-0.2,-1.2,0)" /> - </marker> - <marker - inkscape:stockid="Arrow1Mstart" - orient="auto" - refY="0" - refX="0" - id="Arrow1Mstart" - style="overflow:visible"> - <path - id="path4721" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - transform="matrix(0.4,0,0,0.4,4,0)" /> - </marker> - <marker - inkscape:stockid="Arrow1Lstart" - orient="auto" - refY="0" - refX="0" - id="Arrow1Lstart" - style="overflow:visible"> - <path - id="path4715" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - transform="matrix(0.8,0,0,0.8,10,0)" /> - </marker> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="-24.105461 : 505.9325 : 1" - inkscape:vp_y="6.1230318e-14 : 1000 : 0" - inkscape:vp_z="719.98902 : 505.9325 : 1" - inkscape:persp3d-origin="347.94178 : 330.5388 : 1" - id="perspective10" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6720" - id="linearGradient6742" - x1="341.66687" - y1="-253.40732" - x2="470.19839" - y2="-253.40732" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.874106,0,0,1.0453135,43.679874,11.482781)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6790" - id="linearGradient6796" - x1="-32.526917" - y1="294.91821" - x2="653.36664" - y2="294.91821" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7584" - id="linearGradient6987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.6520109,0,0,1.5543006,133.44336,136.96388)" - x1="341.66687" - y1="-253.40732" - x2="470.19839" - y2="-253.40732" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6702" - id="linearGradient4686" - gradientUnits="userSpaceOnUse" - x1="159.54247" - y1="443.13766" - x2="430.90103" - y2="443.13766" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4694" - id="linearGradient4700" - x1="229.03033" - y1="461.81128" - x2="393.28391" - y2="461.81128" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4694" - id="linearGradient4966" - gradientUnits="userSpaceOnUse" - x1="229.03033" - y1="461.81128" - x2="393.28391" - y2="461.81128" - spreadMethod="reflect" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5333" - id="linearGradient5339" - x1="271.28635" - y1="294.12686" - x2="490.23206" - y2="294.12686" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5932" - id="linearGradient5938" - x1="-245.06445" - y1="7.705513" - x2="-62.328537" - y2="7.705513" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.5245666,0,0,2.6282551,644.92825,162.55033)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5965" - id="linearGradient5971" - x1="159.54247" - y1="443.13766" - x2="430.90103" - y2="443.13766" - gradientUnits="userSpaceOnUse" - spreadMethod="pad" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient6720" - id="radialGradient7582" - cx="295.22174" - cy="443.13766" - fx="295.22174" - fy="443.13766" - r="135.67928" - gradientTransform="matrix(1,0,0,0.1356784,0,383.01346)" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient6720" - id="radialGradient7611" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,0.1356784,0,383.01346)" - cx="295.22174" - cy="443.13766" - fx="295.22174" - fy="443.13766" - r="135.67928" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4694" - id="linearGradient7613" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - x1="229.03033" - y1="461.81128" - x2="393.28391" - y2="461.81128" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5333" - id="linearGradient2913" - gradientUnits="userSpaceOnUse" - x1="271.28635" - y1="294.12686" - x2="490.23206" - y2="294.12686" - gradientTransform="matrix(1.0217389,0,0,1.0105488,-8.1719712,-6.8195787)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5932" - id="linearGradient2916" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.5891218,0,0,2.7050059,653.14704,159.9845)" - x1="-245.06445" - y1="7.705513" - x2="-62.328537" - y2="7.705513" /> - <inkscape:perspective - id="perspective2920" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - gridtolerance="10000" - guidetolerance="10" - objecttolerance="10" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="198.11269" - inkscape:cy="276.37194" - inkscape:document-units="px" - inkscape:current-layer="svg2" - showgrid="false" - inkscape:window-width="1680" - inkscape:window-height="1026" - inkscape:window-x="0" - inkscape:window-y="0" - showborder="false" - inkscape:window-maximized="1" /> - <metadata - id="metadata7"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:groupmode="layer" - id="layer2" - inkscape:label="Screen" - style="display:inline"> - <rect - style="fill:#303030;fill-opacity:1;stroke:none;display:inline" - id="rect6684" - width="473.59906" - height="321.92017" - x="18.594318" - y="19.852146" - inkscape:export-filename="/home/joelm/Downloads/noVNC_screen.png" - inkscape:export-xdpi="121.61401" - inkscape:export-ydpi="121.61401" /> - </g> - <g - inkscape:groupmode="layer" - id="layer15" - inkscape:label="Favicon_Box" - style="display:none"> - <rect - style="opacity:0;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" - id="rect3899" - width="342.5874" - height="342.62888" - x="86.710419" - y="14.318709" - inkscape:export-filename="/home/joelm/Downloads/noVNC_favicon.png" - inkscape:export-xdpi="4.1999998" - inkscape:export-ydpi="4.1999998" /> - <rect - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" - id="rect3899-5" - width="342.5874" - height="342.62888" - x="86.710419" - y="14.31871" - inkscape:export-filename="/home/joelm/Downloads/noVNC_favicon.png" - inkscape:export-xdpi="4.1999998" - inkscape:export-ydpi="4.1999998" /> - </g> - <g - inkscape:groupmode="layer" - id="layer6" - inkscape:label="Base" - style="display:inline"> - <path - sodipodi:type="arc" - style="fill:url(#linearGradient5971);fill-opacity:1;fill-rule:nonzero;stroke:none" - id="path6944" - sodipodi:cx="295.22174" - sodipodi:cy="443.13766" - sodipodi:rx="135.67928" - sodipodi:ry="18.408747" - d="m 430.90102,443.13766 a 135.67928,18.408747 0 1 1 -271.35855,0 135.67928,18.408747 0 1 1 271.35855,0 z" - transform="matrix(0.01302703,-0.3700754,8.066322,-0.0237182,-3322.837,581.39212)" /> - <path - sodipodi:type="arc" - style="fill:url(#linearGradient4686);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" - id="path4684" - sodipodi:cx="295.22174" - sodipodi:cy="443.13766" - sodipodi:rx="135.67928" - sodipodi:ry="18.408747" - d="m 430.90102,443.13766 a 135.67928,18.408747 0 1 1 -271.35855,0 135.67928,18.408747 0 1 1 271.35855,0 z" - transform="matrix(0.01219366,-0.2777519,7.5503003,-0.01780117,-2984.4223,654.88677)" /> - </g> - <g - inkscape:groupmode="layer" - id="layer14" - inkscape:label="BaseHighlight" - style="display:inline"> - <path - style="fill:none;stroke:#0f0626;stroke-width:3.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.9254902;stroke-dasharray:none;marker-mid:none" - d="m 113.22547,451.27721 c -6.48144,25.47482 27.77284,36.00307 33.46034,37.48107 75.48368,19.61581 142.61203,18.18957 201.82073,2.0728 19.20235,-5.22693 38.29352,-12.81118 45.54545,-22.87742 8.91645,-12.37672 -0.92272,-23.26137 -0.92272,-23.26137" - id="path5997" - sodipodi:nodetypes="csssc" /> - </g> - <g - inkscape:groupmode="layer" - id="layer10" - inkscape:label="BaseShadow_1" - style="display:inline"> - <g - id="g7591" - transform="translate(0,-2.1213203)"> - <path - transform="matrix(0.01219366,-0.2777519,7.5503003,-0.01780117,-3095.3084,545.23419)" - d="m 430.90102,443.13766 a 135.67928,18.408747 0 1 1 -271.35855,0 135.67928,18.408747 0 1 1 271.35855,0 z" - sodipodi:ry="18.408747" - sodipodi:rx="135.67928" - sodipodi:cy="443.13766" - sodipodi:cx="295.22174" - id="path6716" - style="fill:url(#radialGradient7611);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" - sodipodi:type="arc" /> - <path - sodipodi:nodetypes="cscc" - id="path4964" - d="m 316.59702,421.17478 c 0,0 58.23544,7.94555 73.90264,26.394 24.79157,29.19259 -118.30811,67.5501 -242.96933,33.90089 213.50314,-1.39087 169.09283,-60.31728 169.09283,-60.31728" - style="fill:url(#linearGradient7613);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="layer5" - inkscape:label="Support" - style="display:inline"> - <rect - style="fill:#000000;fill-opacity:0.98453603;fill-rule:nonzero;stroke:url(#linearGradient6987);stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" - id="rect6686" - width="72.335358" - height="30.264278" - x="361.94818" - y="-272.03949" - transform="matrix(0,1,-1,0,0,0)" /> - </g> - <g - inkscape:groupmode="layer" - id="layer13" - inkscape:label="ScreenShade" - style="display:inline"> - <rect - style="fill:url(#linearGradient2916);fill-opacity:1;fill-rule:nonzero;stroke:none" - id="rect5930" - width="473.12555" - height="321.87091" - x="18.64533" - y="19.892525" - inkscape:export-filename="/home/joelm/Downloads/noVNC_screen.png" - inkscape:export-xdpi="121.61401" - inkscape:export-ydpi="121.61401" /> - <path - style="fill:url(#linearGradient2913);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" - d="m 492.23643,341.65103 -222.74382,-0.21858 c 0,0 42.71861,-8.28882 90.56766,-25.15824 28.31396,-9.98224 57.59439,-24.1182 83.13673,-38.1986 45.98594,-25.35007 49.03937,-38.90668 49.03937,-38.90668 l 6e-5,102.4821 z" - id="path5331" - sodipodi:nodetypes="ccsscc" - inkscape:export-filename="/home/joelm/Downloads/noVNC_screen.png" - inkscape:export-xdpi="121.61401" - inkscape:export-ydpi="121.61401" /> - </g> - <g - inkscape:groupmode="layer" - id="layer9" - inkscape:label="noVNC_Black" - style="display:inline"> - <path - sodipodi:nodetypes="cccc" - style="fill:none;stroke:#000000;stroke-width:22.07362747;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" - d="m 416.69139,186.74564 c -77.95059,0 -77.95059,0 -77.95059,0 l 0,73.23957 80.00192,0" - id="path5134" - inkscape:export-filename="/home/joelm/Downloads/noVNC_screen.png" - inkscape:export-xdpi="121.61401" - inkscape:export-ydpi="121.61401" /> - <path - sodipodi:nodetypes="cccc" - style="fill:none;stroke:#000000;stroke-width:22.07362747;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" - d="m 221.52501,259.96552 0,-74.30876 75.89924,74.67652 0,-73.6827" - id="path5132" - inkscape:export-filename="/home/joelm/Downloads/noVNC_screen.png" - inkscape:export-xdpi="121.61401" - inkscape:export-ydpi="121.61401" /> - <g - style="fill:none;stroke:#000000;stroke-width:25.32735443;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" - id="g5128" - transform="matrix(1.0637273,0,0,0.7140646,-87.846677,11.859872)" - inkscape:export-filename="/home/joelm/Downloads/noVNC_screen.png" - inkscape:export-xdpi="121.61401" - inkscape:export-ydpi="121.61401"> - <path - sodipodi:nodetypes="cccc" - id="path5130" - d="m 181.27307,243.94727 0,42.42561 69.52825,61.54333 0,-103.59063" - style="fill:none;stroke:#000000;stroke-width:25.32735443;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> - </g> - <path - sodipodi:nodetypes="cccc" - style="fill:none;stroke:#000000;stroke-width:21.4314537;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" - d="m 106.33831,159.40077 0,-72.146954 73.69116,72.504004 0,-71.539108" - id="path5136" - inkscape:export-filename="/home/joelm/Downloads/noVNC_screen.png" - inkscape:export-xdpi="121.61401" - inkscape:export-ydpi="121.61401" /> - <path - style="fill:none;stroke:#000000;stroke-width:21.4314537;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" - d="m 219.23536,92.259872 0,71.123858 77.68903,0 -2.0092,-71.123858 c -75.6828,0 -75.67983,0 -75.67983,0 z" - id="path5138" - inkscape:export-filename="/home/joelm/Downloads/noVNC_screen.png" - inkscape:export-xdpi="121.61401" - inkscape:export-ydpi="121.61401" /> - </g> - <g - inkscape:groupmode="layer" - id="layer4" - inkscape:label="noVNC" - style="display:inline"> - <g - style="fill:none;display:inline" - id="g5142" - transform="matrix(1.0637273,0,0,0.7140646,-87.924897,11.633929)" - inkscape:export-filename="/home/joelm/Downloads/noVNC_favicon.png" - inkscape:export-xdpi="4.1999998" - inkscape:export-ydpi="4.1999998"> - <path - sodipodi:nodetypes="cccc" - id="path5144" - d="m 181.27307,243.94727 0,42.42561 69.52825,61.54333 0,-103.59063" - style="fill:none;stroke:#f2eb41;stroke-width:19.83890915;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> - </g> - <path - sodipodi:nodetypes="cccc" - style="fill:none;stroke:#f2eb41;stroke-width:17.29026794;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" - d="m 221.44679,259.73958 0,-74.30877 75.89925,74.67651 0,-73.68269" - id="path5146" - inkscape:export-filename="/home/joelm/Downloads/noVNC_favicon.png" - inkscape:export-xdpi="4.1999998" - inkscape:export-ydpi="4.1999998" /> - <path - sodipodi:nodetypes="cccc" - style="fill:none;stroke:#f2eb41;stroke-width:17.29026794;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" - d="m 416.61319,186.51969 c -77.95061,0 -77.95061,0 -77.95061,0 l 0,73.23958 80.00193,0" - id="path5148" - inkscape:export-filename="/home/joelm/Downloads/noVNC_favicon.png" - inkscape:export-xdpi="4.1999998" - inkscape:export-ydpi="4.1999998" /> - <path - sodipodi:nodetypes="cccc" - style="fill:none;stroke:#00df00;stroke-width:16.78725243;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" - d="m 106.26238,159.1814 0,-72.146955 73.69115,72.503995 0,-71.539084" - id="path5150" - inkscape:export-filename="/home/joelm/Downloads/noVNC_favicon.png" - inkscape:export-xdpi="4.1999998" - inkscape:export-ydpi="4.1999998" /> - <path - style="fill:none;stroke:#00df00;stroke-width:16.78725243;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" - d="m 219.15941,92.040508 0,71.123862 77.68904,0 -2.00919,-71.123862 c -75.68283,0 -75.67985,0 -75.67985,0 z" - id="path5152" - inkscape:export-filename="/home/joelm/Downloads/noVNC_favicon.png" - inkscape:export-xdpi="4.1999998" - inkscape:export-ydpi="4.1999998" /> - </g> - <g - inkscape:groupmode="layer" - id="layer7" - inkscape:label="noVNC_Save" - style="display:none"> - <g - style="display:inline" - id="g3903" - transform="matrix(0.9560363,0,0,0.9560363,-6.710991,-337.27245)"> - <g - transform="matrix(1.0081199,0,0,1.0081199,-11.487266,-121.24134)" - id="g3905" - style="fill:none"> - <path - style="fill:none;stroke:#00ff00;stroke-width:19.83890915;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 83.455645,199.50003 101.674295,0" - id="path3907" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;stroke:#00ff00;stroke-width:19.83890915;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 81.687109,243.94727 99.585961,0 0,42.42561 79.06591,61.54333 0,-103.59063" - id="path3909" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:none;stroke:#00ff00;stroke-width:19.83890915;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="M 87.323416,283.46826 175.10772,160.81511" - id="path3911" - sodipodi:nodetypes="cc" /> - </g> - <path - id="path3913" - d="m 289.84756,229.03542 0,-104.90947 71.93153,105.42866 0,-104.02559" - style="fill:none;stroke:#00ff00;stroke-width:20;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:nodetypes="cccc" /> - <path - id="path3915" - d="m 472.59255,125.66322 c -73.87564,0 -73.87564,0 -73.87564,0 l 0,103.4 75.81973,0" - style="fill:none;stroke:#00ff00;stroke-width:20;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:nodetypes="cccc" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="Bezel" - style="display:inline"> - <rect - style="fill:none;stroke:#040404;stroke-width:24.66699982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" - id="rect6660" - width="485.7326" - height="337.33023" - x="14.179501" - y="14.179514" /> - </g> - <g - inkscape:groupmode="layer" - id="layer8" - inkscape:label="BezelHighlight" - style="display:inline"> - <rect - style="fill:none;stroke:#100626;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.89803922;stroke-dasharray:none;stroke-dashoffset:0;display:inline" - id="rect3888" - width="485.7326" - height="337.33023" - x="13.819346" - y="14.179423" /> - </g> -</svg> diff --git a/images/clipboard.png b/images/clipboard.png Binary files differindex 571a909..24df33c 100644 --- a/images/clipboard.png +++ b/images/clipboard.png diff --git a/images/clipboard_sml.png b/images/clipboard_sml.png Binary files differdeleted file mode 100644 index 24df33c..0000000 --- a/images/clipboard_sml.png +++ /dev/null diff --git a/images/connect.png b/images/connect.png Binary files differindex 73c5704..79e71ad 100644 --- a/images/connect.png +++ b/images/connect.png diff --git a/images/connect_sml.png b/images/connect_sml.png Binary files differdeleted file mode 100644 index 79e71ad..0000000 --- a/images/connect_sml.png +++ /dev/null diff --git a/images/ctrlaltdel_sml.png b/images/ctrlaltdel.png Binary files differindex 31922e5..31922e5 100644 --- a/images/ctrlaltdel_sml.png +++ b/images/ctrlaltdel.png diff --git a/images/disconnect.png b/images/disconnect.png Binary files differindex d2dcf9c..8832f5e 100644 --- a/images/disconnect.png +++ b/images/disconnect.png diff --git a/images/disconnect_sml.png b/images/disconnect_sml.png Binary files differdeleted file mode 100644 index 8832f5e..0000000 --- a/images/disconnect_sml.png +++ /dev/null diff --git a/images/drag_sml.png b/images/drag.png Binary files differindex 433f896..433f896 100644 --- a/images/drag_sml.png +++ b/images/drag.png diff --git a/images/full_512x512.png b/images/full_512x512.png Binary files differdeleted file mode 100644 index 1868e22..0000000 --- a/images/full_512x512.png +++ /dev/null diff --git a/images/keyboard.png b/images/keyboard.png Binary files differindex f7c47ce..f797952 100644 --- a/images/keyboard.png +++ b/images/keyboard.png diff --git a/images/keyboard_sml.png b/images/keyboard_sml.png Binary files differdeleted file mode 100644 index f797952..0000000 --- a/images/keyboard_sml.png +++ /dev/null diff --git a/images/left_mouse.png b/images/mouse_left.png Binary files differindex 1de7a48..1de7a48 100644 --- a/images/left_mouse.png +++ b/images/mouse_left.png diff --git a/images/middle_mouse.png b/images/mouse_middle.png Binary files differindex 81fbd9b..81fbd9b 100644 --- a/images/middle_mouse.png +++ b/images/mouse_middle.png diff --git a/images/nobutton_mouse.png b/images/mouse_none.png Binary files differindex 93dbf57..93dbf57 100644 --- a/images/nobutton_mouse.png +++ b/images/mouse_none.png diff --git a/images/right_mouse.png b/images/mouse_right.png Binary files differindex 355b25d..355b25d 100644 --- a/images/right_mouse.png +++ b/images/mouse_right.png diff --git a/images/move.png b/images/move.png Binary files differdeleted file mode 100644 index b6156b5..0000000 --- a/images/move.png +++ /dev/null diff --git a/images/screen_640x435.png b/images/screen_640x435.png Binary files differdeleted file mode 100644 index 51228ff..0000000 --- a/images/screen_640x435.png +++ /dev/null diff --git a/images/settings.png b/images/settings.png Binary files differindex 3ff91d3..a43f5e1 100644 --- a/images/settings.png +++ b/images/settings.png diff --git a/images/settings_sml.png b/images/settings_sml.png Binary files differdeleted file mode 100644 index a43f5e1..0000000 --- a/images/settings_sml.png +++ /dev/null diff --git a/include/base.css b/include/base.css index 4404d01..268f738 100644 --- a/include/base.css +++ b/include/base.css @@ -47,21 +47,22 @@ html { /*Mobile buttons bar.*/ #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: #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 */ + display:block; height:44px; left:0; top:0; width:100%; z-index:200; -} +} #noVNC_view_drag_button { display: none; @@ -143,8 +144,8 @@ background: linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100% } #noVNC_container, #noVNC_canvas { - margin: 0px; - padding: 0px; + margin: 0px; + padding: 0px; } #noVNC_canvas { @@ -197,9 +198,9 @@ background: linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100% left:50px; /* controls horizontal position */ border-width:20px 0 0 20px; /* vary these values to change the angle of the vertex */ border-style:solid; - border-color:#E0E0E0 transparent; + border-color:#E0E0E0 transparent; /* reduce the damage in FF3.0 */ - display:block; + display:block; width:0; } @@ -209,12 +210,12 @@ background: linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100% bottom:auto; left:auto; border-width:40px 40px 0 0; /* vary these values to change the angle of the vertex */ - border-color:transparent #E0E0E0; + border-color:transparent #E0E0E0; } /*Bubble contents divs*/ #noVNC_settings { - display:none; + display:none; margin-top:77px; right:20px; position:fixed; @@ -230,7 +231,7 @@ background: linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100% } #noVNC_clipboard { - display:none; + display:none; margin-top:77px; right:30px; position:fixed; @@ -307,25 +308,23 @@ 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 { - font-size: 12px; - padding: 4px 4px; - vertical-align: middle; - border:1px solid #4366a9; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - background: #779ced; /* Old browsers */ - background: -moz-linear-gradient(top, #779ced 0%, #3970e0 49%, #2160dd 51%, #2463df 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#779ced), color-stop(49%,#3970e0), color-stop(51%,#2160dd), color-stop(100%,#2463df)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#779ced', endColorstr='#2463df',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* W3C */ + font-size: 12px; + padding: 4px 4px; + vertical-align: middle; + border:1px solid #4366a9; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + background: #779ced; /* Old browsers */ + background: -moz-linear-gradient(top, #779ced 0%, #3970e0 49%, #2160dd 51%, #2463df 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#779ced), color-stop(49%,#3970e0), color-stop(51%,#2160dd), color-stop(100%,#2463df)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* Opera11.10+ */ + background: -ms-linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* IE10+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#779ced', endColorstr='#2463df',GradientType=0 ); /* IE6-9 */ + background: linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* W3C */ /*box-shadow:inset 0.4px 0.4px 0.4px #000000;*/ } diff --git a/include/black.css b/include/black.css index 96a96b0..ce073dd 100644 --- a/include/black.css +++ b/include/black.css @@ -1,12 +1,12 @@ #noVNC-control-bar { - 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+ */ - background: -webkit-linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Opera11.10+ */ - 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 */ + 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+ */ + background: -webkit-linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Opera11.10+ */ + 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 */ } .triangle-right { @@ -21,28 +21,26 @@ .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+ */ - background: -webkit-linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Opera11.10+ */ - 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 */ - + + 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+ */ + background: -webkit-linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Opera11.10+ */ + 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 */ } diff --git a/include/ui.js b/include/ui.js index 94ad9a0..74a0005 100644 --- a/include/ui.js +++ b/include/ui.js @@ -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; @@ -39,26 +40,26 @@ load: function() { WebUtil.init_logging(UI.getSetting('logging')); UI.initSetting('stylesheet', 'default'); - WebUtil.selectStylesheet(null); + WebUtil.selectStylesheet(null); // call twice to get around webkit bug WebUtil.selectStylesheet(UI.getSetting('stylesheet')); /* Populate the controls if defaults are provided in the URL */ - UI.initSetting('host', ''); + UI.initSetting('host', ''); UI.initSetting('port', ''); UI.initSetting('password', ''); UI.initSetting('encrypt', false); UI.initSetting('true_color', true); UI.initSetting('cursor', false); - UI.initSetting('shared', true); + UI.initSetting('shared', true); UI.initSetting('connectTimeout', 2); - UI.initSetting('path', ''); + UI.initSetting('path', ''); UI.rfb = RFB({'target': $D('noVNC_canvas'), 'onUpdateState': UI.updateState, 'onClipboard': UI.clipReceive}); UI.updateVisualState(); - + // Unfocus clipboard when over the VNC area //$D('VNC_screen').onmousemove = function () { // var keyboard = UI.rfb.get_keyboard(); @@ -80,15 +81,15 @@ load: function() { UI.initSetting('clip', false); } - //iOS Safari does not support CSS position:fixed. - //This detects iOS devices and enables javascript workaround. + //iOS Safari does not support CSS position:fixed. + //This detects iOS devices and enables javascript workaround. if ((navigator.userAgent.match(/iPhone/i)) || - (navigator.userAgent.match(/iPod/i)) || + (navigator.userAgent.match(/iPod/i)) || (navigator.userAgent.match(/iPad/i))) { //UI.setOnscroll(); - //UI.setResize(); + //UI.setResize(); } - + $D('noVNC_host').focus(); UI.setViewClip(); @@ -140,7 +141,7 @@ updateSetting: function(name, value) { } } } else { - /*Weird IE9 error leads to 'null' appearring + /*Weird IE9 error leads to 'null' appearring in textboxes instead of ''.*/ if (value === null) { value = ""; @@ -217,8 +218,8 @@ toggleConnectPanel: function() { $D('connectButton').className = "noVNC_status_button"; } if (UI.clipboardOpen == true) { - UI.toggleClipboardPanel(); - } + UI.toggleClipboardPanel(); + } //Toggle Connection Panel if (UI.connSettingsOpen == true) { @@ -263,8 +264,8 @@ toggleSettingsPanel: function() { // Open menu openSettingsMenu: function() { if (UI.clipboardOpen == true) { - UI.toggleClipboardPanel(); - } + UI.toggleClipboardPanel(); + } //Close connection settings if open if (UI.connSettingsOpen == true) { UI.toggleConnectPanel(); @@ -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); } }, @@ -569,31 +570,26 @@ setViewDrag: function(drag) { // On touch devices, show the OS keyboard showKeyboard: function() { if(UI.keyboardVisible == false) { - $D('keyboardinput').focus(); - UI.keyboardVisible = true; - $D('showKeyboard').className = - "noVNC_status_button_selected"; + $D('keyboardinput').focus(); + UI.keyboardVisible = true; + $D('showKeyboard').className = "noVNC_status_button_selected"; } else if(UI.keyboardVisible == true) { - $D('keyboardinput').blur(); - $D('showKeyboard').className = - "noVNC_status_button"; - UI.keyboardVisible = false; + $D('keyboardinput').blur(); + $D('showKeyboard').className = "noVNC_status_button"; + UI.keyboardVisible = false; } - }, keyInputBlur: function() { - $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) - + $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. + setTimeout("UI.setKeyboard()",100) }, setKeyboard: function() { - UI.keyboardVisible = false; + UI.keyboardVisible = false; }, // iOS < Version 5 does not support position fixed. Javascript workaround: @@ -621,7 +617,7 @@ addOption: function(selectbox,text,value ) setBarPosition: function() { $D('noVNC-control-bar').style.top = (window.pageYOffset) + 'px'; $D('noVNC_mobile_buttons').style.left = (window.pageXOffset) + 'px'; - + var vncwidth = $D('noVNC_screen').style.offsetWidth; $D('noVNC-control-bar').style.width = vncwidth + 'px'; } @@ -1,8 +1,8 @@ <!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.1//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile11.dtd"> -<html> +<html> <head> - <!-- + <!-- noVNC example: simple example using default UI Copyright (C) 2011 Joel Martin Licensed under LGPL-3 (see LICENSE.txt) @@ -20,59 +20,55 @@ <meta name="apple-mobile-web-app-capable" content="yes" /> <meta names="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <!-- App Start Icon --> - <link rel="apple-touch-startup-image" href="images/screen_320x460.png" /> + <link rel="apple-touch-startup-image" href="images/screen_320x460.png" /> <!-- For iOS devices set the icon to use if user bookmarks app on their homescreen --> <link rel="apple-touch-icon" href="images/screen_57x57.png"> <!-- - <link rel="apple-touch-icon-precomposed" href="images/screen_57x57.png" /> + <link rel="apple-touch-icon-precomposed" href="images/screen_57x57.png" /> --> - + <!-- Stylesheets --> <link rel="stylesheet" href="include/base.css" /> <link rel="alternate stylesheet" href="include/black.css" TITLE="Black" /> <link rel="alternate stylesheet" href="include/blue.css" TITLE="Blue" /> <!-- - <script type='text/javascript' + <script type='text/javascript' src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script> --> <script src="include/vnc.js"></script> <script src="include/ui.js"></script> -</head> +</head> <body> <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" - id="showKeyboard" class="noVNC_status_button" + <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> @@ -165,7 +161,7 @@ <div id="noVNC_status_bar" class="noVNC_status_bar"> <div id="noVNC_status">Loading</div> </div> - + <h1 id="noVNC_logo"><span>no</span><br />VNC</h1> <!-- HTML5 Canvas --> @@ -176,7 +172,7 @@ </div> </div> - + <script> window.onload = UI.load; </script> |