wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #100 from llebegue/master

Browse Source 
Fix issue #58
This commit is contained in:
Hannes Mannerheim 2015-02-04 21:59:04 +01:00
commit d5aa413187
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
QvitterPlugin.php
View File

@ -65,6 +65,9 @@ class QvitterPlugin extends Plugin {
// DEFAULT LINK COLOR // DEFAULT LINK COLOR
$settings['defaultlinkcolor'] = '#0084B4'; $settings['defaultlinkcolor'] = '#0084B4';
// ENABLE WELCOME TEXT
$settings['enablewelcometext'] = true;
// TIME BETWEEN POLLING // TIME BETWEEN POLLING
$settings['timebetweenpolling'] = 5000; // ms $settings['timebetweenpolling'] = 5000; // ms

1
README.md
View File

@ -56,6 +56,7 @@ $config['site']['qvitter']['urlshortenerapiurl'] = 'http://qttr.at/yourls-api.ph
$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['site']['qvitter']['favicon'] = 'img/favicon.ico?v=4';
$config['site']['qvitter']['enablewelcometext'] = true;
$config['site']['qvitter']['blocked_ips'] = array(); $config['site']['qvitter']['blocked_ips'] = array();
$config['thumbnail']['maxsize'] = 3000; $config['thumbnail']['maxsize'] = 3000;
```` ````

1
actions/qvitter.php
View File

@ -193,6 +193,7 @@ class QvitterAction extends ApiAction
window.defaultLinkColor = '<?php print QvitterPlugin::settings("defaultlinkcolor"); ?>'; window.defaultLinkColor = '<?php print QvitterPlugin::settings("defaultlinkcolor"); ?>';
window.defaultBackgroundColor = '<?php print QvitterPlugin::settings("defaultbackgroundcolor"); ?>'; window.defaultBackgroundColor = '<?php print QvitterPlugin::settings("defaultbackgroundcolor"); ?>';
window.siteBackground = '<?php print QvitterPlugin::settings("sitebackground"); ?>'; window.siteBackground = '<?php print QvitterPlugin::settings("sitebackground"); ?>';
window.enableWelcomeText = '<?php print QvitterPlugin::settings("enablewelcometext"); ?>';
window.urlShortenerAPIURL = '<?php print QvitterPlugin::settings("urlshortenerapiurl"); ?>'; window.urlShortenerAPIURL = '<?php print QvitterPlugin::settings("urlshortenerapiurl"); ?>';
window.urlShortenerSignature = '<?php print QvitterPlugin::settings("urlshortenersignature"); ?>'; window.urlShortenerSignature = '<?php print QvitterPlugin::settings("urlshortenersignature"); ?>';
window.commonSessionToken = '<?php print common_session_token(); ?>'; window.commonSessionToken = '<?php print common_session_token(); ?>';

4
js/lan.js
View File

@ -2326,7 +2326,9 @@ $.each(window.sL,function(k,v){
// set some static string // set some static string
$('.front-welcome-text h1').html(window.sL.welcomeHeading); $('.front-welcome-text h1').html(window.sL.welcomeHeading);
$('.front-welcome-text p').html(window.sL.welcomeText); if (window.enableWelcomeText) {
$('.front-welcome-text p').html(window.sL.welcomeText);
}
$('#nickname').attr('placeholder',window.sL.loginUsername); $('#nickname').attr('placeholder',window.sL.loginUsername);
$('#password').attr('placeholder',window.sL.loginPassword); $('#password').attr('placeholder',window.sL.loginPassword);
$('button#submit-login').html(window.sL.loginSignIn); $('button#submit-login').html(window.sL.loginSignIn);