From 37e1e6be0e46b589de4e91791c400f15c118726c Mon Sep 17 00:00:00 2001
From: Alexey Verkhovsky <averkhov@thoughtworks.com>
Date: Fri, 8 Apr 2005 06:16:22 +0000
Subject: [PATCH] Corrected position of markup help in new.rhtml (it really
 should be the same template as edit.rhtml)

---
 app/views/wiki/edit.rhtml | 1 -
 app/views/wiki/new.rhtml  | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 6da0f858..13753b0f 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -11,7 +11,6 @@
   <%= render 'wiki_words_help' %>
 </div>
 
-
 <%= form_tag({ :action => 'save', :web => @web.address, :id => @page.name},
              {'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();'})
 %>
diff --git a/app/views/wiki/new.rhtml b/app/views/wiki/new.rhtml
index e0fa0c2b..404b793b 100644
--- a/app/views/wiki/new.rhtml
+++ b/app/views/wiki/new.rhtml
@@ -4,7 +4,10 @@
   @hide_navigation = true
 %>
 
-<%= render("#{@web.markup}_help") if @web %>
+<div id="MarkupHelp" style="float: right; width: 250px; margin-top: 5px">
+  <%= render("#{@web.markup}_help") %>
+  <%= render 'wiki_words_help' %>
+</div>
 
 <%= form_tag({ :action => 'save', :web => @web.address, :id => @page_name},
              {'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();'})