Merge "CologneBlue rewrite: output the sidebar items as <ul> lists"

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 4aa307b..8c97a3c 100644 (file)
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -639,33 +639,36 @@ class CologneBlueTemplate extends BaseTemplate {
 
 
                // Output the sidebar
-               $s = "\n<div id='quickbar'>";
-               $sep = "<br />\n";
+               $s = "<div id='quickbar'>\n";
+
                foreach ( $bar as $heading => $data ) {
                        $headingMsg = wfMessage( $heading );
-                       $headingHTML = "\n<h6>" . ( $headingMsg->exists() ? $headingMsg->escaped() : htmlspecialchars( $heading ) ) . "</h6>";
+                       $headingHTML = "<h6>" . ( $headingMsg->exists() ? $headingMsg->escaped() : htmlspecialchars( $heading ) ) . "</h6>";
+                       $portletId = Sanitizer::escapeId( "p-$heading" );
+                       $listHTML = "";
 
                        if ( is_array( $data ) ) {
                                // $data is an array of links
-                               $any_link = false;
-                               $listHTML = "";
                                foreach ( $data as $key => $link ) {
                                        // Can be empty due to how the sidebar additions are done
                                        if ( $link ) {
-                                               $any_link = true;
-                                               $listHTML .= $this->makeListItem( $key, $link, array( 'tag' => 'span' ) ) . $sep;
+                                               $listHTML .= $this->makeListItem( $key, $link );
                                        }
                                }
-                               if ( $any_link ) {
-                                       $s .= $headingHTML . $listHTML;
+                               if ( $listHTML ) {
+                                       $listHTML = "<ul>$listHTML</ul>";
                                }
                        } else {
-                               // $data is a HTML string
-                               $s .= $headingHTML . $data;
+                               // $data is a HTML <ul>-list string
+                               $listHTML = $data;
+                       }
+
+                       if ( $listHTML ) {
+                               $s .= "<div class=\"portlet\" id=\"$portletId\">\n$headingHTML\n$listHTML\n</div>\n";
                        }
                }
 
-               $s .= $sep . "\n</div>\n";
+               $s .= "</div>\n";
                return $s;
        }
 

diff --git a/skins/cologneblue/screen.css b/skins/cologneblue/screen.css
index aac786d..51186d8 100644 (file)
--- a/skins/cologneblue/screen.css
+++ b/skins/cologneblue/screen.css
@@ -110,6 +110,14 @@ textarea {
        margin-top: 0;
 }
 
+#quickbar .portlet ul,
+#quickbar .portlet li {
+       list-style-type: none;
+       margin: 0;
+       padding: 0;
+       line-height: inherit;
+}
+
 h1 {
        color: #666666;
        font-family: Verdana, Arial, sans-serif;