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

Merge branch 'master' into pageattributes

Browse source 
Adjusted some more files to account for changes in the over 100 commits
in master since the creation of this branch.

SPR-869
This commit is contained in:
Michael Große 2017-04-11 16:13:02 +02:00
commit 3f9d4d521a
No known key found for this signature in database
GPG key ID: 7E31028FBFEACC79
85 changed files with 4162 additions and 1910 deletions
Download patch file Download diff file Expand all files Collapse all files

63
main.php
View file

@ -9,14 +9,13 @@
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*/
use dokuwiki\template\sprintdoc\Template;
if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */
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');
?>
<html class="edge no-js" lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>">
<head>
@ -90,6 +89,12 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
<div class="row">
<div class="col-xs-12">
<div class="claim main-sidebar">
<div class="menu-togglelink mobile-only">
<a href="#">
<span class="sr-out"><?php echo tpl_getLang('a11y_sidebartoggle'); ?></span>
</a>
</div>
<?php if (tpl_getConf('logo') && file_exists(mediaFN(tpl_getConf('logo')))){
@ -99,11 +104,35 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
/* upload your logo into the data/media folder (root of the media manager) and replace 'logo.png' in der template config accordingly: */
include('tpl/main-sidebar-logo.php');
} ?>
<?php if ($conf['tagline']): ?>
<div class="main-title">
<?php if ($conf['title']):
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Wiki Title Mobile */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
<p class="title mobile-only"><?php echo $conf['title'] ?></p>
<?php endif ?>
</div><!-- .main-title -->
</div><!-- .headings -->
</div><!-- .col -->
<div class="col-xs-12">
<div class="main-title desktop-only">
<?php if ($conf['title']):
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Wiki Title Desktop */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
<p class="title"><?php echo $conf['title'] ?></p>
<?php endif ?>
<?php if ($conf['tagline']):
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Wiki Tagline Desktop */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
<p class="claim"><?php echo $conf['tagline'] ?></p>
<?php endif ?>
</div><!-- .headings -->
</div><!-- .main-title -->
</div><!-- .col -->
</div><!-- .row -->
</div><!-- .container -->
@ -220,7 +249,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
<div class="breadcrumbs" data-do="<?php echo $ACT?>">
<div class="togglelink page_main-content">
<a href="#">&lt; &gt;<span class="sr-out"><?php echo tpl_getLang('a11y_sidebartoggle')?></span></a>
<a href="#"><span class="sr-out"><?php echo tpl_getLang('a11y_sidebartoggle')?></span></a>
</div>
<h6 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_menu_status') ?></h6>
@ -278,19 +307,13 @@ $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; ?>
<?php
if($ACT == 'show') echo Template::getInstance()->getInclude(
'footer',
'<div class="wikipagefooter"><hr>',
'<div class="clearer"></div></div>'
);
?>
</div><!-- .main-content -->