Fix css header + Framanav

This commit is contained in:
JosephK 2015-09-21 10:03:18 +02:00
parent 5ebd83e681
commit 9a3590a9e1
3 changed files with 8 additions and 9 deletions

View File

@ -29,7 +29,7 @@ $smarty->assign('APPLICATION_NAME', NOMAPPLICATION);
$smarty->assign('SERVER_URL', Utils::get_server_name()); $smarty->assign('SERVER_URL', Utils::get_server_name());
$smarty->assign('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']); $smarty->assign('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']);
$smarty->assign('TITLE_IMAGE', IMAGE_TITRE); $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('locale', $locale);
$smarty->assign('langs', $ALLOWED_LANGUAGES); $smarty->assign('langs', $ALLOWED_LANGUAGES);
$smarty->assign('date_format', $date_format); $smarty->assign('date_format', $date_format);

View File

@ -15,11 +15,11 @@
{/if} {/if}
<h1> <h1>
<a href="{$SERVER_URL|html}" title="{__('Generic', 'Home')} - {$APPLICATION_NAME|html}" class="col-xs-12 col-sm-10"> <a href="{$SERVER_URL|html}" title="{__('Generic', 'Home')} - {$APPLICATION_NAME|html}" >
<img src="{$TITLE_IMAGE|resource}" alt="{$APPLICATION_NAME|html}" class="img-responsive"/> <img src="{$TITLE_IMAGE|resource}" alt="{$APPLICATION_NAME|html}" class="img-responsive"/>
</a> </a>
</h1> </h1>
{if !empty($title)}<h2 class="lead col-xs-12"><i>{$title|html}</i></h2>{/if} {if !empty($title)}<h2 class="lead"><i>{$title|html}</i></h2>{/if}
<hr class="trait" role="presentation" /> <hr class="trait" role="presentation" />
</header> </header>
<main role="main"> <main role="main">

View File

@ -20,14 +20,13 @@
<script type="text/javascript" src="{"js/locales/bootstrap-datepicker.$locale.js"|resource}"></script> <script type="text/javascript" src="{"js/locales/bootstrap-datepicker.$locale.js"|resource}"></script>
<script type="text/javascript" src="{'js/core.js'|resource}"></script> <script type="text/javascript" src="{'js/core.js'|resource}"></script>
{if $use_nav_js}
<script src="{'nav/nav.js'|resource}" id="nav_js" type="text/javascript" charset="utf-8"></script><!-- /Framanav -->
{/if}
{block name="header"}{/block} {block name="header"}{/block}
</head> </head>
<body> <body>
{if $use_nav_js}
<script src="https://n2.framasoft.org/nav/nav.js" type="text/javascript"></script>
{/if}
<div class="container ombre"> <div class="container ombre">
{include file='header.tpl'} {include file='header.tpl'}
@ -37,4 +36,4 @@
</main> </main>
</div> <!-- .container --> </div> <!-- .container -->
</body> </body>
</html> </html>