From 5d0cf7210202d89ab0e29b3d1a754d2cf4993a22 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 11 Apr 2016 16:31:19 -0700 Subject: [PATCH 1/3] GUACAMOLE-1: APP.NAME should be Apache Guacamole. --- guacamole/src/main/webapp/translations/de.json | 2 +- guacamole/src/main/webapp/translations/en.json | 2 +- guacamole/src/main/webapp/translations/fr.json | 2 +- guacamole/src/main/webapp/translations/it.json | 2 +- guacamole/src/main/webapp/translations/nl.json | 2 +- guacamole/src/main/webapp/translations/ru.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/guacamole/src/main/webapp/translations/de.json b/guacamole/src/main/webapp/translations/de.json index 058193835..50fa4dce4 100644 --- a/guacamole/src/main/webapp/translations/de.json +++ b/guacamole/src/main/webapp/translations/de.json @@ -38,7 +38,7 @@ "INFO_ACTIVE_USER_COUNT" : "In Benutzung durch {USERS} Benutzer.", - "NAME" : "Guacamole ${project.version}", + "NAME" : "Apache Guacamole ${project.version}", "TEXT_HISTORY_DURATION" : "{VALUE} {UNIT, select, second{{VALUE, plural, one{Sekunde} other{Sekunden}}} minute{{VALUE, plural, one{Minute} other{Minuten}}} hour{{VALUE, plural, one{Stunde} other{Stunden}}} day{{VALUE, plural, one{Tag} other{Tage}}} other{}}" diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 4c47a0325..ff237bbe5 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -38,7 +38,7 @@ "INFO_ACTIVE_USER_COUNT" : "Currently in use by {USERS} {USERS, plural, one{user} other{users}}.", - "NAME" : "Guacamole ${project.version}", + "NAME" : "Apache Guacamole ${project.version}", "TEXT_HISTORY_DURATION" : "{VALUE} {UNIT, select, second{{VALUE, plural, one{second} other{seconds}}} minute{{VALUE, plural, one{minute} other{minutes}}} hour{{VALUE, plural, one{hour} other{hours}}} day{{VALUE, plural, one{day} other{days}}} other{}}" diff --git a/guacamole/src/main/webapp/translations/fr.json b/guacamole/src/main/webapp/translations/fr.json index 414acf27f..1835050d8 100644 --- a/guacamole/src/main/webapp/translations/fr.json +++ b/guacamole/src/main/webapp/translations/fr.json @@ -38,7 +38,7 @@ "INFO_ACTIVE_USER_COUNT" : "Actuellement utilisé par {USERS} {USERS, plural, one{utilisateur} other{utilisateurs}}.", - "NAME" : "Guacamole ${project.version}", + "NAME" : "Apache Guacamole ${project.version}", "TEXT_HISTORY_DURATION" : "{VALUE} {UNIT, select, second{{VALUE, plural, one{seconde} other{secondes}}} minute{{VALUE, plural, one{minute} other{minutes}}} hour{{VALUE, plural, one{heure} other{heures}}} day{{VALUE, plural, one{jour} other{jours}}} other{}}" diff --git a/guacamole/src/main/webapp/translations/it.json b/guacamole/src/main/webapp/translations/it.json index bed8c4c8c..49baab972 100644 --- a/guacamole/src/main/webapp/translations/it.json +++ b/guacamole/src/main/webapp/translations/it.json @@ -36,7 +36,7 @@ "INFO_ACTIVE_USER_COUNT" : "Ora utilizzato da {USERS} {USERS, plural, one{user} other{users}}.", - "NAME" : "Guacamole ${project.version}" + "NAME" : "Apache Guacamole ${project.version}" }, diff --git a/guacamole/src/main/webapp/translations/nl.json b/guacamole/src/main/webapp/translations/nl.json index f643b30e2..a9727e4f8 100644 --- a/guacamole/src/main/webapp/translations/nl.json +++ b/guacamole/src/main/webapp/translations/nl.json @@ -38,7 +38,7 @@ "INFO_ACTIVE_USER_COUNT" : "Op dit moment in gebruik door {USERS} {USERS, plural, one{gebruiker} other{gebruikers}}.", - "NAME" : "Guacamole ${project.version}", + "NAME" : "Apache Guacamole ${project.version}", "TEXT_HISTORY_DURATION" : "{VALUE} {UNIT, select, second{{VALUE, plural, one{seconde} other{seconden}}} minute{{VALUE, plural, one{minuut} other{minuten}}} hour{{VALUE, plural, one{uur} other{uren}}} day{{VALUE, plural, one{dag} other{dagen}}} other{}}" diff --git a/guacamole/src/main/webapp/translations/ru.json b/guacamole/src/main/webapp/translations/ru.json index 9fdd48fb9..4bb123418 100644 --- a/guacamole/src/main/webapp/translations/ru.json +++ b/guacamole/src/main/webapp/translations/ru.json @@ -35,7 +35,7 @@ "INFO_ACTIVE_USER_COUNT" : "Подключено пользователей {USERS}.", - "NAME" : "Guacamole ${project.version}", + "NAME" : "Apache Guacamole ${project.version}", "TEXT_HISTORY_DURATION" : "{VALUE} {UNIT, select, second{{VALUE, plural, one{секунда} other{сек}}} minute{{VALUE, plural, one{минута} other{мин}}} hour{{VALUE, plural, one{час} other{ч}}} day{{VALUE, plural, one{день} other{дн}}} other{}}" From e93e4c1063b029b8b3f03b4b31bc65f53c60c6b9 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 12 Apr 2016 00:30:00 -0700 Subject: [PATCH 2/3] GUACAMOLE-1: Separate name and version strings. --- guacamole/src/main/webapp/translations/de.json | 2 -- guacamole/src/main/webapp/translations/en.json | 5 +++-- guacamole/src/main/webapp/translations/fr.json | 2 -- guacamole/src/main/webapp/translations/it.json | 4 +--- guacamole/src/main/webapp/translations/nl.json | 2 -- guacamole/src/main/webapp/translations/ru.json | 2 -- 6 files changed, 4 insertions(+), 13 deletions(-) diff --git a/guacamole/src/main/webapp/translations/de.json b/guacamole/src/main/webapp/translations/de.json index 50fa4dce4..fd3003077 100644 --- a/guacamole/src/main/webapp/translations/de.json +++ b/guacamole/src/main/webapp/translations/de.json @@ -38,8 +38,6 @@ "INFO_ACTIVE_USER_COUNT" : "In Benutzung durch {USERS} Benutzer.", - "NAME" : "Apache Guacamole ${project.version}", - "TEXT_HISTORY_DURATION" : "{VALUE} {UNIT, select, second{{VALUE, plural, one{Sekunde} other{Sekunden}}} minute{{VALUE, plural, one{Minute} other{Minuten}}} hour{{VALUE, plural, one{Stunde} other{Stunden}}} day{{VALUE, plural, one{Tag} other{Tage}}} other{}}" }, diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index ff237bbe5..66ad359c6 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -4,6 +4,9 @@ "APP" : { + "NAME" : "Apache Guacamole", + "VERSION" : "${project.version}", + "ACTION_ACKNOWLEDGE" : "OK", "ACTION_CANCEL" : "Cancel", "ACTION_CLONE" : "Clone", @@ -38,8 +41,6 @@ "INFO_ACTIVE_USER_COUNT" : "Currently in use by {USERS} {USERS, plural, one{user} other{users}}.", - "NAME" : "Apache Guacamole ${project.version}", - "TEXT_HISTORY_DURATION" : "{VALUE} {UNIT, select, second{{VALUE, plural, one{second} other{seconds}}} minute{{VALUE, plural, one{minute} other{minutes}}} hour{{VALUE, plural, one{hour} other{hours}}} day{{VALUE, plural, one{day} other{days}}} other{}}" }, diff --git a/guacamole/src/main/webapp/translations/fr.json b/guacamole/src/main/webapp/translations/fr.json index 1835050d8..2fc9abdcb 100644 --- a/guacamole/src/main/webapp/translations/fr.json +++ b/guacamole/src/main/webapp/translations/fr.json @@ -38,8 +38,6 @@ "INFO_ACTIVE_USER_COUNT" : "Actuellement utilisé par {USERS} {USERS, plural, one{utilisateur} other{utilisateurs}}.", - "NAME" : "Apache Guacamole ${project.version}", - "TEXT_HISTORY_DURATION" : "{VALUE} {UNIT, select, second{{VALUE, plural, one{seconde} other{secondes}}} minute{{VALUE, plural, one{minute} other{minutes}}} hour{{VALUE, plural, one{heure} other{heures}}} day{{VALUE, plural, one{jour} other{jours}}} other{}}" }, diff --git a/guacamole/src/main/webapp/translations/it.json b/guacamole/src/main/webapp/translations/it.json index 49baab972..45e800909 100644 --- a/guacamole/src/main/webapp/translations/it.json +++ b/guacamole/src/main/webapp/translations/it.json @@ -34,9 +34,7 @@ "FORMAT_DATE_TIME_PRECISE" : "dd-MM-yyyy HH:mm:ss", - "INFO_ACTIVE_USER_COUNT" : "Ora utilizzato da {USERS} {USERS, plural, one{user} other{users}}.", - - "NAME" : "Apache Guacamole ${project.version}" + "INFO_ACTIVE_USER_COUNT" : "Ora utilizzato da {USERS} {USERS, plural, one{user} other{users}}." }, diff --git a/guacamole/src/main/webapp/translations/nl.json b/guacamole/src/main/webapp/translations/nl.json index a9727e4f8..14381452d 100644 --- a/guacamole/src/main/webapp/translations/nl.json +++ b/guacamole/src/main/webapp/translations/nl.json @@ -38,8 +38,6 @@ "INFO_ACTIVE_USER_COUNT" : "Op dit moment in gebruik door {USERS} {USERS, plural, one{gebruiker} other{gebruikers}}.", - "NAME" : "Apache Guacamole ${project.version}", - "TEXT_HISTORY_DURATION" : "{VALUE} {UNIT, select, second{{VALUE, plural, one{seconde} other{seconden}}} minute{{VALUE, plural, one{minuut} other{minuten}}} hour{{VALUE, plural, one{uur} other{uren}}} day{{VALUE, plural, one{dag} other{dagen}}} other{}}" }, diff --git a/guacamole/src/main/webapp/translations/ru.json b/guacamole/src/main/webapp/translations/ru.json index 4bb123418..a39124005 100644 --- a/guacamole/src/main/webapp/translations/ru.json +++ b/guacamole/src/main/webapp/translations/ru.json @@ -35,8 +35,6 @@ "INFO_ACTIVE_USER_COUNT" : "Подключено пользователей {USERS}.", - "NAME" : "Apache Guacamole ${project.version}", - "TEXT_HISTORY_DURATION" : "{VALUE} {UNIT, select, second{{VALUE, plural, one{секунда} other{сек}}} minute{{VALUE, plural, one{минута} other{мин}}} hour{{VALUE, plural, one{час} other{ч}}} day{{VALUE, plural, one{день} other{дн}}} other{}}" }, From eaca2d459d87c400703a3c3b14d36da275748d3f Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 12 Apr 2016 00:30:29 -0700 Subject: [PATCH 3/3] GUACAMOLE-1: Clean up login screen with respect to version number. --- .../main/webapp/app/login/styles/dialog.css | 29 +++++++++++++++++-- .../webapp/app/login/templates/login.html | 5 +++- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/guacamole/src/main/webapp/app/login/styles/dialog.css b/guacamole/src/main/webapp/app/login/styles/dialog.css index a414003f4..c9c6a4af6 100644 --- a/guacamole/src/main/webapp/app/login/styles/dialog.css +++ b/guacamole/src/main/webapp/app/login/styles/dialog.css @@ -71,11 +71,36 @@ } .login-ui .login-dialog .version { - font-size: 1.25em; - font-weight: bold; padding: 0.5em 0; +} + +.login-ui .login-dialog .version .app-name { + font-weight: bold; text-transform: uppercase; text-align: center; + font-size: 1.25em; +} + +.login-ui .login-dialog .version .version-number { + + position: absolute; + right: 0; + bottom: 0; + + padding: 0.25em 0.75em; + margin: 0.25em; + + -moz-border-radius: 0.5em; + -webkit-border-radius: 0.5em; + -khtml-border-radius: 0.5em; + border-radius: 0.5em; + + color: white; + background: green; + font-size: 0.5em; + font-style: italic; + opacity: 0.5; + } .login-ui .login-dialog .logo { diff --git a/guacamole/src/main/webapp/app/login/templates/login.html b/guacamole/src/main/webapp/app/login/templates/login.html index 65c052083..b9d9335f4 100644 --- a/guacamole/src/main/webapp/app/login/templates/login.html +++ b/guacamole/src/main/webapp/app/login/templates/login.html @@ -11,7 +11,10 @@ -
{{'APP.NAME' | translate}}
+
+
{{'APP.NAME' | translate}}
+
{{'APP.VERSION' | translate}}
+

{{helpText | translate}}