diff --git a/pandora/0xdb.jsonc b/pandora/0xdb.jsonc index 23853ccc..55ea65cb 100644 --- a/pandora/0xdb.jsonc +++ b/pandora/0xdb.jsonc @@ -545,7 +545,7 @@ "canAddAnnotations": {"staff": true, "admin": true}, "hasEvents": true, "hasPlaces": true, - "isSubtitle": true, + "isSubtitles": true, "item": "Subtitle", "type": "text" } @@ -564,8 +564,8 @@ {"id": "calendar", "title": "on Calendar"} ], "media": { - "importMoviePosters": true, - "importPosterFrames": true + "importPosters": true, + "importFrames": true }, "personalLists": [ {"title": "Favorites"}, diff --git a/pandora/padma.jsonc b/pandora/padma.jsonc index 4ae33576..d608ccc6 100644 --- a/pandora/padma.jsonc +++ b/pandora/padma.jsonc @@ -435,6 +435,7 @@ "title": "Places", "canAddAnnotations": {"member": true, "staff": true, "admin": true}, "item": "Place", + "overlap": true, "type": "place" }, { @@ -442,6 +443,7 @@ "title": "Events", "canAddAnnotations": {"member": true, "staff": true, "admin": true}, "item": "Event", + "overlap": true, "type": "event" }, { @@ -449,6 +451,7 @@ "title": "Keywords", "canAddAnnotations": {"member": true, "staff": true, "admin": true}, "item": "Keyword", + "overlap": true, "type": "string" }, { @@ -482,8 +485,8 @@ {"id": "calendar", "title": "on Calendar"} ], "media": { - "importMoviePosters": false, - "importPosterFrames": false + "importPosters": false, + "importFrames": false }, "personalLists": [ {"title": "Favorites"} diff --git a/static/js/pandora/URL.js b/static/js/pandora/URL.js index 11bc28ac..deb9c0d4 100644 --- a/static/js/pandora/URL.js +++ b/static/js/pandora/URL.js @@ -271,9 +271,11 @@ pandora.URL = (function() { pandora.$ui.player.remove(); } 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; setState(e.state); + } else if (window.location.pathname == '/') { + pandora.$ui.home = pandora.ui.home().fadeInScreen(); } else { that.parse(); } diff --git a/static/js/pandora/home.padma.js b/static/js/pandora/home.padma.js index 979b563c..b9f3f8a5 100644 --- a/static/js/pandora/home.padma.js +++ b/static/js/pandora/home.padma.js @@ -489,6 +489,7 @@ pandora.ui.home = function() { that.fadeOutScreen(); pandora.UI.set({ page: '', + item: '', find: { conditions: [{ key: 'list', diff --git a/static/js/pandora/infoView.padma.js b/static/js/pandora/infoView.padma.js index b2408006..75ccbc9c 100644 --- a/static/js/pandora/infoView.padma.js +++ b/static/js/pandora/infoView.padma.js @@ -734,7 +734,6 @@ pandora.ui.infoView = function(data) { iconRatio = ui.icons == 'posters' ? (ui.showSitePoster ? 5/8 : data.posterRatio) : 1; toggleIconSize(); - pandora.user.level == 'admin' && $list.replaceWith($list = renderList()); }; that.resize = function() { diff --git a/static/js/pandora/item.js b/static/js/pandora/item.js index f18cf6e6..d5dc907e 100644 --- a/static/js/pandora/item.js +++ b/static/js/pandora/item.js @@ -274,7 +274,7 @@ pandora.ui.item = function() { out: pandora.user.ui.videoPoints[pandora.user.ui.item].out, position: pandora.user.ui.videoPoints[pandora.user.ui.item].position, posterFrame: result.data.posterFrame, - posterFrameControls: !pandora.site.media.importPosterFrames, + posterFrameControls: !pandora.site.media.importFrames, resolution: pandora.user.ui.videoResolution, selected: pandora.user.ui.videoPoints[pandora.user.ui.item].annotation ? pandora.user.ui.item + '/' + pandora.user.ui.videoPoints[pandora.user.ui.item].annotation diff --git a/static/js/pandora/menu.js b/static/js/pandora/menu.js index f68b2813..26520d02 100644 --- a/static/js/pandora/menu.js +++ b/static/js/pandora/menu.js @@ -58,13 +58,15 @@ pandora.ui.mainMenu = function() { }, view); }) }, ]}, - { id: 'icons', title: 'Icons', items: [ - { group: 'viewicons', min: 1, max: 1, items: ['posters', 'frames'].map(function(icons) { - return {id: icons, title: Ox.toTitleCase(icons), checked: ui.icons == icons}; - }) }, - {}, - { id: 'showsiteposter', title: 'Always Show ' + pandora.site.site.name + ' Poster', checked: ui.showSitePoster } - ] }, + { id: 'icons', title: 'Icons', items: Ox.merge([ + { group: 'viewicons', min: 1, max: 1, items: ['posters', 'frames'].map(function(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: 'columns', title: 'Columns', items: [ { id: 'loadcolumns', title: 'Load Layout...', disabled: true }, { id: 'savecolumns', title: 'Save Layout...', disabled: true }, diff --git a/static/js/pandora/utils.js b/static/js/pandora/utils.js index ef725166..c3c3e91a 100644 --- a/static/js/pandora/utils.js +++ b/static/js/pandora/utils.js @@ -179,6 +179,9 @@ pandora.clickLink = function(e) { e.target.hostname == document.location.hostname && !Ox.starts(e.target.pathname, '/static') ) { + if (pandora.$ui.home && e.target.pathname != '/home') { + pandora.$ui.home.fadeOutScreen(); + } pandora.URL.push(e.target.pathname); } else { window.open('/url=' + encodeURIComponent(e.target.href), '_blank');