revert previous patch and move sidebar back to its original location

diff --git a/local.css b/local.css
index 3a7e5717fafe7f9e087c036d4bf750d8a6e9fe0f..ce5b8e5dce7999d702934cd9fa4e67db37e6784d 100644 (file)
--- a/local.css
+++ b/local.css
@@ -226,7 +226,6 @@ div.recentchanges {
 .sidebar {
        width: 20ex;
        float: right;
 .sidebar {
        width: 20ex;
        float: right;

-    vertical-align: top;

        margin-left: 4px;
        margin-bottom: 4px;
        margin-top: -1px;
        margin-left: 4px;
        margin-bottom: 4px;
        margin-top: -1px;

diff --git a/templates/page.tmpl b/templates/page.tmpl
index e83c6cfd56e22f453398644123f242dcdcb1743e..d042d13ac05e8d65fd4885d0d6c36680114a3541 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -125,6 +125,13 @@
 
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
 
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 

+<TMPL_UNLESS DYNAMIC>
+<TMPL_IF SIDEBAR>
+<TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
+<TMPL_VAR SIDEBAR>
+<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+</TMPL_UNLESS>

 
 <div id="pagebody">
 
 
 <div id="pagebody">
 


@@ -155,14 +162,6 @@
 
 </div>
 
 
 </div>
 

-<TMPL_UNLESS DYNAMIC>
-<TMPL_IF SIDEBAR>
-<TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
-<TMPL_VAR SIDEBAR>
-<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
-</TMPL_IF>
-</TMPL_UNLESS>
-

 <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
 <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>