From 31abc4ae3d69d3e07b4b5378a82d458722fb7efe Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 12 Apr 2017 12:04:06 +0200 Subject: [PATCH] SPR-908: QS - header with magicmatcher --- css/area_header.less | 31 +++++++++++++++++++++++++++++++ main.php | 30 +++++++++++++++++++----------- 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/css/area_header.less b/css/area_header.less index e02bf1a..0225a71 100755 --- a/css/area_header.less +++ b/css/area_header.less @@ -150,4 +150,35 @@ } } } + + +/* + + + + + with magic matcher + + + + + */ + &.has-magicmatcher { + .logo { + @media @screen_min-md { + padding-top: 2rem; + } + } + + .main-title.desktop-only { + @media @screen_min-md { + vertical-align: bottom; + padding-top: @height-context-bar; + padding-bottom: 1rem; + } + + p.title { + @media @screen_min-md { + margin-right: 16rem; + } + } + + p.claim { + @media @screen_max-md { + display: block; + padding-bottom: 1rem; + } + } + } + } } diff --git a/main.php b/main.php index d4d546b..7b26a44 100755 --- a/main.php +++ b/main.php @@ -82,9 +82,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"; + } + } ?> -
+
@@ -110,6 +127,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
+
getIssueContextBar(); - if($matcher !== ""){ - $navClass = "has-bar"; - } - } - include('tpl/nav-usertools-buttons.php'); if($mm && $matcher !== ""){ include('tpl/nav-magicmatcher.php');