Author: rjollos
Date: Wed Jul 3 02:15:30 2013
New Revision: 1499178
URL: http://svn.apache.org/r1499178
Log:
Applied [t 11828] to `bh_wiki_edit.html`. Refs #446.
Put merge warning message always above the preview. When not in side-by-side
edit mode, the page scrolls down to the preview when Merge changes is selected.
Modified:
bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_wiki_edit.html
Modified: bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_wiki_edit.html
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_wiki_edit.html?rev=1499178&r1=1499177&r2=1499178&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_wiki_edit.html
(original)
+++ bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_wiki_edit.html Wed
Jul 3 02:15:30 2013
@@ -115,19 +115,6 @@
↓
</div>
<h1 class="span12" i18n:msg="name">Editing ${name_of(page.resource)}</h1>
- <div py:if="merge" class="system-message span12">
- <div class="alert">
- <p><span class="label label-important">Important</span>
- Someone else has modified that page since you started your
edits.</p><br />
- <p i18n:msg=""><strong>If you save right away, you risk to revert
those changes
- (highlighted below as deletions).</strong></p><br />
- <p i18n:msg="">Please review all those changes and manually merge
them with your
- own changes. <br />
- If you're unsure about what you're doing, please press
<code>Cancel</code>
- (losing your changes) and start editing the latest version of the
page
- again.</p>
- </div>
- </div>
<!--/p!
@@ -169,6 +156,19 @@
<div py:if="not sidebyside" class="span12">
<xi:include href="bh_wiki_edit_form.html" />
</div>
+ <div py:if="merge" class="system-message span12">
+ <div class="alert">
+ <p><span class="label label-important">Important</span>
+ Someone else has modified that page since you started your
edits.</p><br />
+ <p i18n:msg=""><strong>If you save right away, you risk to revert
those changes
+ (highlighted below as deletions).</strong></p><br />
+ <p i18n:msg="">Please review all those changes and manually merge
them with your
+ own changes. <br />
+ If you're unsure about what you're doing, please press
<code>Cancel</code>
+ (losing your changes) and start editing the latest version of the
page
+ again.</p>
+ </div>
+ </div>
<py:when test="'preview'">
<div class="span12">
<table id="info" summary="Revision info">
