From: Tim Starling <tstarling@users.mediawiki.org>
Date: Thu, 7 Sep 2006 11:58:30 +0000 (+0000)
Subject: Some updates merged from monobook
X-Git-Tag: 1.31.0-rc.0~55822
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=06c96af542aa4e69806df50f81e1897cf36cc8ce;p=lhc%2Fweb%2Fwiklou.git

Some updates merged from monobook
---

diff --git a/skins/disabled/HTMLDump.php b/skins/disabled/HTMLDump.php
index 2adf338911..33627843e2 100644
--- a/skins/disabled/HTMLDump.php
+++ b/skins/disabled/HTMLDump.php
@@ -137,7 +137,7 @@ class HTMLDumpTemplate extends QuickTemplate {
 	<div id="content">
 	  <a name="top" id="contentTop"></a>
 	  <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
-	  <h1 class="firstHeading"><?php $this->text('title') ?></h1>
+      <h1 class="firstHeading"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('title') ?></h1>
 	  <div id="bodyContent">
 	    <h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
 	    <div id="contentSub"><?php $this->html('subtitle') ?></div>
@@ -171,7 +171,7 @@ class HTMLDumpTemplate extends QuickTemplate {
 	<script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script>
 	<?php foreach ($this->data['sidebar'] as $bar => $cont) { ?>
 	<div class='portlet' id='p-<?php echo htmlspecialchars($bar) ?>'>
-	  <h5><?php $this->msg( $bar ) ?></h5>
+	  <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
 	  <div class='pBody'>
 	    <ul>
 	    <?php foreach($cont as $key => $val) { ?>
@@ -183,7 +183,7 @@ class HTMLDumpTemplate extends QuickTemplate {
 	<?php } ?>
 	<div id="p-search" class="portlet">
 	  <h5><label for="searchInput"><?php $this->msg('search') ?></label></h5>
-	  <div class="pBody">
+	  <div id="searchBody" class="pBody">
 	    <form action="javascript:goToStatic(3)" id="searchform"><div>
 	      <input id="searchInput" name="search" type="text"
 	        <?php if($this->haveMsg('accesskey-search')) {