Skip to content
Permalink
Browse files

Merge branch 'phy25-cookieNoticeAccepted' into develop

  • Loading branch information...
LotarProject committed Jul 16, 2019
2 parents 2dfb657 + 7583864 commit 4cc1ac3c69bb87ed60273f7cfa6a1e813a1d2637
Showing with 3 additions and 3 deletions.
  1. +1 −1 js/template.js
  2. +2 −2 tpl/cookielaw.php
@@ -665,7 +665,7 @@ jQuery(document).on('bootstrap3:cookie-law', function(event) {

jQuery('#cookieDismiss').click(function(){
jQuery('#cookieNotice').hide();
DokuCookie.setValue('cookieNoticeAccepted', true);
DokuCookie.setValue('cookieNoticeAccepted', 1);
});

});
@@ -12,7 +12,7 @@
global $TEMPLATE;
if ( $TEMPLATE->getConf('showCookieLawBanner') && ! (get_doku_pref('cookieNoticeAccepted', null) || get_doku_pref('cookieNoticeAccepted', '')) ):
if ( $TEMPLATE->getConf('showCookieLawBanner') && !get_doku_pref('cookieNoticeAccepted', null) ):
$cookie_policy_page_id = $TEMPLATE->getConf('cookieLawPolicyPage');
$cookie_banner_page_id = $TEMPLATE->getConf('cookieLawBannerPage');
@@ -23,7 +23,7 @@
?>
<!-- cookie-law -->
<div id="cookieNotice" class="navbar <?php echo (($TEMPLATE->getConf('inverseNavbar')) ? 'navbar-inverse' : 'navbar-default') ?> navbar-fixed-bottom">
<div class="container">
<div class="dw-container container<?php echo ($TEMPLATE->isFluidNavbar() ? '-fluid mx-5' : '') ?>">
<div class="navbar-text navbar-left">
<?php
$cookie_banner_page = tpl_include_page($cookie_banner_page_id, 0, 1, $TEMPLATE->getConf('useACL'));

0 comments on commit 4cc1ac3

Please sign in to comment.
You can’t perform that action at this time.