Index: RELEASE-NOTES
===================================================================
RCS file: /cvsroot/wikipedia/phase3/RELEASE-NOTES,v
retrieving revision 1.554
diff -u -r1.554 RELEASE-NOTES
--- RELEASE-NOTES	2 Dec 2005 00:38:02 -0000	1.554
+++ RELEASE-NOTES	2 Dec 2005 03:29:26 -0000
@@ -274,6 +274,10 @@
 * Fix custom namespaces on wikis set for Portuguese
 * Major overhaul of Special:Userlogin
 * Update ipblocks table in MySQL 5 table defs
+* (bug 4100, 3049) Add 'edittools' message to hold edit tools, put it
+  on Special:Upload as well as edit, rearrange edit page pieces a bit.
+  Copyright warning now above the buttons to ensure it's visible,
+  template list at the bottom so it can grow.
 
 
 === Caveats ===
Index: includes/EditPage.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/EditPage.php,v
retrieving revision 1.235
diff -u -r1.235 EditPage.php
--- includes/EditPage.php	1 Dec 2005 11:04:30 -0000	1.235
+++ includes/EditPage.php	2 Dec 2005 03:29:26 -0000
@@ -847,6 +847,14 @@
 		if( is_callable( $formCallback ) ) {
 			call_user_func_array( $formCallback, array( &$wgOut ) );
 		}
+
+		// Put these up at the top to ensure they aren't lost on early form submission
+		$wgOut->addHTML( "
+<input type='hidden' value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\" />
+<input type='hidden' value=\"{$this->starttime}\" name=\"wpStarttime\" />\n
+<input type='hidden' value=\"{$this->edittime}\" name=\"wpEdittime\" />\n
+<input type='hidden' value=\"{$this->scrolltop}\" name=\"wpScrolltop\" id=\"wpScrolltop\" />\n" );
+
 		$wgOut->addHTML( <<<END
 $recreate
 {$commentsubject}
@@ -855,11 +863,20 @@
 END
 . htmlspecialchars( $this->safeUnicodeOutput( $this->textbox1 ) ) .
 "
-</textarea><br />
+</textarea>
+
+		" );
+		
+		$wgOut->addWikiText( $copywarn );
+
+		$wgOut->addHTML( "
 {$metadata}
 {$editsummary}
 {$checkboxhtml}
 {$safemodehtml}
+");
+
+		$wgOut->addHTML( "
 <div class='editButtons'>
 <input tabindex='5' id='wpSave' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"".wfMsg('accesskey-save')."\"".
 " title=\"".wfMsg('tooltip-save')."\"/>
@@ -868,16 +885,15 @@
 <input tabindex='7' id='wpDiff' type='submit' value=\"{$diff}\" name=\"wpDiff\" accesskey=\"".wfMsg('accesskey-diff')."\"".
 " title=\"".wfMsg('tooltip-diff')."\"/> <span class='editHelp'>{$cancel} | {$edithelp}</span></div>
 </div>
+" );
+
+		$wgOut->addWikiText( wfMsgForContent( 'edittools' ) );
+
+		$wgOut->addHTML( "
 <div class='templatesUsed'>
 {$templates}
 </div>
 " );
-		$wgOut->addWikiText( $copywarn );
-		$wgOut->addHTML( "
-<input type='hidden' value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\" />
-<input type='hidden' value=\"{$this->starttime}\" name=\"wpStarttime\" />\n
-<input type='hidden' value=\"{$this->edittime}\" name=\"wpEdittime\" />\n
-<input type='hidden' value=\"{$this->scrolltop}\" name=\"wpScrolltop\" id=\"wpScrolltop\" />\n" );
 
 		if ( $wgUser->isLoggedIn() ) {
 			/**
Index: includes/SpecialUpload.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/SpecialUpload.php,v
retrieving revision 1.94
diff -u -r1.94 SpecialUpload.php
--- includes/SpecialUpload.php	24 Oct 2005 23:25:21 -0000	1.94
+++ includes/SpecialUpload.php	2 Dec 2005 03:29:26 -0000
@@ -659,6 +659,16 @@
 		<td></td>
 		<td align='left'><input tabindex='9' type='submit' name='wpUpload' value=\"{$ulb}\" /></td>
 	</tr>
+	
+	<tr>
+		<td></td>
+		<td align='left'>
+		" );
+	$wgOut->addWikiText( wfMsgForContent( 'edittools' ) );
+	$wgOut->addHTML( "
+		</td>
+	</tr>
+		
 	</table>
 	</form>" );
 	}
Index: languages/Language.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/languages/Language.php,v
retrieving revision 1.744
diff -u -r1.744 Language.php
--- languages/Language.php	2 Dec 2005 01:36:17 -0000	1.744
+++ languages/Language.php	2 Dec 2005 03:29:26 -0000
@@ -791,6 +791,7 @@
 the text into a text file and save it for later.</strong>',
 'protectedpagewarning' => "<strong>WARNING:  This page has been locked so that only users with sysop privileges can edit it. Be sure you are following the [[Project:Protected_page_guidelines|protected page guidelines]].</strong>",
 'templatesused'	=> 'Templates used on this page:',
+'edittools' => '<!-- Text here will be shown below edit and upload forms. -->',
 
 # History pages
 #
Index: skins/common/wikibits.js
===================================================================
RCS file: /cvsroot/wikipedia/phase3/skins/common/wikibits.js,v
retrieving revision 1.22
diff -u -r1.22 wikibits.js
--- skins/common/wikibits.js	30 Oct 2005 00:25:49 -0000	1.22
+++ skins/common/wikibits.js	2 Dec 2005 03:29:26 -0000
@@ -333,7 +333,14 @@
 // copied and adapted from phpBB
 function insertTags(tagOpen, tagClose, sampleText) {
 
-	var txtarea = document.editform.wpTextbox1;
+	if (document.editform)
+		var txtarea = document.editform.wpTextbox1;
+	else {
+		// some alternate form? take the first one we can find
+		var areas = document.getElementsByTagName('textarea');
+		var txtarea = areas[0];
+	}
+	
 	// IE
 	if(document.selection  && !is_gecko) {
 		var theSelection = document.selection.createRange().text;