Merge pull request #965 from spadgett/show-system-roles-checkbox

Merged by openshift-bot
openshift · Dec 8, 2016 · e06dfb5 · e06dfb5
2 parents eee4d13 + c9ee4f4
commit e06dfb5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 25 deletions.
diff --git a/app/views/membership.html b/app/views/membership.html
@@ -273,23 +273,15 @@ <h3>
                     flex row tablet="column" mobile="column">
                     <div class="col-roles hidden-xs" flex>&nbsp;</div>
                     <div class="col-add-role" row>
-                      <input
-                        id="show-hidden-roles"
-                        type="checkbox"
-                        class="toggle-hidden"
-                        ng-click="showAllRoles($event)">
-                        &nbsp;
-                      <label for="show-hidden-roles">
-                        Show hidden roles
-                      </label>
-                      <a
-                        href=""
-                        class="action-inline"
-                        data-toggle="popover"
-                        data-trigger="focus"
-                        data-content="System roles are hidden by default and do not typically need to be managed.">
-                        <i class="pficon pficon-help"></i>
-                      </a>
+                      <div class="checkbox">
+                        <label>
+                          <input type="checkbox" class="toggle-hidden" ng-click="showAllRoles($event)">
+                          Show hidden roles</label>&nbsp;<a href=""
+                                                            class="action-inline"
+                                                            data-toggle="popover"
+                                                            data-trigger="hover focus"
+                                                            data-content="System roles are hidden by default and do not typically need to be managed."><i class="pficon pficon-help"></i></a>
+                      </div>
                     </div>
                   </div>
                 </div>

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -9520,14 +9520,11 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"action-set\" flex row tablet=\"column\" mobile=\"column\">\n" +
     "<div class=\"col-roles hidden-xs\" flex>&nbsp;</div>\n" +
     "<div class=\"col-add-role\" row>\n" +
-    "<input id=\"show-hidden-roles\" type=\"checkbox\" class=\"toggle-hidden\" ng-click=\"showAllRoles($event)\">\n" +
-    "&nbsp;\n" +
-    "<label for=\"show-hidden-roles\">\n" +
-    "Show hidden roles\n" +
-    "</label>\n" +
-    "<a href=\"\" class=\"action-inline\" data-toggle=\"popover\" data-trigger=\"focus\" data-content=\"System roles are hidden by default and do not typically need to be managed.\">\n" +
-    "<i class=\"pficon pficon-help\"></i>\n" +
-    "</a>\n" +
+    "<div class=\"checkbox\">\n" +
+    "<label>\n" +
+    "<input type=\"checkbox\" class=\"toggle-hidden\" ng-click=\"showAllRoles($event)\">\n" +
+    "Show hidden roles</label>&nbsp;<a href=\"\" class=\"action-inline\" data-toggle=\"popover\" data-trigger=\"hover focus\" data-content=\"System roles are hidden by default and do not typically need to be managed.\"><i class=\"pficon pficon-help\"></i></a>\n" +
+    "</div>\n" +
     "</div>\n" +
     "</div>\n" +
     "</div>\n" +