Updated TPS UI element IDs.

The TPS UI navigation elements have been updated to add the
missing names and to use better names. The checkbox IDs in various
pages have also been renamed for consistency.

The pki-ui.js has been modified to use the checkbox ID of the
template row instead of table name to construct the checkbox ID
of the actual rows.

https://fedorahosted.org/pki/ticket/1622

18 files changed, 43 insertions, 43 deletions

diff --git a/base/tps/shared/webapps/tps/ui/activities.html b/base/tps/shared/webapps/tps/ui/activities.html
index 0762401fd..32bc35ac7 100644
--- a/base/tps/shared/webapps/tps/ui/activities.html
+++ b/base/tps/shared/webapps/tps/ui/activities.html
@@ -36,7 +36,7 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="activity_selectall" type="checkbox"><label for="activity_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="activities-selectall" type="checkbox"><label for="activities-selectall">&nbsp;</label></th>
         <th>Activity ID</th>
         <th>Token ID</th>
         <th>User ID</th>
@@ -48,7 +48,7 @@
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="activity_select" type="checkbox"><label for="activity_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="activities-select" type="checkbox"><label for="activities-select">&nbsp;</label></td>
         <td name="id"><a href="#activities/${id}">${id}</a></td>
         <td name="tokenID">${tokenID}</td>
         <td name="userID">${userID}</td>
diff --git a/base/tps/shared/webapps/tps/ui/audit.html b/base/tps/shared/webapps/tps/ui/audit.html
index 06457de62..23012f214 100644
--- a/base/tps/shared/webapps/tps/ui/audit.html
+++ b/base/tps/shared/webapps/tps/ui/audit.html
@@ -71,14 +71,14 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="events_selectall" type="checkbox"><label for="events_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="audit-events-selectall" type="checkbox"><label for="audit-events-selectall">&nbsp;</label></th>
         <th class="pki-property-name-column">Name</th>
         <th>Value</th>
     </tr>
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="events_select" type="checkbox"><label for="events_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="audit-events-select" type="checkbox"><label for="audit-events-select">&nbsp;</label></td>
         <td name="id" class="pki-property-name-column"><a href="/tps/ui/audit/events/${id}">${id}</a></td>
         <td name="value">${value}</td>
     </tr>
diff --git a/base/tps/shared/webapps/tps/ui/authenticator.html b/base/tps/shared/webapps/tps/ui/authenticator.html
index 59d3e40b5..5a27eb8e0 100644
--- a/base/tps/shared/webapps/tps/ui/authenticator.html
+++ b/base/tps/shared/webapps/tps/ui/authenticator.html
@@ -75,14 +75,14 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="authenticator_selectall" type="checkbox"><label for="authenticator_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="authenticator-properties-selectall" type="checkbox"><label for="authenticator-properties-selectall">&nbsp;</label></th>
         <th class="pki-property-name-column">Name</th>
         <th>Value</th>
     </tr>
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="authenticator_select" type="checkbox"><label for="authenticator_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="authenticator-properties-select" type="checkbox"><label for="authenticator-properties-select">&nbsp;</label></td>
         <td name="id" class="pki-property-name-column"><a href="/tps/ui/authenticators/${parent.id}/properties/${id}">${id}</a></td>
         <td name="value">${value}</td>
     </tr>
diff --git a/base/tps/shared/webapps/tps/ui/authenticators.html b/base/tps/shared/webapps/tps/ui/authenticators.html
index f9b0b0a28..521e16e0d 100644
--- a/base/tps/shared/webapps/tps/ui/authenticators.html
+++ b/base/tps/shared/webapps/tps/ui/authenticators.html
@@ -37,14 +37,14 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="authenticator_selectall" type="checkbox"><label for="authenticator_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="authenticators-selectall" type="checkbox"><label for="authenticators-selectall">&nbsp;</label></th>
         <th>Source ID</th>
         <th>Status</th>
     </tr>
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="authenticator_select" type="checkbox"><label for="authenticator_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="authenticators-select" type="checkbox"><label for="authenticators-select">&nbsp;</label></td>
         <td name="id"><a href="#authenticators/${id}">${id}</a></td>
         <td name="status">${status}</td>
     </tr>
diff --git a/base/tps/shared/webapps/tps/ui/certs.html b/base/tps/shared/webapps/tps/ui/certs.html
index 52e229f7b..7d91162eb 100644
--- a/base/tps/shared/webapps/tps/ui/certs.html
+++ b/base/tps/shared/webapps/tps/ui/certs.html
@@ -38,7 +38,7 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="cert_selectall" type="checkbox"><label for="cert_selectall">&nbsp;</label></tdh>
+        <th class="pki-select-column"><input id="certs-selectall" type="checkbox"><label for="certs-selectall">&nbsp;</label></tdh>
         <th>Certificate ID</th>
         <th>Serial Number</th>
         <th>Subject</th>
