Rearranged TPS UI menu items.

The Users and Groups menu items in TPS UI are now grouped under a
new Accounts dropdown menu. The Profiles and Profile Mappings have
been moved into Configurations. The Authenticators and Connections
have been renames to Authentication Sources and Subsystem
Connections.

Ticket #654

7 files changed, 22 insertions, 22 deletions

diff --git a/base/tps-tomcat/shared/webapps/tps/ui/authenticator.html b/base/tps-tomcat/shared/webapps/tps/ui/authenticator.html
index c5be7dfd9..9003d7dcf 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/authenticator.html
+++ b/base/tps-tomcat/shared/webapps/tps/ui/authenticator.html
@@ -17,13 +17,13 @@
      --- END COPYRIGHT BLOCK --- -->
 <div class="pki-header">
 
-<span class="pki-title">Authenticator <span name="id"></span></span>
+<span class="pki-title">Authentication Source <span name="id"></span></span>
 
 <span class="pki-actions">
 
 <span class="pki-menu" style="display: none;">
-<a name="edit" href="#">Edit Authenticator</a><br>
-<a name="enable" href="#">Enable Authenticator</a><a name="disable" href="#" style="display: none;">Disable Authenticator</a><br>
+<a name="edit" href="#">Edit</a><br>
+<a name="enable" href="#">Enable</a><a name="disable" href="#" style="display: none;">Disable</a><br>
 </span>
 
 <span class="pki-buttons" style="display: none;">
@@ -37,7 +37,7 @@
 
 <div name="authenticator" class="pki-fields">
 <fieldset>
-    <label>Authenticator ID</label>
+    <label>Source ID</label>
     <input name="authenticatorID" readonly="readonly">
     <br>
     <label>Status</label>
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/authenticators.html b/base/tps-tomcat/shared/webapps/tps/ui/authenticators.html
index 1d8311779..e3a7be10c 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/authenticators.html
+++ b/base/tps-tomcat/shared/webapps/tps/ui/authenticators.html
@@ -16,7 +16,7 @@
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <div class="pki-header">
-<span class="pki-title">Authenticators</span>
+<span class="pki-title">Authentication Sources</span>
 </div>
 
 <table name="authenticators">
@@ -34,7 +34,7 @@
     </tr>
     <tr>
         <th class="pki-select-column"><input id="authenticator_selectall" type="checkbox"><label for="authenticator_selectall">&nbsp;</label></th>
-        <th>Authenticator ID</th>
+        <th>Source ID</th>
         <th>Status</th>
     </tr>
 </thead>
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/connection.html b/base/tps-tomcat/shared/webapps/tps/ui/connection.html
index 8c24cc72a..62ad77bae 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/connection.html
+++ b/base/tps-tomcat/shared/webapps/tps/ui/connection.html
@@ -17,13 +17,13 @@
      --- END COPYRIGHT BLOCK --- -->
 <div class="pki-header">
 
-<span class="pki-title">Connection <span name="id"></span></span>
+<span class="pki-title">Subsystem Connection <span name="id"></span></span>
 
 <span class="pki-actions">
 
 <span class="pki-menu" style="display: none;">
-<a name="edit" href="#">Edit Connection</a><br>
-<a name="enable" href="#">Enable Connection</a><a name="disable" href="#" style="display: none;">Disable Connection</a><br>
+<a name="edit" href="#">Edit</a><br>
+<a name="enable" href="#">Enable</a><a name="disable" href="#" style="display: none;">Disable</a><br>
 </span>
 
 <span class="pki-buttons" style="display: none;">
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/connections.html b/base/tps-tomcat/shared/webapps/tps/ui/connections.html
index 8b8c16719..3f2d2dae7 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/connections.html
+++ b/base/tps-tomcat/shared/webapps/tps/ui/connections.html
@@ -16,7 +16,7 @@
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <div class="pki-header">
-<span class="pki-title">Connections</span>
+<span class="pki-title">Subsystem Connections</span>
 </div>
 
 <table name="connections">
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/index.html b/base/tps-tomcat/shared/webapps/tps/ui/index.html
index 41732a8e1..727a2b4ac 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/index.html
+++ b/base/tps-tomcat/shared/webapps/tps/ui/index.html
@@ -103,27 +103,27 @@ $(function() {
     <li><a href="#tokens">Tokens</a></li>
     <li><a href="#certs">Certificates</a></li>
     <li><a href="#activities">Activities</a></li>
+    <li><a href="#selftests">SelfTests</a></li>
     <li class="dropdown context">
       <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-        Profiles
+        Accounts
         <b class="caret"></b>
       </a>
       <ul class="dropdown-menu">
-        <li><a href="#profiles">Profiles</a></li>
-        <li><a href="#profileMappings">Profile Mappings</a></li>
+        <li><a href="#users">Users</a></li>
+        <li><a href="#groups">Groups</a></li>
       </ul>
     </li>
-    <li><a href="#selftests">SelfTests</a></li>
-    <li><a href="#users">Users</a></li>
-    <li><a href="#groups">Groups</a></li>
     <li class="dropdown context">
       <a href="#" class="dropdown-toggle" data-toggle="dropdown">
         Configuration
         <b class="caret"></b>
       </a>
       <ul class="dropdown-menu">
-        <li><a href="#authenticators">Authenticators</a></li>
-        <li><a href="#connections">Connections</a></li>
+        <li><a href="#authenticators">Authentication Sources</a></li>
+        <li><a href="#connections">Subsystem Connections</a></li>
+        <li><a href="#profiles">Profiles</a></li>
+        <li><a href="#profileMappings">Profile Mappings</a></li>
       </ul>
     </li>
     </ul>
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/profile-mapping.html b/base/tps-tomcat/shared/webapps/tps/ui/profile-mapping.html
index 4bd76b731..cf2fd632d 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/profile-mapping.html
+++ b/base/tps-tomcat/shared/webapps/tps/ui/profile-mapping.html
@@ -22,8 +22,8 @@
 <span class="pki-actions">
 
 <span class="pki-menu" style="display: none;">
-<a name="edit" href="#">Edit Profile Mapping</a><br>
-<a name="enable" href="#">Enable Profile Mapping</a><a name="disable" href="#" style="display: none;">Disable Profile Mapping</a><br>
+<a name="edit" href="#">Edit</a><br>
+<a name="enable" href="#">Enable</a><a name="disable" href="#" style="display: none;">Disable</a><br>
 </span>
 
 <span class="pki-buttons" style="display: none;">
diff --git a/base/tps-tomcat/shared/webapps/tps/ui/profile.html b/base/tps-tomcat/shared/webapps/tps/ui/profile.html
index 51f9bf6c0..874c431d8 100644
--- a/base/tps-tomcat/shared/webapps/tps/ui/profile.html
+++ b/base/tps-tomcat/shared/webapps/tps/ui/profile.html
@@ -22,8 +22,8 @@
 <span class="pki-actions">
 
 <span class="pki-menu" style="display: none;">
-<a name="edit" href="#">Edit Profile</a><br>
-<a name="enable" href="#">Enable Profile</a><a name="disable" href="#" style="display: none;">Disable Profile</a><br>
+<a name="edit" href="#">Edit</a><br>
+<a name="enable" href="#">Enable</a><a name="disable" href="#" style="display: none;">Disable</a><br>
 </span>
 
 <span class="pki-buttons" style="display: none;">