* (bug 15701) Protection form was too wide for some browsers as 2 columns, switching...

* Move the "unlock move permissions" checkbox to a more logical place with the options for move protection, instead of with the cascading checkbox.

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 060fb59..8508831 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -311,10 +311,11 @@ class ProtectionForm {
                        if( wfEmptyMsg( 'restriction-' . $action, $msg ) ) {
                                $msg = $action;
                        }
-                       $label = Xml::element( 'label', array( 'for' => "mwProtect-level-$action" ), $msg );
-                       $out .= "<tr><td><table>" .
-                               "<tr><th>$label</th><th></th></tr>" .
-                               "<tr><td>" . $this->buildSelector( $action, $selected ) . "</td><td>";
+                       $out .= "<tr><td>".
+                       Xml::openElement( 'fieldset' ) .
+                       Xml::element( 'legend', null, $msg ) .
+                       Xml::openElement( 'table', array( 'id' => "mw-protect-table-$action" ) ) .
+                               "<tr><td>" . $this->buildSelector( $action, $selected ) . "</td></tr><tr><td>";
 
                        $reasonDropDown = Xml::listDropDown( 'wpProtectReasonSelection',
                                wfMsgForContent( 'protect-dropdown' ),
@@ -377,7 +378,10 @@ class ProtectionForm {
                                                Xml::input( "mwProtect-expiry-$action", 50, $this->mExpiry[$action], $attribs ) .
                                        '</td>
                                </tr></table>';
-                       $out .= "</td></tr></table></td></tr>";
+                       $out .= "</td></tr>" .
+                       Xml::closeElement( 'table' ) .
+                       Xml::closeElement( 'fieldset' ) .
+                       "</td></tr>";
                }
 
                $out .= Xml::closeElement( 'tbody' ) . Xml::closeElement( 'table' );
@@ -519,7 +523,7 @@ class ProtectionForm {
                }
                $script .= "[" . implode(',',$CascadeableLevels) . "];\n";
                $options = (object)array(
-                       'tableId' => 'mw-protect-table2',
+                       'tableId' => 'mw-protect-table-move',
                        'labelText' => wfMsg( 'protect-unchain' ),
                        'numTypes' => count($this->mApplicableTypes),
                        'existingMatch' => 1 == count( array_unique( $this->mExistingExpiry ) ),

diff --git a/skins/common/protect.js b/skins/common/protect.js
index ab1ea30..d9650c8 100644 (file)
--- a/skins/common/protect.js
+++ b/skins/common/protect.js
@@ -19,14 +19,13 @@ var ProtectionForm = {
                var box = document.getElementById( opts.tableId );
                if( !box )
                        return false;
-
-               var tbody = box.getElementsByTagName( 'tbody' )[0];
+               
+               var boxbody = box.getElementsByTagName('tbody')[0]
                var row = document.createElement( 'tr' );
-               tbody.appendChild( row );
+               boxbody.insertBefore( row, boxbody.firstChild );
 
                this.existingMatch = opts.existingMatch;
 
-               row.appendChild( document.createElement( 'td' ) );
                var cell = document.createElement( 'td' );
                row.appendChild( cell );
                // If there is only one protection type, there is nothing to chain