0x2620
/
pandora
2
1
Fork 1
Code Issues 1.3k Pull Requests Releases Wiki Activity

make flags a site (not user) config (fixes #1268)

This commit is contained in:
rolux 2013-02-20 01:27:59 +05:30
parent cd4c7b62a1
commit e00c33a623
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora/config.0xdb.jsonc
View File

@ -86,6 +86,7 @@
{"id": "actor", "title": "Actor", "type": "string"},
{"id": "keyword", "title": "Keyword", "type": "string"}
],
"flags": true,
/*
An itemKey must have the following properties:
id: The id of the key (as known by the server)
@ -735,7 +736,6 @@
"showBrowser": true,
"showCalendarControls": true, // fixme: should be false
"showFilters": true,
"showFlags": true, // fixme: this should be a site preference
"showHome": true,
"showIconBrowser": false,
"showInfo": true,

2
pandora/config.indiancinema.jsonc
View File

@ -87,6 +87,7 @@
{"id": "actor", "title": "Actor", "type": "string"},
{"id": "keyword", "title": "Keyword", "type": "string"}
],
"flags": false,
/*
An itemKey must have the following properties:
id: The id of the key (as known by the server)
@ -735,7 +736,6 @@
"showBrowser": true,
"showCalendarControls": true, // fixme: should be false
"showFilters": true,
"showFlags": false, // fixme: this should be a site preference
"showHome": true,
"showIconBrowser": false,
"showInfo": true,

2
pandora/config.padma.jsonc
View File

@ -82,6 +82,7 @@
{"id": "events", "title": "Events", "type": "string"},
{"id": "keywords", "title": "Keywords", "type": "string"}
],
"flags": false,
/*
An itemKey must have the following properties:
id: The id of the key (as known by the server)
@ -655,7 +656,6 @@
"showBrowser": true,
"showCalendarControls": true, // fixme: should be false
"showFilters": true,
"showFlags": false,
"showHome": true,
"showIconBrowser": false,
"showInfo": true,

2
pandora/config.pandora.jsonc
View File

@ -79,6 +79,7 @@
{"id": "featuring", "title": "Featuring", "type": "string"},
{"id": "keywords", "title": "Keywords", "type": "string"}
],
"flags": false,
/*
An itemKey must have the following properties:
id: The id of the key (as known by the server)
@ -574,7 +575,6 @@
"showBrowser": true,
"showCalendarControls": true, // fixme: should be false
"showFilters": true,
"showFlags": false,
"showHome": true,
"showIconBrowser": false,
"showInfo": true,

2
static/js/pandora/filter.js
View File

@ -15,7 +15,7 @@ pandora.ui.filter = function(id) {
align: 'left',
id: 'name',
format: function(value) {
return pandora.user.ui.showFlags && ['country', 'language'].indexOf(id) > -1
return pandora.site.flags && ['country', 'language'].indexOf(id) > -1
? $('<div>')
.append(
$('<img>')

2
static/js/pandora/utils.js
View File

@ -1132,7 +1132,7 @@ pandora.resizeFilters = function(width) {
.size(2, pandora.user.ui.filterSizes[3]);
pandora.$ui.filters && pandora.$ui.filters.forEach(function($list, i) {
$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})
}
});