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

don't display 'Always show site poster' menu entry if not applicable

Browse source
This commit is contained in:
rolux 2012-02-19 14:15:24 +00:00
parent d51deff865
commit 4ecf56e783
8 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pandora/0xdb.jsonc
View file

@ -545,7 +545,7 @@
"canAddAnnotations": {"staff": true, "admin": true}, "canAddAnnotations": {"staff": true, "admin": true},
"hasEvents": true, "hasEvents": true,
"hasPlaces": true, "hasPlaces": true,
"isSubtitle": true, "isSubtitles": true,
"item": "Subtitle", "item": "Subtitle",
"type": "text" "type": "text"
} }
@ -564,8 +564,8 @@
{"id": "calendar", "title": "on Calendar"} {"id": "calendar", "title": "on Calendar"}
], ],
"media": { "media": {
"importMoviePosters": true, "importPosters": true,
"importPosterFrames": true "importFrames": true
}, },
"personalLists": [ "personalLists": [
{"title": "Favorites"}, {"title": "Favorites"},

7
pandora/padma.jsonc
View file

@ -435,6 +435,7 @@
"title": "Places", "title": "Places",
"canAddAnnotations": {"member": true, "staff": true, "admin": true}, "canAddAnnotations": {"member": true, "staff": true, "admin": true},
"item": "Place", "item": "Place",
"overlap": true,
"type": "place" "type": "place"
}, },
{ {
@ -442,6 +443,7 @@
"title": "Events", "title": "Events",
"canAddAnnotations": {"member": true, "staff": true, "admin": true}, "canAddAnnotations": {"member": true, "staff": true, "admin": true},
"item": "Event", "item": "Event",
"overlap": true,
"type": "event" "type": "event"
}, },
{ {
@ -449,6 +451,7 @@
"title": "Keywords", "title": "Keywords",
"canAddAnnotations": {"member": true, "staff": true, "admin": true}, "canAddAnnotations": {"member": true, "staff": true, "admin": true},
"item": "Keyword", "item": "Keyword",
"overlap": true,
"type": "string" "type": "string"
}, },
{ {
@ -482,8 +485,8 @@
{"id": "calendar", "title": "on Calendar"} {"id": "calendar", "title": "on Calendar"}
], ],
"media": { "media": {
"importMoviePosters": false, "importPosters": false,
"importPosterFrames": false "importFrames": false
}, },
"personalLists": [ "personalLists": [
{"title": "Favorites"} {"title": "Favorites"}

4
static/js/pandora/URL.js
View file

@ -271,9 +271,11 @@ pandora.URL = (function() {
pandora.$ui.player.remove(); pandora.$ui.player.remove();
} }
if (e.state && !Ox.isEmpty(e.state)) { if (e.state && !Ox.isEmpty(e.state)) {
Ox.Log('', 'E.STATE', e.state) Ox.Log('URL', 'E.STATE', e.state)
document.title = e.state.title; document.title = e.state.title;
setState(e.state); setState(e.state);
} else if (window.location.pathname == '/') {
pandora.$ui.home = pandora.ui.home().fadeInScreen();
} else { } else {
that.parse(); that.parse();
} }

1
static/js/pandora/home.padma.js
View file

@ -489,6 +489,7 @@ pandora.ui.home = function() {
that.fadeOutScreen(); that.fadeOutScreen();
pandora.UI.set({ pandora.UI.set({
page: '', page: '',
item: '',
find: { find: {
conditions: [{ conditions: [{
key: 'list', key: 'list',

1
static/js/pandora/infoView.padma.js
View file

@ -734,7 +734,6 @@ pandora.ui.infoView = function(data) {
iconRatio = ui.icons == 'posters' iconRatio = ui.icons == 'posters'
? (ui.showSitePoster ? 5/8 : data.posterRatio) : 1; ? (ui.showSitePoster ? 5/8 : data.posterRatio) : 1;
toggleIconSize(); toggleIconSize();
pandora.user.level == 'admin' && $list.replaceWith($list = renderList());
}; };
that.resize = function() { that.resize = function() {

2
static/js/pandora/item.js
View file

@ -274,7 +274,7 @@ pandora.ui.item = function() {
out: pandora.user.ui.videoPoints[pandora.user.ui.item].out, out: pandora.user.ui.videoPoints[pandora.user.ui.item].out,
position: pandora.user.ui.videoPoints[pandora.user.ui.item].position, position: pandora.user.ui.videoPoints[pandora.user.ui.item].position,
posterFrame: result.data.posterFrame, posterFrame: result.data.posterFrame,
posterFrameControls: !pandora.site.media.importPosterFrames, posterFrameControls: !pandora.site.media.importFrames,
resolution: pandora.user.ui.videoResolution, resolution: pandora.user.ui.videoResolution,
selected: pandora.user.ui.videoPoints[pandora.user.ui.item].annotation selected: pandora.user.ui.videoPoints[pandora.user.ui.item].annotation
? pandora.user.ui.item + '/' + pandora.user.ui.videoPoints[pandora.user.ui.item].annotation ? pandora.user.ui.item + '/' + pandora.user.ui.videoPoints[pandora.user.ui.item].annotation

16
static/js/pandora/menu.js
View file

@ -58,13 +58,15 @@ pandora.ui.mainMenu = function() {
}, view); }, view);
}) }, }) },
]}, ]},
{ id: 'icons', title: 'Icons', items: [ { id: 'icons', title: 'Icons', items: Ox.merge([
{ group: 'viewicons', min: 1, max: 1, items: ['posters', 'frames'].map(function(icons) { { group: 'viewicons', min: 1, max: 1, items: ['posters', 'frames'].map(function(icons) {
return {id: icons, title: Ox.toTitleCase(icons), checked: ui.icons == icons}; return {id: icons, title: Ox.toTitleCase(icons), checked: ui.icons == icons};
}) }, }) }
{}, ], pandora.site.media.importPosters ? [
{ id: 'showsiteposter', title: 'Always Show ' + pandora.site.site.name + ' Poster', checked: ui.showSitePoster } {},
] }, { id: 'showsiteposter', title: 'Always Show ' + pandora.site.site.name + ' Poster', checked: ui.showSitePoster }
] : []
) },
{ id: 'columns', title: 'Columns', items: [ { id: 'columns', title: 'Columns', items: [
{ id: 'loadcolumns', title: 'Load Layout...', disabled: true }, { id: 'loadcolumns', title: 'Load Layout...', disabled: true },
{ id: 'savecolumns', title: 'Save Layout...', disabled: true }, { id: 'savecolumns', title: 'Save Layout...', disabled: true },

3
static/js/pandora/utils.js
View file

@ -179,6 +179,9 @@ pandora.clickLink = function(e) {
e.target.hostname == document.location.hostname e.target.hostname == document.location.hostname
&& !Ox.starts(e.target.pathname, '/static') && !Ox.starts(e.target.pathname, '/static')
) { ) {
if (pandora.$ui.home && e.target.pathname != '/home') {
pandora.$ui.home.fadeOutScreen();
}
pandora.URL.push(e.target.pathname); pandora.URL.push(e.target.pathname);
} else { } else {
window.open('/url=' + encodeURIComponent(e.target.href), '_blank'); window.open('/url=' + encodeURIComponent(e.target.href), '_blank');