Merge remote-tracking branch 'origin/master' into live

css/area_main-content.less

@@ -20,6 +20,15 @@
 
         }
     }
+
+    .wikipagefooter {
+        > hr {
+            margin-top: 3em;
+            margin-bottom: 0.5em;
+            border-top: dashed @color-border-light 2px;
+            border-bottom: none;
+        }
+    }
 }
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */

main.php

@@ -14,6 +14,8 @@ header('X-UA-Compatible: IE=edge,chrome=1');
 
 $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && !empty($_SERVER['REMOTE_USER']) );
 $showSidebar =  true; /*  */
+$hasFooter = page_findnearest('pagefooter');
+$showFooter = $hasFooter && ($ACT === 'show');
 
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
@@ -296,11 +298,29 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
                                 tpl_content(false); /* the main content */
                             ?>
                             <div class="clearer"></div>
+                            <?php if($showFooter):
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Page Include Hook: pagefooter.txt */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+                                ?>
+                                <div class="wikipagefooter">
+                                    <hr>
+                                    <?php tpl_include_page('pagefooter', true, true) ?>
+                                    <div class="clearer"></div>
+                                </div>
+                            <?php endif; ?>
                         </div><!-- .main-content -->
 
 
                         <div class="page-footer">
                             <?php
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Include Hook: pagefooter */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
                                 tpl_includeFile('pagefooter.html');