Fix up Configure extension logo setting handling:

[lhc/web/wiklou.git] / includes / Xml.php

diff --git a/includes/Xml.php b/includes/Xml.php
index 4feff6d..78f958f 100644 (file)
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -14,9 +14,10 @@ class Xml {
         * @param $element String: element name
         * @param $attribs Array: Name=>value pairs. Values will be escaped.
         * @param $contents String: NULL to make an open tag only; '' for a contentless closed tag (default)
+        * @param $allowShortTag Bool: whether '' in $contents will result in a contentless closed tag
         * @return string
         */
-       public static function element( $element, $attribs = null, $contents = '') {
+       public static function element( $element, $attribs = null, $contents = '', $allowShortTag = true ) {
                $out = '<' . $element;
                if( !is_null( $attribs ) ) {
                        $out .=  self::expandAttributes( $attribs );
@@ -24,7 +25,7 @@ class Xml {
                if( is_null( $contents ) ) {
                        $out .= '>';
                } else {
-                       if( $contents === '' ) {
+                       if( $allowShortTag && $contents === '' ) {
                                $out .= ' />';
                        } else {
                                $out .= '>' . htmlspecialchars( $contents ) . "</$element>";
@@ -40,7 +41,7 @@ class Xml {
         * Return null if no attributes given.
         * @param $attribs Array of attributes for an XML element
         */
-       private static function expandAttributes( $attribs ) {
+       public static function expandAttributes( $attribs ) {
                $out = '';
                if( is_null( $attribs ) ) {
                        return null;
@@ -111,11 +112,11 @@ class Xml {
         *
         * @param $selected Mixed: Namespace which should be pre-selected
         * @param $all Mixed: Value of an item denoting all namespaces, or null to omit
-        * @param $hidden Mixed: Include hidden namespaces? [WTF? --RC]
         * @param $element_name String: value of the "name" attribute of the select tag
+        * @param $label String: optional label to add to the field
         * @return string
         */
-       public static function namespaceSelector( $selected = '', $all = null, $hidden = false, $element_name = 'namespace' ) {
+       public static function namespaceSelector( $selected = '', $all = null, $element_name = 'namespace', $label = null ) {
                global $wgContLang;
                $namespaces = $wgContLang->getFormattedNamespaces();
                $options = array();
@@ -138,12 +139,16 @@ class Xml {
                        $options[] = self::option( $name, $index, $index === $selected );
                }
 
-               return Xml::openElement( 'select', array( 'id' => 'namespace', 'name' => $element_name,
+               $ret = Xml::openElement( 'select', array( 'id' => 'namespace', 'name' => $element_name,
                        'class' => 'namespaceselector' ) )
                        . "\n"
                        . implode( "\n", $options )
                        . "\n"
                        . Xml::closeElement( 'select' );
+               if ( !is_null( $label ) ) {
+                       $ret = Xml::label( $label, $element_name ) . '&nbsp;' . $ret;
+               }
+               return $ret;
        }
 
        /**
@@ -489,7 +494,7 @@ class Xml {
                                                'cols' => $cols,
                                                'rows' => $rows
                                        ) + $attribs,
-                                       $content );
+                                       $content, false );
        }
 
        /**
@@ -638,16 +643,20 @@ class Xml {
                        $id = "mw-$labelmsg";
                        
                        $form .= Xml::openElement( 'tr', array( 'id' => $id ) );
-                       $form .= Xml::tags( 'td', array('valign'=>'top','align' => 'right'), wfMsgExt( $labelmsg, array('parseinline') ) );
-                       $form .= Xml::openElement( 'td' ) . $input . Xml::closeElement( 'td' );
+                       $form .= Xml::tags( 'td', array('class' => 'mw-label'), wfMsgExt( $labelmsg, array('parseinline') ) );
+                       $form .= Xml::openElement( 'td', array( 'class' => 'mw-input' ) ) . $input . Xml::closeElement( 'td' );
+                       $form .= Xml::closeElement( 'tr' );
+               }
+
+               if( $submitLabel ) {
+                       $form .= Xml::openElement( 'tr', array( 'id' => $id ) );
+                       $form .= Xml::tags( 'td', array(), '' );
+                       $form .= Xml::openElement( 'td', array( 'class' => 'mw-submit' ) ) . Xml::submitButton( wfMsg( $submitLabel ) ) . Xml::closeElement( 'td' );
                        $form .= Xml::closeElement( 'tr' );
                }
        
                $form .= "</tbody></table>";
-               
-               if ($submitLabel) {     
-                       $form .= Xml::submitButton( wfMsg($submitLabel) );
-               }
+
        
                return $form;
        }
@@ -673,7 +682,8 @@ class XmlSelect {
        }
 
        public function addOption( $name, $value = false ) {
-               $value = $value ? $value : $name;
+               // Stab stab stab
+               $value = ($value !== false) ? $value : $name;
                $this->options[] = Xml::option( $name, $value, $value === $this->default );
        }
 
@@ -681,4 +691,4 @@ class XmlSelect {
                return Xml::tags( 'select', $this->attributes, implode( "\n", $this->options ) );
        }
 
-}
\ No newline at end of file
+}