瀏覽代碼

HUE-5964 [useradmin] Converted ID elements to classes

Enrico Berti 8 年之前
父節點
當前提交
7f2d684035

+ 10 - 10
apps/useradmin/src/useradmin/templates/list_groups.mako

@@ -37,7 +37,7 @@ ${layout.menubar(section='groups')}
       </%def>
       <%def name="actions()">
         %if user.is_superuser:
-            <button id="deleteGroupBtn" class="btn confirmationModal" title="${_('Delete')}" disabled="disabled"><i class="fa fa-trash-o"></i> ${_('Delete')}</button>
+            <button class="btn delete-group-btn confirmationModal" title="${_('Delete')}" disabled="disabled"><i class="fa fa-trash-o"></i> ${_('Delete')}</button>
         %endif
       </%def>
       <%def name="creation()">
@@ -61,7 +61,7 @@ ${layout.menubar(section='groups')}
       <tr>
         %if user.is_superuser:
             <th width="1%">
-              <div id="selectAll" class="hueCheckbox fa"></div>
+              <div class="select-all hueCheckbox fa"></div>
             </th>
         %endif
         <th>${_('Group Name')}</th>
@@ -103,12 +103,12 @@ ${layout.menubar(section='groups')}
       </tfoot>
     </table>
   </div>
-  <div id="deleteGroup" class="modal hide fade groupModal">
-    <form id="deleteGroupForm" action="${ url('useradmin.views.delete_group') }" method="POST">
+  <div class="modal hide fade delete-group">
+    <form action="${ url('useradmin.views.delete_group') }" method="POST">
       ${ csrf_token(request) | n,unicode }
       <div class="modal-header">
         <a href="#" class="close" data-dismiss="modal">&times;</a>
-        <h3 id="deleteGroupMessage">${_("Are you sure you want to delete the selected group(s)?")}</h3>
+        <h3>${_("Are you sure you want to delete the selected group(s)?")}</h3>
       </div>
       <div class="modal-footer">
         <a href="javascript:void(0);" class="btn" data-dismiss="modal">${_('No')}</a>
@@ -171,7 +171,7 @@ ${layout.menubar(section='groups')}
     $groupsComponents.find(".dataTables_wrapper").css("min-height", "0");
     $groupsComponents.find(".dataTables_filter").hide();
 
