further refinements for #96
This commit is contained in:
parent
3a7f8ab84d
commit
88c076ad11
|
@ -236,6 +236,7 @@ class QvitterAction extends ApiAction
|
||||||
window.siteLicenseTitle = '<?php print common_config('license', 'title'); ?>';
|
window.siteLicenseTitle = '<?php print common_config('license', 'title'); ?>';
|
||||||
window.siteLicenseURL = '<?php print common_config('license', 'url'); ?>';
|
window.siteLicenseURL = '<?php print common_config('license', 'url'); ?>';
|
||||||
window.customTermsOfUse = <?php print json_encode(QvitterPlugin::settings("customtermsofuse")); ?>;
|
window.customTermsOfUse = <?php print json_encode(QvitterPlugin::settings("customtermsofuse")); ?>;
|
||||||
|
window.siteLocalOnlyDefaultPath = <?php print (common_config('public', 'localonly') ? 'true' : 'false'); ?>;
|
||||||
|
|
||||||
// available language files and their last update time
|
// available language files and their last update time
|
||||||
window.availableLanguages = {<?php
|
window.availableLanguages = {<?php
|
||||||
|
|
|
@ -827,7 +827,16 @@ function getStreamFromUrl() {
|
||||||
var loc = window.location.href.replace('http://','').replace('https://','').replace(window.siteRootDomain,'');
|
var loc = window.location.href.replace('http://','').replace('https://','').replace(window.siteRootDomain,'');
|
||||||
|
|
||||||
// default/fallback
|
// default/fallback
|
||||||
var streamToSet = 'statuses/public_timeline.json';
|
if(window.loggedIn) {
|
||||||
|
var streamToSet = 'statuses/friends_timeline.json';
|
||||||
|
}
|
||||||
|
else if(window.siteLocalOnlyDefaultPath) {
|
||||||
|
var streamToSet = 'statuses/public_timeline.json';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
var streamToSet = 'statuses/public_and_external_timeline.json';
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// main/all, i.e. full network
|
// main/all, i.e. full network
|
||||||
if (loc == '/main/all') {
|
if (loc == '/main/all') {
|
||||||
|
|
|
@ -677,7 +677,8 @@ function isValidHexColor(maybeValidHexColor) {
|
||||||
function changeDesign(obj) {
|
function changeDesign(obj) {
|
||||||
|
|
||||||
// if we're logged out and this is the front page, we use the default design
|
// if we're logged out and this is the front page, we use the default design
|
||||||
if(!window.loggedIn && window.currentStream == 'statuses/public_timeline.json') {
|
if(!window.loggedIn &&
|
||||||
|
(window.currentStream == 'statuses/public_timeline.json' || window.currentStream == 'statuses/public_and_external_timeline.json')) {
|
||||||
obj.backgroundimage = window.fullUrlToThisQvitterApp + window.siteBackground;
|
obj.backgroundimage = window.fullUrlToThisQvitterApp + window.siteBackground;
|
||||||
obj.backgroundcolor = window.defaultBackgroundColor;
|
obj.backgroundcolor = window.defaultBackgroundColor;
|
||||||
obj.linkcolor = window.defaultLinkColor;
|
obj.linkcolor = window.defaultLinkColor;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user