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

Merge pull request #84 from llebegue/master

Browse Source 
Fix #41 Image background as external parameter
This commit is contained in:
Hannes Mannerheim 2015-01-21 21:16:20 +01:00
commit a2b3de3cbd
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
QvitterPlugin.php
View File

@ -57,6 +57,10 @@ class QvitterPlugin extends Plugin {
// DEFAULT BACKGROUND COLOR // DEFAULT BACKGROUND COLOR
$settings['defaultbackgroundcolor'] = '#f4f4f4'; $settings['defaultbackgroundcolor'] = '#f4f4f4';
// DEFAULT BACKGROUND IMAGE
$settings['sitebackground'] = 'img/vagnsmossen.jpg';
// DEFAULT LINK COLOR // DEFAULT LINK COLOR
$settings['defaultlinkcolor'] = '#0084B4'; $settings['defaultlinkcolor'] = '#0084B4';

1
README.md
View File

@ -52,6 +52,7 @@ $config['site']['qvitter']['defaultlinkcolor'] = '#0084B4';
$config['site']['qvitter']['timebetweenpolling'] = 5000; $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';
```` ````
Note: Qvitter is tested with GNU Social version 1.1.1-alpha2 (7e47026085fa4f2071e694d9c3e3fe2aa5142135). Note: Qvitter is tested with GNU Social version 1.1.1-alpha2 (7e47026085fa4f2071e694d9c3e3fe2aa5142135).

1
actions/qvitter.php
View File

@ -181,6 +181,7 @@ class QvitterAction extends ApiAction
window.siteInstanceURL = '<?php print $instanceurl; ?>'; window.siteInstanceURL = '<?php print $instanceurl; ?>';
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.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(); ?>';

2
js/qvitter.js
View File

@ -446,7 +446,7 @@ $('#classic-link').click(function(){
function logoutWithoutReload(doShake) { function logoutWithoutReload(doShake) {
if(window.currentStream == 'statuses/public_timeline.json') { if(window.currentStream == 'statuses/public_timeline.json') {
$('body').css('background-image', 'url(' + window.fullUrlToThisQvitterApp + 'img/vagnsmossen.jpg)'); $('body').css('background-image', 'url(' + window.fullUrlToThisQvitterApp + window.siteBackground)');
} }
$('input#nickname').focus(); $('input#nickname').focus();