Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into 'master'

Browse Source 
Fix css header responsive + Framanav

Les 2 derniers commits cassent la présentation de l'entête : plus de trait horizontal, sous-titre décalé et message d'erreur/confirmation se retrouvent placés en haut.
C'est corrigé (compris ce qui déconnait ;) )

J'en ai profité pour placer la nav au bon endroit et ne l'activer que sur les sites en *framadate.org
(J'ai pas vérifié que ça marchait, je te laisser tester sur beta/openbar et me dire si jamais ça ne va pas…)

See merge request !62
This commit is contained in:
Olivier Perez 2015-09-21 11:35:29 +02:00
commit f377365c5b
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/inc/smarty.php
View File

@ -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);

10
tpl/header.tpl
View File

@ -1,4 +1,4 @@
<header role="banner">
<header role="banner" class="clearfix">
{if count($langs)>1}
<form method="post" action="" class="hidden-print">
<div class="input-group input-group-sm pull-right col-xs-12 col-sm-2">
@ -14,12 +14,12 @@
</form>
{/if}
<h1>
<a href="{$SERVER_URL|html}" title="{__('Generic', 'Home')} - {$APPLICATION_NAME|html}" class="col-xs-12 col-sm-10">
<h1 class="row 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"/>
</a>
</h1>
{if !empty($title)}<h2 class="lead col-xs-12"><i>{$title|html}</i></h2>{/if}
<hr class="trait" role="presentation" />
<hr class="trait col-xs-12" role="presentation" />
</header>
<main role="main">
<main role="main">

9
tpl/page.tpl
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/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}
</head>
<body>
{if $use_nav_js}
<script src="https://n2.framasoft.org/nav/nav.js" type="text/javascript"></script>
{/if}
<div class="container ombre">
{include file='header.tpl'}
@ -37,4 +36,4 @@
</main>
</div> <!-- .container -->
</body>
</html>
</html>