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

Merge branch 'master' into toggleConf

Browse source
This commit is contained in:
Michael Große 2017-04-18 13:10:14 +02:00
commit 1c24bf1989
No known key found for this signature in database
GPG key ID: 7E31028FBFEACC79
15 changed files with 390 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

69
main.php
View file

@ -88,9 +88,26 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
/* Include Hook: header.html */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_includeFile('header.html');
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* User Tools and MagicMatcher Bar */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/** @var \helper_plugin_magicmatcher_context $mm */
$mm = plugin_load('helper', 'magicmatcher_context');
$headerClass = ""; /* for additionial class in #dokuwiki__header */
$navClass = ""; /* for additionial class in #dokuwiki__usertools (header.html) */
if($mm){
$matcher = $mm->getIssueContextBar();
if($matcher !== ""){
$headerClass = "has-magicmatcher";
$navClass = "has-bar";
}
}
?>
<div id="dokuwiki__header" class="header no-print">
<div id="dokuwiki__header" class="header <?php echo $headerClass; ?> no-print">
<div class="container">
<div class="row">
<div class="col-xs-12">
@ -122,6 +139,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
</div><!-- .headings -->
</div><!-- .col -->
<div class="col-xs-12">
<div class="main-title desktop-only">
<?php if ($conf['title']):
@ -159,18 +177,6 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="sidebarheader main-sidebar">
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Include Hook: sidebarheader.html */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_includeFile('sidebarheader.html')
?>
</div><!-- .sidebarheader -->
<div class="search main-sidebar">
<?php
@ -181,14 +187,41 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
include('tpl/main-sidebar-search.php');
?>
</div><!-- .search -->
<div class="sidebarheader main-sidebar">
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Include Hook: sidebarheader.html */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_includeFile('sidebarheader.html')
?>
</div><!-- .sidebarheader -->
<div id="dokuwiki__aside">
<?php
echo Template::getInstance()->getInclude(
'sidebarheader',
'<div class="sidebarheader">',
'<div class="clearer"></div></div>'
);
?>
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* sidebar */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
include('tpl/main-sidebar-nav.php');
?>
<?php
echo Template::getInstance()->getInclude(
'sidebarfooter',
'<div class="sidebarfooter">',
'<div class="clearer"></div></div>'
);
?>
</div><!-- .aside -->
</div><!-- .col -->
@ -208,16 +241,6 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* User Tools and MagicMatcher Bar */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/** @var \helper_plugin_magicmatcher_context $mm */
$mm = plugin_load('helper', 'magicmatcher_context');
$navClass = "";
if($mm){
$matcher = $mm->getIssueContextBar();
if($matcher !== ""){
$navClass = "has-bar";
}
}
include('tpl/nav-usertools-buttons.php');
if($mm && $matcher !== ""){
include('tpl/nav-magicmatcher.php');