From 3273cd2645fc626456945d1050547b6b5b1629bc Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 19 Mar 2015 13:00:51 -0700
Subject: [PATCH] GUAC-1132: Flesh out stubbed session-related translation
 text. Mark "Kill Sessions" button as dangerous.

---
 .../main/webapp/app/manage/templates/manageSessions.html    | 6 +++++-
 guacamole/src/main/webapp/translations/en_US.json           | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/guacamole/src/main/webapp/app/manage/templates/manageSessions.html b/guacamole/src/main/webapp/app/manage/templates/manageSessions.html
index 98c86ab19..144b09024 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageSessions.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageSessions.html
@@ -32,7 +32,11 @@ THE SOFTWARE.
         <div class="sessions">
 
             <p>{{'MANAGE_SESSION.HELP_SESSIONS' | translate}}</p>
-            <button class="delete-sessions" ng-disabled="!canDeleteSessions()" ng-click="deleteSessions()">{{'MANAGE_SESSION.ACTION_DELETE' | translate}}</button>
+
+            <!-- Form action buttons -->
+            <div class="action-buttons">
+                <button class="delete-sessions danger" ng-disabled="!canDeleteSessions()" ng-click="deleteSessions()">{{'MANAGE_SESSION.ACTION_DELETE' | translate}}</button>
+            </div>
 
             <!-- List of current user sessions -->
             <table class="session-list">
diff --git a/guacamole/src/main/webapp/translations/en_US.json b/guacamole/src/main/webapp/translations/en_US.json
index b8e5f8039..0f85ddd09 100644
--- a/guacamole/src/main/webapp/translations/en_US.json
+++ b/guacamole/src/main/webapp/translations/en_US.json
@@ -238,12 +238,12 @@
         
         "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE",
         "ACTION_CANCEL"      : "@:APP.ACTION_CANCEL",
-        "ACTION_DELETE"      : "Kill all selected sessions",
+        "ACTION_DELETE"      : "Kill Sessions",
         
         "DIALOG_HEADER_CONFIRM_DELETE" : "Kill Sessions",
         "DIALOG_HEADER_ERROR"          : "Error",
         
-        "HELP_SESSIONS" : "Click to kill a user session.",
+        "HELP_SESSIONS" : "All currently-active Guacamole sessions are listed here. If you wish to kill one or more sessions, check the box next to those sessions and click \"Kill Sessions\". Killing a session will immediately disconnect the user from the associated connection.",
         
         "SECTION_HEADER_SESSIONS" : "Sessions",
         
@@ -252,7 +252,7 @@
         "TABLE_HEADER_SESSION_REMOTEHOST"      : "Remote host",
         "TABLE_HEADER_SESSION_CONNECTION_NAME" : "Connection name",
         
-        "TEXT_CONFIRM_DELETE" : "Are you sure you want to kill these sessions?"
+        "TEXT_CONFIRM_DELETE" : "Are you sure you want to kill all selected sessions? The users using these sessions will be immediately disconnected."
 
     },