GUAC-919: Copy Angular changes from old GUAC-546 branch.

This commit is contained in:
James Muehlner authored and Michael Jumper committed 2014-11-03 13:57:01 -08:00
1 parent ac2617b92a
commit 5c43ae4ff9
84 files changed
+16551 -7476

No files matched your search

@@ -1,65 +0,0 @@
/*
* Copyright (C) 2013 Glyptodon LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
button#back {
background-image: url('../images/action-icons/guac-back.png');
background-repeat: no-repeat;
background-size: 1em;
background-position: 0.5em 0.45em;
padding-left: 1.8em;
}
button#add-user {
background-image: url('../images/action-icons/guac-user-add.png');
background-repeat: no-repeat;
background-size: 1em;
background-position: 0.5em 0.45em;
padding-left: 1.8em;
}
button#add-connection {
background-image: url('../images/action-icons/guac-monitor-add.png');
background-repeat: no-repeat;
background-size: 1em;
background-position: 0.5em 0.45em;
padding-left: 1.8em;
}
button#add-connection-group {
background-image: url('../images/action-icons/guac-group-add.png');
background-repeat: no-repeat;
background-size: 1em;
background-position: 0.5em 0.45em;
padding-left: 1.8em;
}
+13 -9
View File
@@ -33,7 +33,7 @@ img {
}
.software-cursor {
cursor: url('../images/mouse/blank.gif'),url('../images/mouse/blank.cur'),default;
cursor: url('images/mouse/blank.gif'),url('images/mouse/blank.cur'),default;
overflow: hidden;
cursor: none;
}
@@ -114,9 +114,13 @@ div.dialog p {
margin: 0;
}
div#main {
div.main {
overflow: auto;
position: absolute;
position: fixed;
top: 0;
bottom: 0;
right: 0;
left: 0;
}
div.displayOuter {
@@ -195,7 +199,7 @@ div.magnifier {
right: 0;
height: 32px;
background-image: url('../images/arrows/arrows-u.png');
background-image: url('images/arrows/arrows-u.png');
}
@@ -206,7 +210,7 @@ div.magnifier {
right: 0;
height: 32px;
background-image: url('../images/arrows/arrows-d.png');
background-image: url('images/arrows/arrows-d.png');
}
@@ -217,7 +221,7 @@ div.magnifier {
left: 0;
width: 32px;
background-image: url('../images/arrows/arrows-l.png');
background-image: url('images/arrows/arrows-l.png');
}
@@ -228,7 +232,7 @@ div.magnifier {
right: 0;
width: 32px;
background-image: url('../images/arrows/arrows-r.png');
background-image: url('images/arrows/arrows-r.png');
}
@@ -375,7 +379,7 @@ p.hint {
.notification .close {
background: url('../images/action-icons/guac-close.png');
background: url('images/action-icons/guac-close.png');
background-size: 10px 10px;
-moz-background-size: 10px 10px;
-webkit-background-size: 10px 10px;
@@ -464,7 +468,7 @@ p.hint {
.upload.notification .progress,
.download.notification .progress {
background: #C2C2C2 url('../images/progress.png');
background: #C2C2C2 url('images/progress.png');
background-size: 16px 16px;
-moz-background-size: 16px 16px;
-webkit-background-size: 16px 16px;
-364
View File
@@ -1,364 +0,0 @@
/*
* Copyright (C) 2013 Glyptodon LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
* {
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
input[type=checkbox], input[type=text], textarea {
-webkit-tap-highlight-color: rgba(128,192,128,0.5);
}
input[type=submit], button {
-webkit-appearance: none;
}
body {
background: #EEE;
font-family: FreeSans, Helvetica, Arial, sans-serif;
padding: 0;
margin: 0;
}
#manage {
display: none;
}
.admin #manage {
display: inline-block;
}
button#manage {
background-image: url('../images/action-icons/guac-config.png');
background-repeat: no-repeat;
background-size: 1em;
background-position: 0.5em 0.45em;
padding-left: 1.8em;
}
div#login-ui {
height: 100%;
width: 100%;
position: fixed;
left: 0;
top: 0;
display: table;
}
@keyframes shake-head {
0% { margin-left: 0.25em; margin-right: -0.25em; }
25% { margin-left: -0.25em; margin-right: 0.25em; }
50% { margin-left: 0.25em; margin-right: -0.25em; }
75% { margin-left: -0.25em; margin-right: 0.25em; }
100% { margin-left: 0.00em; margin-right: 0.00em; }
}
@-webkit-keyframes shake-head {
0% { margin-left: 0.25em; margin-right: -0.25em; }
25% { margin-left: -0.25em; margin-right: 0.25em; }
50% { margin-left: 0.25em; margin-right: -0.25em; }
75% { margin-left: -0.25em; margin-right: 0.25em; }
100% { margin-left: 0.00em; margin-right: 0.00em; }
}
p#login-error {
display: none;
}
.error p#login-error {
display: block;
position: fixed;
left: 0;
right: 0;
top: 0;
padding: 1em;
margin: 0.2em;
background: #FDD;
border: 1px solid #964040;
-moz-border-radius: 0.25em;
-webkit-border-radius: 0.25em;
-khtml-border-radius: 0.25em;
text-align: center;
color: #964040;
}
.error #login-form {
animation-name: shake-head;
animation-duration: 0.25s;
animation-timing-function: linear;
-webkit-animation-name: shake-head;
-webkit-animation-duration: 0.25s;
-webkit-animation-timing-function: linear;
}
div#login-logo {
position: relative;
bottom: 0;
display: inline-block;
vertical-align: middle;
}
div#login-dialog-middle {
width: 100%;
display: table-cell;
vertical-align: middle;
text-align: center;
}
div#login-dialog {
max-width: 75%;
text-align: left;
display: inline-block;
}
div#login-dialog h1 {
margin-top: 0;
margin-bottom: 0em;
text-align: center;
}
div#login-dialog #buttons {
padding-top: 0.5em;
text-align: right;
}
input[type="submit"]#login, button#login {
background-image: url('../images/guacamole-logo-64.png');
background-repeat: no-repeat;
background-size: 1.5em;
background-position: 0.5em 0.25em;
padding-left: 2.5em;
}
div#login-dialog #login-fields {
vertical-align: middle;
padding: 1em;
border-top: 1px solid #999;
border-bottom: 1px solid #999;
}
div#login-dialog th {
text-shadow: 1px 1px white;
}
div#login-dialog #login-fields input {
border: 1px solid #777;
-moz-border-radius: 0.2em;
-webkit-border-radius: 0.2em;
-khtml-border-radius: 0.2em;
border-radius: 0.2em;
width: 100%;
}
div#login-dialog #login-fields img.logo {
position: fixed;
margin: 10px;
left: 0;
bottom: 0;
opacity: 0.1;
z-index: -1;
}
div#version {
text-align: center;
font-style: italic;
font-size: 0.75em;
color: black;
opacity: 0.5;
padding: 0.5em;
}
img {
border: none;
}
img#license {
float: right;
margin: 2px;
}
div#connection-list-ui h1 {
margin: 0;
padding: 0.5em;
font-size: 2em;
vertical-align: middle;
text-align: center;
}
div#connection-list-ui h2 {
padding: 0.5em;
margin: 0;
font-size: 1.5em;
font-weight: lighter;
text-shadow: 1px 1px white;
border-top: 1px solid #AAA;
border-bottom: 1px solid #AAA;
background: #DDD;
}
div#connection-list-ui img {
vertical-align: middle;
}
div#logout-panel {
padding: 0.45em;
text-align: right;
float: right;
}
.history-unavailable div#recent-connections {
display: none;
}
div#recent-connections,
div#clipboardDiv,
div#settings,
div#all-connections {
margin: 1em;
padding: 0;
}
#all-connections .list-buttons {
text-align: center;
padding: 0;
}
div#recent-connections {
text-align: center;
}
#no-recent {
color: black;
text-shadow: 1px 1px white;
opacity: 0.5;
font-size: 2em;
font-weight: bolder;
}
div#recent-connections div.connection {
-moz-border-radius: 0.5em;
-webkit-border-radius: 0.5em;
-khtml-border-radius: 0.5em;
border-radius: 0.5em;
display: inline-block;
padding: 1em;
margin: 1em;
text-align: center;
max-width: 75%;
overflow: hidden;
}
.group,
.connection {
cursor: pointer;
}
.connection:hover {
background: #CDA;
}
.group,
.connection .name {
color: black;
font-weight: normal;
padding: 0.1em;
}
.connection .thumbnail {
margin: 0.5em;
}
.connection .thumbnail img {
border: 1px solid black;
box-shadow: 1px 1px 5px black;
max-width: 75%;
}
div#all-connections .connection {
display: block;
text-align: left;
}
div#recent-connections .connection .thumbnail {
display: block;
}
div#all-connections .connection {
padding: 0.1em;
}
div#recent-connections .protocol {
display: none;
}
.caption * {
vertical-align: middle;
}
.caption .name {
margin-left: 0.25em;
}
#clipboardDiv textarea {
width: 100%;
border: 1px solid #AAA;
-moz-border-radius: 0.25em;
-webkit-border-radius: 0.25em;
-khtml-border-radius: 0.25em;
border-radius: 0.25em;
white-space: pre;
}
#settings dt {
border-bottom: 1px dotted #AAA;
padding-bottom: 0.25em;
}
#settings dd {
margin: 1.5em;
margin-left: 2.5em;
font-size: 0.75em;
}
+42 -67
View File
@@ -33,7 +33,7 @@ input[type=checkbox], input[type=number], input[type=text], input[type=radio], l
-webkit-tap-highlight-color: rgba(128,192,128,0.5);
}
input[type=submit], button {
input[type=submit], button, a.button {
-webkit-appearance: none;
}
@@ -59,7 +59,9 @@ textarea {
overflow: auto;
}
input[type="submit"], button {
input[type="submit"], button, a.button {
text-decoration: none;
background-color: #3C3C3C;
@@ -85,11 +87,11 @@ input[type="submit"], button {
}
input[type="submit"]:hover, button:hover {
input[type="submit"]:hover, button:hover, a.button:hover {
background-color: #5A5A5A;
}
input[type="submit"]:active, button:active {
input[type="submit"]:active, button:active, a.button:active {
background-color: #2C2C2C;
@@ -99,15 +101,15 @@ input[type="submit"]:active, button:active {
1px 1px 0.25em rgba(255, 255, 255, 0.25);
}
button.danger {
button.danger, a.button.danger {
background: #A43;
}
button.danger:hover {
button.danger:hover, a.button.danger:hover {
background: #C54;
}
button.danger:active {
button.danger:active, a.button.danger:active {
background: #932;
}
@@ -168,13 +170,16 @@ div.section {
padding: 1em;
}
.dialog.edit {
max-height: 100%;
}
.dialog {
max-width: 100%;
width: 8in;
margin-left: auto;
margin-right: auto;
max-height: 100%;
overflow: auto;
border: 1px solid rgba(0, 0, 0, 0.5);
@@ -284,10 +289,6 @@ div.section {
opacity: 0.5;
}
.choice .list-item .usage {
display: none;
}
.choice .list-item.in-use {
opacity: 1;
}
@@ -393,19 +394,19 @@ div.section {
*/
.icon.user {
background-image: url('../images/user-icons/guac-user.png');
background-image: url('images/user-icons/guac-user.png');
}
.icon.user.add {
background-image: url('../images/action-icons/guac-user-add.png');
background-image: url('images/action-icons/guac-user-add.png');
}
.icon.connection {
background-image: url('../images/protocol-icons/guac-plug.png');
background-image: url('images/protocol-icons/guac-plug.png');
}
.icon.connection.add {
background-image: url('../images/action-icons/guac-monitor-add.png');
background-image: url('images/action-icons/guac-monitor-add.png');
}
.protocol {
@@ -415,7 +416,7 @@ div.section {
.protocol .icon {
width: 24px;
height: 24px;
background-image: url('../images/protocol-icons/guac-plug.png');
background-image: url('images/protocol-icons/guac-plug.png');
background-size: 16px 16px;
-moz-background-size: 16px 16px;
-webkit-background-size: 16px 16px;
@@ -427,18 +428,13 @@ div.section {
.protocol .icon.ssh,
.protocol .icon.telnet {
background-image: url('../images/protocol-icons/guac-text.png');
background-image: url('images/protocol-icons/guac-text.png');
}
.protocol .icon.vnc,
.protocol .icon.rdp {
background-image: url('../images/protocol-icons/guac-monitor.png');
background-image: url('images/protocol-icons/guac-monitor.png');
}
.connection .thumbnail {
display: none;
}
/*
* Groups
*/
@@ -446,7 +442,6 @@ div.section {
.group > .children {
margin-left: 13px;
padding-left: 6px;
display: none;
}
.group.expanded > .children {
@@ -454,31 +449,23 @@ div.section {
border-left: 1px dotted rgba(0, 0, 0, 0.25);
}
.group > .caption .icon.type {
display: none;
}
.group.balancer > .caption .icon.type {
display: inline-block;
background-image: url('../images/protocol-icons/guac-monitor.png');
background-image: url('images/protocol-icons/guac-monitor.png');
}
.group > .caption .icon.group {
opacity: 0.75;
background-image: url('../images/group-icons/guac-closed.png');
background-image: url('images/group-icons/guac-closed.png');
}
.group.expanded > .caption .icon.group {
background-image: url('../images/group-icons/guac-open.png');
.group .icon.type.group.expanded {
background-image: url('images/group-icons/guac-open.png');
}
.group.empty > .caption .icon.group {
.group .icon.type.group.empty {
opacity: 0.25;
background-image: url('../images/group-icons/guac-open.png');
}
.group.empty.balancer > .caption .icon.group {
display: none;
background-image: url('images/group-icons/guac-open.png');
}
/*
@@ -498,14 +485,14 @@ div.section {
font-size: 0.75em;
}
#connections input.name,
#users input.name {
.connections input.name,
.users input.name {
max-width: 80%;
width: 20em;
}
#connection-list,
#user-list {
.connection-list,
.user-list {
border: 1px solid rgba(0, 0, 0, 0.25);
min-height: 20em;
-moz-border-radius: 0.2em;
@@ -514,30 +501,18 @@ div.section {
border-radius: 0.2em;
}
#connections #add-connection,
#connections #add-connection-group,
#users #add-user {
.connections .add-connection,
.connections .add-connection-group,
.users .add-user {
font-size: 0.8em;
}
#connection-add-form,
#user-add-form {
.connection-add-form,
.user-add-form {
margin-bottom: 0.5em;
}
body:not(.manage-connections) .require-manage-connections,
body:not(.manage-users) .require-manage-users {
display: none;
}
body:not(.add-connections) #add-connection,
body:not(.add-connection-groups) #add-connection-group,
body:not(.add-users) #user-add-form {
display: none;
display: none;
}
div#logout-panel {
div.logout-panel {
padding: 0.45em;
text-align: right;
float: right;
@@ -592,19 +567,19 @@ div#logout-panel {
}
.icon.first-page {
background-image: url('../images/action-icons/guac-first-page.png');
background-image: url('images/action-icons/guac-first-page.png');
}
.icon.prev-page {
background-image: url('../images/action-icons/guac-prev-page.png');
background-image: url('images/action-icons/guac-prev-page.png');
}
.icon.next-page {
background-image: url('../images/action-icons/guac-next-page.png');
background-image: url('images/action-icons/guac-next-page.png');
}
.icon.last-page {
background-image: url('../images/action-icons/guac-last-page.png');
background-image: url('images/action-icons/guac-last-page.png');
}
.buttons,
@@ -613,9 +588,9 @@ div#logout-panel {
margin: 1em;
}
button#logout {
button.logout, a.button {
background-image: url('../images/action-icons/guac-logout.png');
background-image: url('images/action-icons/guac-logout.png');
background-repeat: no-repeat;
background-size: 1em;
background-position: 0.5em 0.45em;