From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Wed, 30 Jul 2008 11:29:18 +0000 (+0000)
Subject: * Add a nice fieldset for consistency
X-Git-Tag: 1.31.0-rc.0~46280
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=195138a7975a9e71ff6fad5fcb58485d78e7c55c;p=lhc%2Fweb%2Fwiklou.git

* Add a nice fieldset for consistency
* Switch result line and input form
* Do not show result line "Below is a list of 0 files...". We have the message 'noimages' instead.
---

diff --git a/includes/specials/SpecialNewimages.php b/includes/specials/SpecialNewimages.php
index e57f6fc1eb..b7a52802c6 100644
--- a/includes/specials/SpecialNewimages.php
+++ b/includes/specials/SpecialNewimages.php
@@ -147,24 +147,26 @@ function wfSpecialNewimages( $par, $specialPage ) {
 		$lastTimestamp = $timestamp;
 	}
 
+	$titleObj = SpecialPage::getTitleFor( 'Newimages' );
+	$action = $titleObj->getLocalURL( $hidebots ? '' : 'hidebots=0' );
+	if ( $shownav && !$wgMiserMode ) {
+		$wgOut->addHTML(
+			Xml::openElement( 'form', array( 'action' => $action, 'id' => 'imagesearch' ) ) .
+			Xml::fieldset( wfMsg( 'newimages-legend' ) ) .
+			Xml::inputLabel( wfMsg( 'newimages-label' ), 'wpIlMatch', 'wpIlMatch', 20, $wpIlMatch ) . ' ' .
+			Xml::submitButton( wfMsg( 'ilsubmit' ), array( 'name' => 'wpIlSubmit' ) ) .
+			Xml::closeElement( 'fieldset' ) .
+			Xml::closeElement( 'form' )
+		 );
+	}
+
 	$bydate = wfMsg( 'bydate' );
 	$lt = $wgLang->formatNum( min( $shownImages, $limit ) );
-	if ($shownav) {
-		$text = wfMsgExt( 'imagelisttext', array('parse'), $lt, $bydate );
+	if ( $shownav && count( $images ) ) {
+		$text = wfMsgExt( 'imagelisttext', array( 'parse' ), $lt, $bydate );
 		$wgOut->addHTML( $text . "\n" );
 	}
 
-	$sub = wfMsg( 'ilsubmit' );
-	$titleObj = SpecialPage::getTitleFor( 'Newimages' );
-	$action = $titleObj->escapeLocalURL( $hidebots ? '' : 'hidebots=0' );
-	if ($shownav && !$wgMiserMode) {
-		$wgOut->addHTML( "<form id=\"imagesearch\" method=\"post\" action=\"" .
-		  "{$action}\">" .
-			Xml::input( 'wpIlMatch', 20, $wpIlMatch ) . ' ' .
-		  Xml::submitButton( $sub, array( 'name' => 'wpIlSubmit' ) ) .
-		  "</form>" );
-	}
-
 	/**
 	 * Paging controls...
 	 */
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 6b07118dc5..90e6b601a0 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -2220,8 +2220,10 @@ $1',
 
 # Special:Newimages
 'newimages'             => 'Neue Dateien',
-'imagelisttext'         => "Hier ist eine Liste von '''$1''' {{PLURAL:$1|Datei|Dateien}}, sortiert $2.",
+'imagelisttext'         => "Hier ist eine Liste mit '''$1''' {{PLURAL:$1|Datei|Dateien}}, sortiert $2.",
 'newimages-summary'     => 'Diese Spezialseite zeigt die zuletzt hochgeladenen Dateien an.',
+'newimages-legend'      => 'Dateiname',
+'newimages-label'       => 'Dateiname (oder ein Teil davon):',
 'showhidebots'          => '(Bots $1)',
 'noimages'              => 'Keine Dateien gefunden.',
 'ilsubmit'              => 'Suchen',
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 765030603e..97b818e539 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2823,6 +2823,8 @@ $1',
 'newimages'             => 'Gallery of new files',
 'imagelisttext'         => "Below is a list of '''$1''' {{PLURAL:$1|file|files}} sorted $2.",
 'newimages-summary'     => 'This special page shows the last uploaded files.',
+'newimages-legend'      => 'Filename',
+'newimages-label'       => 'Filename (or a part of it):',
 'showhidebots'          => '($1 bots)',
 'noimages'              => 'Nothing to see.',
 'ilsubmit'              => 'Search',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 82f69a4346..18649c2ad3 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1991,6 +1991,8 @@ $wgMessageStructure = array(
 		'newimages',
 		'imagelisttext',
 		'newimages-summary',
+		'newimages-legend',
+		'newimages-label',
 		'showhidebots',
 		'noimages',
 		'ilsubmit',