@@ -52,7 +52,7 @@
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="cert_select" type="checkbox"><label for="cert_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="certs-select" type="checkbox"><label for="certs-select">&nbsp;</label></td>
         <td name="id"><a href="#certs/${id}">${id}</a></td>
         <td name="serialNumber">${serialNumber}</td>
         <td name="subject">${subject}</td>
diff --git a/base/tps/shared/webapps/tps/ui/config.html b/base/tps/shared/webapps/tps/ui/config.html
index 567ee9818..228ee6e74 100644
--- a/base/tps/shared/webapps/tps/ui/config.html
+++ b/base/tps/shared/webapps/tps/ui/config.html
@@ -55,14 +55,14 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="properties_selectall" type="checkbox"><label for="properties_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="config-selectall" type="checkbox"><label for="config-selectall">&nbsp;</label></th>
         <th class="pki-property-name-column">Name</th>
         <th>Value</th>
     </tr>
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="properties_select" type="checkbox"><label for="properties_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="config-select" type="checkbox"><label for="config-select">&nbsp;</label></td>
         <td name="id" class="pki-property-name-column"><a href="/tps/ui/config/properties/${id}">${id}</a></td>
         <td name="value">${value}</td>
     </tr>
diff --git a/base/tps/shared/webapps/tps/ui/connector.html b/base/tps/shared/webapps/tps/ui/connector.html
index 1a017df48..a0a8934b8 100644
--- a/base/tps/shared/webapps/tps/ui/connector.html
+++ b/base/tps/shared/webapps/tps/ui/connector.html
@@ -75,14 +75,14 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="connector_selectall" type="checkbox"><label for="connector_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="connector-properties-selectall" type="checkbox"><label for="connector-properties-selectall">&nbsp;</label></th>
         <th class="pki-property-name-column">Name</th>
         <th>Value</th>
     </tr>
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="connector_select" type="checkbox"><label for="connector_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="connector-properties-select" type="checkbox"><label for="connector-properties-select">&nbsp;</label></td>
         <td name="id" class="pki-property-name-column"><a href="/tps/ui/connectors/${parent.id}/properties/${id}">${id}</a></td>
         <td name="value">${value}</td>
     </tr>
diff --git a/base/tps/shared/webapps/tps/ui/connectors.html b/base/tps/shared/webapps/tps/ui/connectors.html
index 4d4d59772..2517b9e26 100644
--- a/base/tps/shared/webapps/tps/ui/connectors.html
+++ b/base/tps/shared/webapps/tps/ui/connectors.html
@@ -38,14 +38,14 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="connector_selectall" type="checkbox"><label for="connector_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="connectors-selectall" type="checkbox"><label for="connectors-selectall">&nbsp;</label></th>
         <th>Connector ID</th>
         <th>Status</th>
     </tr>
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="connector_select" type="checkbox"><label for="connector_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="connectors-select" type="checkbox"><label for="connectors-select">&nbsp;</label></td>
         <td name="id"><a href="#connectors/${id}">${id}</a></td>
         <td name="status">${status}</td>
     </tr>
diff --git a/base/tps/shared/webapps/tps/ui/group.html b/base/tps/shared/webapps/tps/ui/group.html
index df933815f..0f3d8872b 100644
--- a/base/tps/shared/webapps/tps/ui/group.html
+++ b/base/tps/shared/webapps/tps/ui/group.html
@@ -64,13 +64,13 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="members_selectall" type="checkbox"><label for="members_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="group-members-selectall" type="checkbox"><label for="group-members-selectall">&nbsp;</label></th>
         <th>User ID</th>
     </tr>
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="members_select" type="checkbox"><label for="members_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="group-members-select" type="checkbox"><label for="group-members-select">&nbsp;</label></td>
         <td name="id">${id}</td>
     </tr>
 </tbody>
diff --git a/base/tps/shared/webapps/tps/ui/groups.html b/base/tps/shared/webapps/tps/ui/groups.html
index 9f4239db8..246df1452 100644
--- a/base/tps/shared/webapps/tps/ui/groups.html
+++ b/base/tps/shared/webapps/tps/ui/groups.html
@@ -38,14 +38,14 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="group_selectall" type="checkbox"><label for="group_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="groups-selectall" type="checkbox"><label for="groups-selectall">&nbsp;</label></th>
         <th>Group ID</th>
         <th>Description</th>
     </tr>
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="group_select" type="checkbox"><label for="group_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="groups-select" type="checkbox"><label for="groups-select">&nbsp;</label></td>
         <td name="id"><a href="#groups/${id}">${id}</a></td>
         <td name="description">${description}</td>
     </tr>
