forked from 0x2620/pandora
make flags a site (not user) config (fixes #1268)
This commit is contained in:
parent
cd4c7b62a1
commit
e00c33a623
6 changed files with 6 additions and 6 deletions
|
@ -86,6 +86,7 @@
|
||||||
{"id": "actor", "title": "Actor", "type": "string"},
|
{"id": "actor", "title": "Actor", "type": "string"},
|
||||||
{"id": "keyword", "title": "Keyword", "type": "string"}
|
{"id": "keyword", "title": "Keyword", "type": "string"}
|
||||||
],
|
],
|
||||||
|
"flags": true,
|
||||||
/*
|
/*
|
||||||
An itemKey must have the following properties:
|
An itemKey must have the following properties:
|
||||||
id: The id of the key (as known by the server)
|
id: The id of the key (as known by the server)
|
||||||
|
@ -735,7 +736,6 @@
|
||||||
"showBrowser": true,
|
"showBrowser": true,
|
||||||
"showCalendarControls": true, // fixme: should be false
|
"showCalendarControls": true, // fixme: should be false
|
||||||
"showFilters": true,
|
"showFilters": true,
|
||||||
"showFlags": true, // fixme: this should be a site preference
|
|
||||||
"showHome": true,
|
"showHome": true,
|
||||||
"showIconBrowser": false,
|
"showIconBrowser": false,
|
||||||
"showInfo": true,
|
"showInfo": true,
|
||||||
|
|
|
@ -87,6 +87,7 @@
|
||||||
{"id": "actor", "title": "Actor", "type": "string"},
|
{"id": "actor", "title": "Actor", "type": "string"},
|
||||||
{"id": "keyword", "title": "Keyword", "type": "string"}
|
{"id": "keyword", "title": "Keyword", "type": "string"}
|
||||||
],
|
],
|
||||||
|
"flags": false,
|
||||||
/*
|
/*
|
||||||
An itemKey must have the following properties:
|
An itemKey must have the following properties:
|
||||||
id: The id of the key (as known by the server)
|
id: The id of the key (as known by the server)
|
||||||
|
@ -735,7 +736,6 @@
|
||||||
"showBrowser": true,
|
"showBrowser": true,
|
||||||
"showCalendarControls": true, // fixme: should be false
|
"showCalendarControls": true, // fixme: should be false
|
||||||
"showFilters": true,
|
"showFilters": true,
|
||||||
"showFlags": false, // fixme: this should be a site preference
|
|
||||||
"showHome": true,
|
"showHome": true,
|
||||||
"showIconBrowser": false,
|
"showIconBrowser": false,
|
||||||
"showInfo": true,
|
"showInfo": true,
|
||||||
|
|
|
@ -82,6 +82,7 @@
|
||||||
{"id": "events", "title": "Events", "type": "string"},
|
{"id": "events", "title": "Events", "type": "string"},
|
||||||
{"id": "keywords", "title": "Keywords", "type": "string"}
|
{"id": "keywords", "title": "Keywords", "type": "string"}
|
||||||
],
|
],
|
||||||
|
"flags": false,
|
||||||
/*
|
/*
|
||||||
An itemKey must have the following properties:
|
An itemKey must have the following properties:
|
||||||
id: The id of the key (as known by the server)
|
id: The id of the key (as known by the server)
|
||||||
|
@ -655,7 +656,6 @@
|
||||||
"showBrowser": true,
|
"showBrowser": true,
|
||||||
"showCalendarControls": true, // fixme: should be false
|
"showCalendarControls": true, // fixme: should be false
|
||||||
"showFilters": true,
|
"showFilters": true,
|
||||||
"showFlags": false,
|
|
||||||
"showHome": true,
|
"showHome": true,
|
||||||
"showIconBrowser": false,
|
"showIconBrowser": false,
|
||||||
"showInfo": true,
|
"showInfo": true,
|
||||||
|
|
|
@ -79,6 +79,7 @@
|
||||||
{"id": "featuring", "title": "Featuring", "type": "string"},
|
{"id": "featuring", "title": "Featuring", "type": "string"},
|
||||||
{"id": "keywords", "title": "Keywords", "type": "string"}
|
{"id": "keywords", "title": "Keywords", "type": "string"}
|
||||||
],
|
],
|
||||||
|
"flags": false,
|
||||||
/*
|
/*
|
||||||
An itemKey must have the following properties:
|
An itemKey must have the following properties:
|
||||||
id: The id of the key (as known by the server)
|
id: The id of the key (as known by the server)
|
||||||
|
@ -574,7 +575,6 @@
|
||||||
"showBrowser": true,
|
"showBrowser": true,
|
||||||
"showCalendarControls": true, // fixme: should be false
|
"showCalendarControls": true, // fixme: should be false
|
||||||
"showFilters": true,
|
"showFilters": true,
|
||||||
"showFlags": false,
|
|
||||||
"showHome": true,
|
"showHome": true,
|
||||||
"showIconBrowser": false,
|
"showIconBrowser": false,
|
||||||
"showInfo": true,
|
"showInfo": true,
|
||||||
|
|
|
@ -15,7 +15,7 @@ pandora.ui.filter = function(id) {
|
||||||
align: 'left',
|
align: 'left',
|
||||||
id: 'name',
|
id: 'name',
|
||||||
format: function(value) {
|
format: function(value) {
|
||||||
return pandora.user.ui.showFlags && ['country', 'language'].indexOf(id) > -1
|
return pandora.site.flags && ['country', 'language'].indexOf(id) > -1
|
||||||
? $('<div>')
|
? $('<div>')
|
||||||
.append(
|
.append(
|
||||||
$('<img>')
|
$('<img>')
|
||||||
|
|
|
@ -1132,7 +1132,7 @@ pandora.resizeFilters = function(width) {
|
||||||
.size(2, pandora.user.ui.filterSizes[3]);
|
.size(2, pandora.user.ui.filterSizes[3]);
|
||||||
pandora.$ui.filters && pandora.$ui.filters.forEach(function($list, i) {
|
pandora.$ui.filters && pandora.$ui.filters.forEach(function($list, i) {
|
||||||
$list.resizeColumn('name', pandora.user.ui.filterSizes[i] - 44 - Ox.UI.SCROLLBAR_SIZE);
|
$list.resizeColumn('name', pandora.user.ui.filterSizes[i] - 44 - Ox.UI.SCROLLBAR_SIZE);
|
||||||
if (pandora.user.ui.showFlags) {
|
if (pandora.site.flags) {
|
||||||
$list.find('.flagname').css({width: pandora.user.ui.filterSizes[i] - 68 - Ox.UI.SCROLLBAR_SIZE})
|
$list.find('.flagname').css({width: pandora.user.ui.filterSizes[i] - 68 - Ox.UI.SCROLLBAR_SIZE})
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue