Merge pull request #93 from llebegue/master
External parameter for favicon.ico
This commit is contained in:
commit
a1eb144b45
|
@ -50,7 +50,6 @@ class QvitterPlugin extends Plugin {
|
||||||
// THESE SETTINGS CAN BE OVERRIDDEN IN CONFIG.PHP
|
// THESE SETTINGS CAN BE OVERRIDDEN IN CONFIG.PHP
|
||||||
// e.g. $config['site']['qvitter']['enabledbydefault'] = 'false';
|
// e.g. $config['site']['qvitter']['enabledbydefault'] = 'false';
|
||||||
|
|
||||||
|
|
||||||
// ENABLED BY DEFAULT (true/false)
|
// ENABLED BY DEFAULT (true/false)
|
||||||
$settings['enabledbydefault'] = true;
|
$settings['enabledbydefault'] = true;
|
||||||
|
|
||||||
|
@ -60,6 +59,8 @@ class QvitterPlugin extends Plugin {
|
||||||
// DEFAULT BACKGROUND IMAGE
|
// DEFAULT BACKGROUND IMAGE
|
||||||
$settings['sitebackground'] = 'img/vagnsmossen.jpg';
|
$settings['sitebackground'] = 'img/vagnsmossen.jpg';
|
||||||
|
|
||||||
|
// DEFAULT FAVICON
|
||||||
|
$settings['favicon'] = 'img/favicon.ico?v=4';
|
||||||
|
|
||||||
// DEFAULT LINK COLOR
|
// DEFAULT LINK COLOR
|
||||||
$settings['defaultlinkcolor'] = '#0084B4';
|
$settings['defaultlinkcolor'] = '#0084B4';
|
||||||
|
|
|
@ -54,6 +54,7 @@ $config['site']['qvitter']['timebetweenpolling'] = 5000;
|
||||||
$config['site']['qvitter']['urlshortenerapiurl'] = 'http://qttr.at/yourls-api.php';
|
$config['site']['qvitter']['urlshortenerapiurl'] = 'http://qttr.at/yourls-api.php';
|
||||||
$config['site']['qvitter']['urlshortenersignature'] = 'b6afeec983';
|
$config['site']['qvitter']['urlshortenersignature'] = 'b6afeec983';
|
||||||
$config['site']['qvitter']['sitebackground'] = 'img/vagnsmossen.jpg';
|
$config['site']['qvitter']['sitebackground'] = 'img/vagnsmossen.jpg';
|
||||||
|
$config['site']['qvitter']['favicon'] = 'img/favicon.ico?v=4';
|
||||||
$config['thumbnail']['maxsize'] = 3000;
|
$config['thumbnail']['maxsize'] = 3000;
|
||||||
````
|
````
|
||||||
|
|
||||||
|
|
|
@ -105,7 +105,7 @@ class QvitterAction extends ApiAction
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0">
|
||||||
<link rel="stylesheet" type="text/css" href="<?php print $qvitterpath; ?>css/qvitter.css?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/css/qvitter.css')); ?>" />
|
<link rel="stylesheet" type="text/css" href="<?php print $qvitterpath; ?>css/qvitter.css?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/css/qvitter.css')); ?>" />
|
||||||
<link rel="stylesheet" type="text/css" href="<?php print $qvitterpath; ?>css/jquery.minicolors.css" />
|
<link rel="stylesheet" type="text/css" href="<?php print $qvitterpath; ?>css/jquery.minicolors.css" />
|
||||||
<link rel="shortcut icon" type="image/x-icon" href="<?php print $qvitterpath; ?>/img/favicon.ico?v=4">
|
<link rel="shortcut icon" type="image/x-icon" href="<?php print $qvitterpath; ?><?php print QvitterPlugin::settings("favicon"); ?>">
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
// if qvitter is a webapp and this is a users url we add feeds
|
// if qvitter is a webapp and this is a users url we add feeds
|
||||||
|
|
|
@ -772,9 +772,9 @@ window.l.fr.FAQ = 'FAQ';
|
||||||
window.l.fr.inviteAFriend = 'Invite des ami·e·s !';
|
window.l.fr.inviteAFriend = 'Invite des ami·e·s !';
|
||||||
window.l.fr.goToExternalProfile = 'Aller sur le profil complet';
|
window.l.fr.goToExternalProfile = 'Aller sur le profil complet';
|
||||||
window.l.fr.cropAndSave = 'Recadrer et enregistrer';
|
window.l.fr.cropAndSave = 'Recadrer et enregistrer';
|
||||||
window.l.fr.showTerms = 'Read our Terms of Use';
|
window.l.fr.showTerms = 'Consulter les conditions d\'utilisation';
|
||||||
window.l.fr.ellipsisMore = 'More';
|
window.l.fr.ellipsisMore = 'Plus';
|
||||||
window.l.fr.blockUser = 'Block {username}';
|
window.l.fr.blockUser = 'Bloquer {username}';
|
||||||
|
|
||||||
// deutsch
|
// deutsch
|
||||||
window.l.de = new Object();
|
window.l.de = new Object();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user