EH22/dokuwiki-template-sprintdoc-modified
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'addWikiPageFooter' into 'master'

Browse source 
Add wikipagefooter: styling of border should be reconsidered

See merge request !18
This commit is contained in:
Jana Deutschländer 2017-02-23 16:53:28 +01:00
commit 1a4932512d
2 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
css/area_main-content.less
View file

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

20
main.php
View file

@ -14,6 +14,8 @@ header('X-UA-Compatible: IE=edge,chrome=1');
$showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && !empty($_SERVER['REMOTE_USER']) ); $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && !empty($_SERVER['REMOTE_USER']) );
$showSidebar = true; /* */ $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 */ tpl_content(false); /* the main content */
?> ?>
<div class="clearer"></div> <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><!-- .main-content -->
<div class="page-footer"> <div class="page-footer">
<?php <?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Include Hook: pagefooter */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_includeFile('pagefooter.html'); tpl_includeFile('pagefooter.html');