From 5d5c96e65e9d726520d198128d17ccdbdb2a6bca Mon Sep 17 00:00:00 2001
From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Mon, 24 May 2004 10:37:18 +0000
Subject: [PATCH] second submit button on top, input instead of button for more
 consistent styling, xhtml nesting fix

---
 includes/PageHistory.php      | 13 +++++++------
 stylesheets/common.css        |  1 +
 stylesheets/monobook/main.css |  6 ++++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index 49b42f3f2a..e95ad39a55 100644
--- a/includes/PageHistory.php
+++ b/includes/PageHistory.php
@@ -77,6 +77,10 @@ class PageHistory {
 			$this->mTitle->getPrefixedText(),
 			"action=history", $atend );
 		$s = $numbar;
+		$this->submitbuttonhtml = ( $this->linesonpage > 1) ? '<li class="histsubmitli">
+		<input class="historysubmit" type="submit" accesskey="'.wfMsg('accesskey-compareselectedversions').
+			'" title="'.wfMsg('tooltip-compareselectedversions').'" value="'.wfMsg('compareselectedversions')."\" /></li>" :
+			'';
 		$s .= $this->beginHistoryList();
 		$counter = 1;
 		if( $offset == 0 ){
@@ -113,6 +117,7 @@ class PageHistory {
 		$s .="\n<form id=\"pagehistory\" name=\"pagehistory\" action=\"" . $wgTitle->getFullURL("-") . "\" method=\"get\">";
 		$s .= "<input type=\"hidden\" name=\"title\" value=\"".htmlspecialchars($wgTitle->getPrefixedDbKey())."\"/>\n";
 		$s .= "" . "\n<ul>";
+		$s .= !empty($this->submitbuttonhtml) ? $this->submitbuttonhtml."\n":'';
 		return $s;
 	}
 
@@ -121,12 +126,8 @@ class PageHistory {
 		$last = wfMsg( "last" );
 
 		$s = $skip ? "" : preg_replace( "/!OLDID![0-9]+!/", $last, $this->lastline );
-		$s .= "</ul>\n";
-		if( $this->linesonpage > 1) {
-			$s .= '<button type="submit" accesskey="'.wfMsg('accesskey-compareselectedversions').
-			'" title="'.wfMsg('tooltip-compareselectedversions').'">'.wfMsg('compareselectedversions')."</button><br/><br/>\n";
-		}
-		$s .= "</form>\n";
+		$s .= !empty($this->submitbuttonhtml) ? $this->submitbuttonhtml."\n":'';
+		$s .= "</ul></form>\n";
 		return $s;
 	}
 
diff --git a/stylesheets/common.css b/stylesheets/common.css
index 712e4fe78a..7061340a6b 100644
--- a/stylesheets/common.css
+++ b/stylesheets/common.css
@@ -77,6 +77,7 @@ div.tleft {
     background-color:#f9f9f9;
     border:1px dashed #aaaaaa;
 }
+#pagehistory li.histsubmitli { list-style: none }
 
 table.diff {
         background:white;
diff --git a/stylesheets/monobook/main.css b/stylesheets/monobook/main.css
index b89a7237f7..97234ec983 100644
--- a/stylesheets/monobook/main.css
+++ b/stylesheets/monobook/main.css
@@ -165,6 +165,11 @@ textarea {
         vertical-align: middle;
         padding: 0.2em;
     }
+    head:first-child+body input.historysubmit {
+        height: 1.9em !important;
+        padding: none !important;
+        vertical-align: middle;
+    }
 }
 input[type="radio"],
 input[type="checkbox"] { border:none; }
@@ -416,6 +421,7 @@ div.townBox dl dd {
     background-color:#f9f9f9;
     border:1px dashed #aaaaaa;
 }
+#pagehistory li.histsubmitli { list-style: none }
 /*
 ** Diff rendering
 */
-- 
2.20.1