Changeset 9143

Timestamp:

11/14/2014 03:16:38 PM (10 years ago)

Author:

boonebgorges

Message:

Improve labeling and validation behavior of notifications Bulk Action dropdown.

Props lakrisgubben, hnla.
Fixes #5513.

Location:

trunk/src

Files:

• bp-notifications/bp-notifications-template.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress/members/single/notifications/notifications-loop.php (modified) (1 diff)
• bp-templates/bp-legacy/css/buddypress.css (modified) (3 diffs)
• bp-templates/bp-legacy/js/buddypress.js (modified) (1 diff)

trunk/src/bp-notifications/bp-notifications-template.php

@@ -1058 +1058 @@
 function bp_notifications_bulk_management_dropdown() {
     ?>
+    <label class="bp-screen-reader-text" for="notification-select"><?php _e( 'Select Bulk Action', 'buddypress' ); ?></label>
     <select name="notification_bulk_action" id="notification-select">
         <option value="" selected="selected"><?php _e( 'Bulk Actions', 'buddypress' ); ?></option>

trunk/src/bp-templates/bp-legacy/buddypress/members/single/notifications/notifications-loop.php

@@ -4 +4 @@
             <tr>
                 <th class="icon"></th>
-                <th><label for="select-all-notifications"><?php _e( 'Select all', 'buddypress' ); ?></label><input id="select-all-notifications" type="checkbox"></th>
+                <th><label class="bp-screen-reader-text" for="select-all-notifications"><?php _e( 'Select all', 'buddypress' ); ?></label><input id="select-all-notifications" type="checkbox"></th>
                 <th class="title"><?php _e( 'Notification', 'buddypress' ); ?></th>
                 <th class="date"><?php _e( 'Date Received', 'buddypress' ); ?></th>

trunk/src/bp-templates/bp-legacy/css/buddypress.css

@@ -729 +729 @@
     float: right;
 }
-#buddypress .standard-form #blog-details-section {
-    clear: left;
-}
-#buddypress label[for="select-all-notifications"] {
-    display: none;
-}
+#buddypress .standard-form #blog-details-section,
 #buddypress #notifications-bulk-management {
     clear: left;
 }
+body.no-js #buddypress #notifications-bulk-management #select-all-notifications,
+body.no-js #buddypress label[for="message-type-select"],
+body.no-js #buddypress #message-type-select,
+body.no-js #buddypress #delete_inbox_messages,
+body.no-js #buddypress #delete_sentbox_messages,
 body.no-js #buddypress #notifications-bulk-management #select-all-notifications {
     display: none;
@@ -828 +828 @@
     padding: 0 10px 1px;
 }
+
+/* Form classes & generic attr styling */
+#buddypress form *[disabled="disabled"]{
+    cursor: default;
+    opacity: .4;
+ }
+.bp-screen-reader-text {
+    clip: rect(1px, 1px, 1px, 1px);
+    position: absolute;
+}
+
 /*--------------------------------------------------------------
 3.6 - Ajax Loading
@@ -872 +883 @@
 #buddypress input[type="button"].disabled,
 #buddypress input[type="reset"].disabled,
+#buddypress input[type="submit"][disabled=disabled],
 #buddypress button.pending,
 #buddypress button.disabled,

trunk/src/bp-templates/bp-legacy/js/buddypress.js

@@ -1537 +1537 @@
             });
         }
+    });
+
+    /* Make sure a 'Bulk Action' is selected before submiting the form */
+    jq('#notification-bulk-manage').attr('disabled', 'disabled');
+
+    /* Remove the disabled attribute from the form submit button when bulk action has a value */
+    jq('#notification-select').on('change', function(){
+        jq('#notification-bulk-manage').attr('disabled', jq(this).val().length <= 0);
     });