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

Merge branch 'feature/favicon' into 'develop'

Browse Source 
Add favicon path to config

See merge request !164
This commit is contained in:
Olivier Perez 2017-02-23 00:04:28 +01:00
commit d69de89f2f
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/inc/config.template.php
View File

@ -64,6 +64,9 @@ $ALLOWED_LANGUAGES = [
// Nom et emplacement du fichier image contenant le titre // Nom et emplacement du fichier image contenant le titre
const IMAGE_TITRE = 'images/logo-framadate.png'; const IMAGE_TITRE = 'images/logo-framadate.png';
// Relative path to favicon
const FAVICON = 'favicon.ico';
// Clean URLs, boolean // Clean URLs, boolean
const URL_PROPRE = false; const URL_PROPRE = false;

5
app/inc/smarty.php
View File

@ -36,6 +36,9 @@ $smarty->assign('date_format', $date_format);
if (isset($config['tracking_code'])) { if (isset($config['tracking_code'])) {
$smarty->assign('tracking_code', $config['tracking_code']); $smarty->assign('tracking_code', $config['tracking_code']);
} }
if (defined('FAVICON')) {
$smarty->assign('favicon', FAVICON);
}
// Dev Mode // Dev Mode
if (isset($_SERVER['FRAMADATE_DEVMODE']) && $_SERVER['FRAMADATE_DEVMODE']) { if (isset($_SERVER['FRAMADATE_DEVMODE']) && $_SERVER['FRAMADATE_DEVMODE']) {
@ -73,4 +76,4 @@ function smarty_modifier_addslashes_single_quote($string) {
function smarty_modifier_html($html) { function smarty_modifier_html($html) {
return Utils::htmlEscape($html); return Utils::htmlEscape($html);
} }

4
tpl/page.tpl
View File

@ -9,6 +9,10 @@
<title>{$APPLICATION_NAME|html}</title> <title>{$APPLICATION_NAME|html}</title>
{/if} {/if}
{if isset($favicon)}
<link rel="icon" href="{$favicon|resource}">
{/if}
<link rel="stylesheet" href="{'css/bootstrap.min.css'|resource}"> <link rel="stylesheet" href="{'css/bootstrap.min.css'|resource}">
<link rel="stylesheet" href="{'css/datepicker3.css'|resource}"> <link rel="stylesheet" href="{'css/datepicker3.css'|resource}">
<link rel="stylesheet" href="{'css/style.css'|resource}"> <link rel="stylesheet" href="{'css/style.css'|resource}">