diff --git a/base/tps/shared/webapps/tps/ui/index.html b/base/tps/shared/webapps/tps/ui/index.html
index 357ade514..4bf0ea94b 100644
--- a/base/tps/shared/webapps/tps/ui/index.html
+++ b/base/tps/shared/webapps/tps/ui/index.html
@@ -50,7 +50,7 @@ $(function() {
             tps.user = data;
             var roles = tps.user.Roles.Role;
 
-            var user = $("#user");
+            var user = $("#navigation [name=account] [name=username]");
             user.text(data.FullName);
 
             var accounts_menu = $("#navigation [name=accounts]");
@@ -383,22 +383,22 @@ $(function() {
 </div>
 <div class="collapse navbar-collapse navbar-collapse-1">
     <ul class="nav navbar-nav navbar-utility">
-    <li><a href="#">Status</a></li>
-    <li class="dropdown">
+    <li name="status"><a href="#">Status</a></li>
+    <li name="account" class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
         <span class="pficon pficon-user"></span>
-        <span id="user"></span><b class="caret"></b>
+        <span name="username"></span><b class="caret"></b>
         </a>
         <ul class="dropdown-menu">
-        <li><a href="#logout">Logout</a></li>
+        <li name="logout"><a href="#logout">Logout</a></li>
         </ul>
     </li>
     </ul>
     <ul class="nav navbar-nav navbar-primary">
-    <li><a href="#"><span class="glyphicon glyphicon-home"></span> Home</a></li>
-    <li><a href="#tokens">Tokens</a></li>
-    <li><a href="#certs">Certificates</a></li>
-    <li><a href="#activities">Activities</a></li>
+    <li name="home"><a href="#"><span class="glyphicon glyphicon-home"></span> Home</a></li>
+    <li name="tokens"><a href="#tokens">Tokens</a></li>
+    <li name="certs"><a href="#certs">Certificates</a></li>
+    <li name="activities"><a href="#activities">Activities</a></li>
     <li name="accounts" class="dropdown context" style="display: none;">
       <a href="#" class="dropdown-toggle" data-toggle="dropdown">
         Accounts
diff --git a/base/tps/shared/webapps/tps/ui/profile-mapping.html b/base/tps/shared/webapps/tps/ui/profile-mapping.html
index 47f24199b..51764df66 100644
--- a/base/tps/shared/webapps/tps/ui/profile-mapping.html
+++ b/base/tps/shared/webapps/tps/ui/profile-mapping.html
@@ -75,14 +75,14 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="profile_selectall" type="checkbox"><label for="profile_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="profile-mapping-properties-selectall" type="checkbox"><label for="profile-mapping-properties-selectall">&nbsp;</label></th>
         <th class="pki-property-name-column">Name</th>
         <th>Value</th>
     </tr>
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="profile_select" type="checkbox"><label for="profile_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="profile-mapping-properties-select" type="checkbox"><label for="profile-mapping-properties-select">&nbsp;</label></td>
         <td name="id" class="pki-property-name-column"><a href="/tps/ui/profile-mappings/${parent.id}/properties/${id}">${id}</a></td>
         <td name="value">${value}</td>
     </tr>
diff --git a/base/tps/shared/webapps/tps/ui/profile-mappings.html b/base/tps/shared/webapps/tps/ui/profile-mappings.html
index dc797bc18..428f46b5b 100644
--- a/base/tps/shared/webapps/tps/ui/profile-mappings.html
+++ b/base/tps/shared/webapps/tps/ui/profile-mappings.html
@@ -38,14 +38,14 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="profile_mapping_selectall" type="checkbox"><label for="profile_mapping_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="profile-mappings-selectall" type="checkbox"><label for="profile-mappings-selectall">&nbsp;</label></th>
         <th>Profile Mapping ID</th>
         <th>Status</th>
     </tr>
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="profile_mapping_select" type="checkbox"><label for="profile_mapping_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="profile-mappings-select" type="checkbox"><label for="profile-mappings-select">&nbsp;</label></td>
         <td name="id"><a href="#profile-mappings/${id}">${id}</a></td>
         <td name="status">${status}</td>
     </tr>
diff --git a/base/tps/shared/webapps/tps/ui/profile.html b/base/tps/shared/webapps/tps/ui/profile.html
index d1994c896..5ab017892 100644
--- a/base/tps/shared/webapps/tps/ui/profile.html
+++ b/base/tps/shared/webapps/tps/ui/profile.html
@@ -75,14 +75,14 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="profile_selectall" type="checkbox"><label for="profile_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="profile-properties-selectall" type="checkbox"><label for="profile-properties-selectall">&nbsp;</label></th>
         <th class="pki-property-name-column">Name</th>
         <th>Value</th>
     </tr>
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="profile_select" type="checkbox"><label for="profile_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="profile-properties-select" type="checkbox"><label for="profile-properties-select">&nbsp;</label></td>
         <td name="id" class="pki-property-name-column"><a href="/tps/ui/profiles/${parent.id}/properties/${id}">${id}</a></td>
         <td name="value">${value}</td>
     </tr>
diff --git a/base/tps/shared/webapps/tps/ui/profiles.html b/base/tps/shared/webapps/tps/ui/profiles.html
index 00218e5f7..9f2c302f2 100644
--- a/base/tps/shared/webapps/tps/ui/profiles.html
+++ b/base/tps/shared/webapps/tps/ui/profiles.html
@@ -38,14 +38,14 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="profile_selectall" type="checkbox"><label for="profile_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="profiles-selectall" type="checkbox"><label for="profiles-selectall">&nbsp;</label></th>
         <th>Profile ID</th>
         <th>Status</th>
     </tr>
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="profile_select" type="checkbox"><label for="profile_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="profiles-select" type="checkbox"><label for="profiles-select">&nbsp;</label></td>
         <td name="id"><a href="#profiles/${id}">${id}</a></td>
         <td name="status">${status}</td>
     </tr>
diff --git a/base/tps/shared/webapps/tps/ui/selftests.html b/base/tps/shared/webapps/tps/ui/selftests.html
index 2b428e2d2..95bafeaff 100644
--- a/base/tps/shared/webapps/tps/ui/selftests.html
+++ b/base/tps/shared/webapps/tps/ui/selftests.html
@@ -36,7 +36,7 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="selftest_selectall" type="checkbox"><label for="selftest_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="selftests-selectall" type="checkbox"><label for="selftests-selectall">&nbsp;</label></th>
         <th>Self Test ID</th>
         <th>Enabled at Statup</th>
         <th>Critical at Startup</th>
@@ -46,7 +46,7 @@
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="selftest_select" type="checkbox"><label for="selftest_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="selftests-select" type="checkbox"><label for="selftests-select">&nbsp;</label></td>
         <td name="id"><a href="#selftests/${id}">${id}</a></td>
         <td name="enabledAtStartup">${enabledAtStartup}</td>
         <td name="criticalAtStartup">${criticalAtStartup}</td>
diff --git a/base/tps/shared/webapps/tps/ui/tokens.html b/base/tps/shared/webapps/tps/ui/tokens.html
index aca579a68..06d4fdf2a 100644
--- a/base/tps/shared/webapps/tps/ui/tokens.html
+++ b/base/tps/shared/webapps/tps/ui/tokens.html
@@ -38,7 +38,7 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="token_selectall" type="checkbox"><label for="token_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="tokens-selectall" type="checkbox"><label for="tokens-selectall">&nbsp;</label></th>
         <th>Token ID</th>
         <th>User ID</th>
         <th>Type</th>
@@ -52,7 +52,7 @@
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="token_select" type="checkbox"><label for="token_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="tokens-select" type="checkbox"><label for="tokens-select">&nbsp;</label></td>
         <td name="id"><a href="#tokens/${id}">${id}</a></td>
         <td name="userID">${userID}</td>
         <td name="type">${type}</td>
diff --git a/base/tps/shared/webapps/tps/ui/users.html b/base/tps/shared/webapps/tps/ui/users.html
index 18d59c9de..76a33e9f9 100644
--- a/base/tps/shared/webapps/tps/ui/users.html
+++ b/base/tps/shared/webapps/tps/ui/users.html
@@ -38,14 +38,14 @@
          </th>
     </tr>
     <tr>
-        <th class="pki-select-column"><input id="user_selectall" type="checkbox"><label for="user_selectall">&nbsp;</label></th>
+        <th class="pki-select-column"><input id="users-selectall" type="checkbox"><label for="users-selectall">&nbsp;</label></th>
         <th>User ID</th>
         <th>Full Name</th>
     </tr>
 </thead>
 <tbody>
     <tr>
-        <td class="pki-select-column"><input id="user_select" type="checkbox"><label for="user_select">&nbsp;</label></td>
+        <td class="pki-select-column"><input id="users-select" type="checkbox"><label for="users-select">&nbsp;</label></td>
         <td name="id"><a href="#users/${id}">${id}</a></td>
         <td name="fullName">${fullName}</td>
     </tr>