Author: rjollos Date: Wed Jul 3 02:07:12 2013 New Revision: 1499176 URL: http://svn.apache.org/r1499176 Log: Applied [t 11827] to `bh_wiki_edit.html`. Refs #446.
Put conflict message always at the top of the page so that it is always visible. The page refreshes and does not scroll downward when selecting //Preview Page//, //Review Changes// or //Submit changes//. 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=1499176&r1=1499175&r2=1499176&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:07:12 2013 @@ -153,10 +153,22 @@ (the #preview will float at the right of the edit form's textarea) --> - <div py:if="not sidebyside" class="span12"> - <xi:include href="bh_wiki_edit_form.html" /> - </div> <py:choose test="action"> + <py:when test="'collision'"> + <div class="span12"> + <div class="alert alert-error"> + <span class="label label-important">Oops !</span> + Sorry, this page has been modified by somebody else since you started + editing. Your changes cannot be saved. + </div> + </div> + <div py:if="sidebyside" class="span12"> + <xi:include href="bh_wiki_edit_form.html" /> + </div> + </py:when> + <div py:if="not sidebyside" class="span12"> + <xi:include href="bh_wiki_edit_form.html" /> + </div> <py:when test="'preview'"> <div class="span12"> <table id="info" summary="Revision info"> @@ -197,18 +209,6 @@ </div> </div> </py:when> - <py:when test="'collision'"> - <div class="span12"> - <div class="alert alert-error"> - <span class="label label-important">Oops !</span> - Sorry, this page has been modified by somebody else since you started - editing. Your changes cannot be saved. - </div> - </div> - <div py:if="sidebyside" class="span12"> - <xi:include href="bh_wiki_edit_form.html" /> - </div> - </py:when> </py:choose> <div class="span12">