Changeset 2799

Timestamp:

03/03/2010 09:28:01 AM (16 years ago)

Author:

johnjamesjacoby

Message:

IE7 fixes for xprofile field group reorder. Also fix issue with nested sortables.

Location:

trunk/bp-xprofile

Files:

• admin/css/admin.css (modified) (4 diffs)
• admin/js/admin.js (modified) (4 diffs)
• bp-xprofile-admin.php (modified) (1 diff)

trunk/bp-xprofile/admin/css/admin.css

@@ -1 @@
-
-div.sortable {
-        margin-bottom: 20px;
-}
-
+/* Profile field group main admin page */
 table.field-group {
         margin-bottom: 20px;
-}
-table.field-group.ui-sortable-helper {
-        filter: alpha(opacity=50);
-        opacity: 0.5;
-}
-table.field-group.ui-sortable-placeholder {
-        border: 2px dashed #ddd;
-        visibility: visible !important;
-        margin-bottom: 22px;
-        background-color: transparent;
-}
-
-table.field-group thead tr.grabber {
-        cursor: move;
-}
-
-table.field-group tbody {
-        cursor: move;
-}
+        background-color: #fafafa;
+        }
+        table.field-group.ui-sortable-placeholder {
+                border: 2px dashed #ddd;
+                visibility: visible !important;
+                background-color: transparent;
+                width: 100%;
+                margin-bottom: 20px;
+        }
+        table.field-group thead tr.grabber,
+        table.field-group tbody {
+                cursor: move;
+        }
         table.field-group tbody tr.nodrag {
                 cursor: default !important;
         }
-
-table.field-group tbody tr:hover {
-        background-color: #fffee9;
-}
+        table.field-group tbody tr.ui-sortable-placeholder {
+                visibility: visible !important;
+                display: block !important;
+                background-color: #fafafa;
+        }
+        table.field-group td {
+                background-color: #fff;
+        }
+        table.field-group tbody tr:hover td {
+                background-color: #fffee9;
+        }
         
 tr.header td {
@@ -43 +40 @@
         font-size: 16px;
 }
-        
+
         ul.forTab {
                 list-style: none;
@@ -55 +52 @@
                         ul.forTab li label {
                                 display: block;
-                                
                         }
         
@@ -78 +74 @@
 
         select.multi-select{
-            width:90%;
-        height:10em !important;
+                width:90%;
+                height:10em !important;
         }
 
 ul.multi-checkbox {
-    margin: 0 5px 0 0px;
-    padding: .5em .9em;
-    height: 10em;
-    overflow: auto;
-    list-style: none;
-    border: solid 1px #ccc;
-    width:90%;           
+        margin: 0 5px 0 0px;
+        padding: .5em .9em;
+        height: 10em;
+        overflow: auto;
+        list-style: none;
+        border: solid 1px #ccc;
+        width: 90%;
 }
 
 ul.multi-checkbox li{
-    padding: 0;
-    margin: 0;
+        padding: 0;
+        margin: 0;
 }
 

trunk/bp-xprofile/admin/js/admin.js

@@ -110 +110 @@
                 axis: 'y',
                 helper: fixHelper,
-                distance: 1,
-                cancel: 'table.nodrag',
+                opacity: 0.6,
+                items: 'table',
+                cancel: 'tbody,tfoot',
+                tolerance: 'pointer',
                 update: function() {
                         jQuery.post( ajaxurl, {
@@ -122 +124 @@
                 }
         });
+        jQuery("form#profile-field-form div#field-groups").disableSelection();
 
         jQuery("table.field-group tbody").sortable( {
@@ -127 +130 @@
                 axis: 'y',
                 helper: fixHelper,
-                distance: 1,
+                opacity: 0.6,
+                items: 'tr',
                 cancel: 'tr.nodrag',
+                connectWith: 'table.field-group tbody',
+                tolerance: 'pointer',
                 update: function() { 
                         jQuery.post( ajaxurl, {
@@ -139 +145 @@
                 }
         });
+        jQuery("table.field-group tbody").disableSelection();
 } );

trunk/bp-xprofile/bp-xprofile-admin.php

@@ -67 +67 @@
                                                         <thead>
                                                                 <tr class="grabber">
-                                                                        <th scope="col" width="10">&nbsp;</th>
+                                                                        <th scope="col" width="10"><img src="<?php echo BP_PLUGIN_URL ?>/bp-xprofile/admin/images/move.gif" alt="<?php _e( 'Drag', 'buddypress' ) ?>" /></th>
                                                                         <th scope="col" colspan="<?php if ( $group->can_delete ) { ?>3<?php } else { ?>5<?php } ?>"><?php echo attribute_escape( $group->name ); ?></th>
 <?php