GUACAMOLE-38: Tweak style and translation issues.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/56cc11e1 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/56cc11e1 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/56cc11e1 Branch: refs/heads/staging/1.0.0 Commit: 56cc11e1b991a9885454d8954c61eb254e99496a Parents: 2a9c7fe Author: Nick Couchman <vn...@apache.org> Authored: Wed May 9 09:54:45 2018 -0400 Committer: Nick Couchman <vn...@apache.org> Committed: Fri Jun 1 13:40:52 2018 -0400 ---------------------------------------------------------------------- .../src/main/resources/styles/quickconnect.css | 11 ++++++----- .../src/main/resources/templates/quickconnectField.html | 4 +++- .../src/main/resources/translations/en.json | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/56cc11e1/extensions/guacamole-auth-quickconnect/src/main/resources/styles/quickconnect.css ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/main/resources/styles/quickconnect.css b/extensions/guacamole-auth-quickconnect/src/main/resources/styles/quickconnect.css index ee0c2f5..bc9209d 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/resources/styles/quickconnect.css +++ b/extensions/guacamole-auth-quickconnect/src/main/resources/styles/quickconnect.css @@ -19,26 +19,27 @@ .quickconnect-container { - margin: 0.5em 0; + margin: 0.75em 0; width: 100%; + margin-left: 0.75em; } .quickconnect-container .quickconnect-field { background-image: url('images/protocol-icons/guac-text.png'); background-repeat: no-repeat; - background-size: 1.75em; + background-size: 1.50em; background-position: 0.25em center; background-color: transparent; - padding: 0.5em; - padding-left: 2.25em; + padding: 0.25em; + padding-left: 2.50em; width: 100%; max-width: none; border: 0; - border-left: 1px solid rgba(0,0,0,0.125); box-sizing: border-box; } .quickconnect-button { clear: both; float: right; + margin-right: 0.75em; } http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/56cc11e1/extensions/guacamole-auth-quickconnect/src/main/resources/templates/quickconnectField.html ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/main/resources/templates/quickconnectField.html b/extensions/guacamole-auth-quickconnect/src/main/resources/templates/quickconnectField.html index 114f59a..30e8a90 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/resources/templates/quickconnectField.html +++ b/extensions/guacamole-auth-quickconnect/src/main/resources/templates/quickconnectField.html @@ -5,5 +5,7 @@ <input type=text class="quickconnect-field" placeholder="{{'QUICKCONNECT.FIELD_PLACEHOLDER_URI' |translate}}" ng-model="uri" /> </form> </div> - <button class="quickconnect-button" ng-click="quickConnect()">Connect</button> + <div class="action-buttons"> + <button class="quickconnect-button" ng-click="quickConnect()">{{'QUICKCONNECT.ACTION_CONNECT' | translate}}</button> + </div> </div> http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/56cc11e1/extensions/guacamole-auth-quickconnect/src/main/resources/translations/en.json ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/main/resources/translations/en.json b/extensions/guacamole-auth-quickconnect/src/main/resources/translations/en.json index 1f7bb3d..2c2dc8e 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/resources/translations/en.json +++ b/extensions/guacamole-auth-quickconnect/src/main/resources/translations/en.json @@ -5,6 +5,7 @@ }, "QUICKCONNECT" : { + "ACTION_CONNECT" : "Connect", "FIELD_PLACEHOLDER_URI" : "Enter Connection URI" }
