From 9a3590a9e15dec823a4bbacaf54330de00809d6d Mon Sep 17 00:00:00 2001 From: JosephK Date: Mon, 21 Sep 2015 10:03:18 +0200 Subject: [PATCH] Fix css header + Framanav --- app/inc/smarty.php | 2 +- tpl/header.tpl | 6 +++--- tpl/page.tpl | 9 ++++----- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/inc/smarty.php b/app/inc/smarty.php index 26be0b3..a466bd8 100644 --- a/app/inc/smarty.php +++ b/app/inc/smarty.php @@ -29,7 +29,7 @@ $smarty->assign('APPLICATION_NAME', NOMAPPLICATION); $smarty->assign('SERVER_URL', Utils::get_server_name()); $smarty->assign('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']); $smarty->assign('TITLE_IMAGE', IMAGE_TITRE); -$smarty->assign('use_nav_js', is_file($_SERVER['DOCUMENT_ROOT'] . '/nav/nav.js')); +$smarty->assign('use_nav_js', strstr($_SERVER['SERVER_NAME'], 'framadate.org'); $smarty->assign('locale', $locale); $smarty->assign('langs', $ALLOWED_LANGUAGES); $smarty->assign('date_format', $date_format); diff --git a/tpl/header.tpl b/tpl/header.tpl index eeaf287..9523901 100644 --- a/tpl/header.tpl +++ b/tpl/header.tpl @@ -15,11 +15,11 @@ {/if}

- + {$APPLICATION_NAME|html}

- {if !empty($title)}

{$title|html}

{/if} + {if !empty($title)}

{$title|html}

{/if} -
\ No newline at end of file +
diff --git a/tpl/page.tpl b/tpl/page.tpl index c3922c5..72c4661 100644 --- a/tpl/page.tpl +++ b/tpl/page.tpl @@ -20,14 +20,13 @@ - {if $use_nav_js} - - {/if} - {block name="header"}{/block} +{if $use_nav_js} + +{/if}
{include file='header.tpl'} @@ -37,4 +36,4 @@
- \ No newline at end of file +