-    $groupsComponents.find("#selectAll").click(function () {
+    $groupsComponents.find(".select-all").click(function () {
       if ($(this).attr("checked")) {
         $(this).removeAttr("checked").removeClass("fa-check");
         $groupsComponents.find(".groupCheck").removeClass("fa-check").removeAttr("checked");
@@ -195,21 +195,21 @@ ${layout.menubar(section='groups')}
 
     function toggleActions() {
       if ($groupsComponents.find(".groupCheck[checked='checked']").length > 0) {
-        $groupsComponents.find("#deleteGroupBtn").removeAttr("disabled");
+        $groupsComponents.find(".delete-group-btn").removeAttr("disabled");
       }
       else {
-        $groupsComponents.find("#deleteGroupBtn").attr("disabled", "disabled");
+        $groupsComponents.find(".delete-group-btn").attr("disabled", "disabled");
       }
     }
 
-    $groupsComponents.find("#deleteGroupBtn").click(function () {
+    $groupsComponents.find(".delete-group-btn").click(function () {
       viewModel.chosenGroups.removeAll();
 
       $groupsComponents.find(".hueCheckbox[checked='checked']").each(function (index) {
         viewModel.chosenGroups.push($(this).data("name").toString()); // needed for numeric group names
       });
 
-      $groupsComponents.find("#deleteGroup").modal("show");
+      $groupsComponents.find(".delete-group").modal("show");
     });
 
     $groupsComponents.find("a[data-row-selector='true']").jHueRowSelector();

+ 13 - 15
apps/useradmin/src/useradmin/templates/list_users.mako

@@ -36,7 +36,7 @@ ${layout.menubar(section='users')}
       </%def>
       <%def name="actions()">
         %if user.is_superuser:
-            <button id="deleteUserBtn" class="btn" title="${_('Delete')}" disabled="disabled"><i class="fa fa-trash-o"></i> ${_('Delete')}</button>
+            <button class="btn delete-user-btn" title="${_('Delete')}" disabled="disabled"><i class="fa fa-trash-o"></i> ${_('Delete')}</button>
         %endif
       </%def>
       <%def name="creation()">
@@ -66,7 +66,7 @@ ${layout.menubar(section='users')}
       <tr>
         %if user.is_superuser:
             <th width="1%">
-              <div id="selectAll" class="hueCheckbox fa"></div>
+              <div class="select-all hueCheckbox fa"></div>
             </th>
         %endif
         <th>${_('Username')}</th>
@@ -117,21 +117,19 @@ ${layout.menubar(section='users')}
 
   <div id="syncLdap" class="modal hide fade"></div>
 
-  <div id="deleteUser" class="modal hide fade">
-    <form id="dropTableForm" action="${ url('useradmin.views.delete_user') }" method="POST">
+  <div class="modal hide fade delete-user">
+    <form action="${ url('useradmin.views.delete_user') }" method="POST">
       ${ csrf_token(request) | n,unicode }
       <div class="modal-header">
         <a href="#" class="close" data-dismiss="modal">&times;</a>
-
-        <h3 id="deleteUserMessage">${ _("Are you sure you want to delete the selected user(s)?") }</h3>
+        <h3>${ _("Are you sure you want to delete the selected user(s)?") }</h3>
       </div>
       <div class="modal-footer">
         <a href="#" class="btn" data-dismiss="modal">${_('No')}</a>
         <input type="submit" class="btn btn-danger" value="${_('Yes')}"/>
       </div>
       <div class="hide">
-        <select name="user_ids" data-bind="options: availableUsers, selectedOptions: chosenUsers"
-                multiple="true"></select>
+        <select name="user_ids" data-bind="options: availableUsers, selectedOptions: chosenUsers" multiple="true"></select>
       </div>
     </form>
   </div>
@@ -198,13 +196,13 @@ ${layout.menubar(section='users')}
         },
         dataType: "html",
         success: function (data) {
-          $("#deleteUser").html(data);
-          $("#deleteUser").modal("show");
+          $usersComponents.find(".delete-user").html(data);
+          $usersComponents.find(".delete-user").modal("show");
         }
       });
     });
 
-    $usersComponents.find("#selectAll").click(function () {
+    $usersComponents.find(".select-all").click(function () {
       if ($(this).attr("checked")) {
         $(this).removeAttr("checked").removeClass("fa-check");;
         $usersComponents.find(".userCheck").removeClass("fa-check").removeAttr("checked");
@@ -228,21 +226,21 @@ ${layout.menubar(section='users')}
 
     function toggleActions() {
       if ($usersComponents.find(".userCheck[checked='checked']").length >= 1) {
-        $usersComponents.find("#deleteUserBtn").removeAttr("disabled");
+        $usersComponents.find(".delete-user-btn").removeAttr("disabled");
       }
       else {
-        $usersComponents.find("#deleteUserBtn").attr("disabled", "disabled");
+        $usersComponents.find(".delete-user-btn").attr("disabled", "disabled");
       }
     }
 
-    $usersComponents.find("#deleteUserBtn").click(function () {
+    $usersComponents.find(".delete-user-btn").click(function () {
       viewModel.chosenUsers.removeAll();
 
       $usersComponents.find(".hueCheckbox[checked='checked']").each(function (index) {
         viewModel.chosenUsers.push($(this).data("id"));
       });
 
-      $usersComponents.find("#deleteUser").modal("show");
+      $usersComponents.find(".delete-user").modal("show");
     });
 
     $usersComponents.find("a[data-row-selector='true']").jHueRowSelector();