Compare commits
2 commits
97a38513a3
...
d7fa7efcbc
| Author | SHA1 | Date | |
|---|---|---|---|
| d7fa7efcbc | |||
| 1d40ceca8f |
5 changed files with 25 additions and 2 deletions
|
|
@ -864,6 +864,8 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
|
||||||
"canPlayClips": If true, clips from this layer will play for users
|
"canPlayClips": If true, clips from this layer will play for users
|
||||||
with canPlayClips access
|
with canPlayClips access
|
||||||
"entity": ID of the referenced entity (if type is "entity")
|
"entity": ID of the referenced entity (if type is "entity")
|
||||||
|
"getDefaults": function in pandora namespace that gets called
|
||||||
|
to populate defaults for new annotations. i.e. getCurrentFrameAnnotation
|
||||||
"hasEvents": If true, the calendar will be populated with matches from
|
"hasEvents": If true, the calendar will be populated with matches from
|
||||||
this layer
|
this layer
|
||||||
"hasPlaces": If true, the map will be populated with matches from this
|
"hasPlaces": If true, the map will be populated with matches from this
|
||||||
|
|
|
||||||
|
|
@ -307,6 +307,11 @@ class Item(models.Model):
|
||||||
response = external_data('getData', {'id': self.public_id})
|
response = external_data('getData', {'id': self.public_id})
|
||||||
if response['status']['code'] == 200:
|
if response['status']['code'] == 200:
|
||||||
self.external_data = response['data']
|
self.external_data = response['data']
|
||||||
|
keys = [
|
||||||
|
k['id'] for k in settings.CONFIG['itemKeys']
|
||||||
|
] + settings.ADDITIONAL_IMDB_KEYS
|
||||||
|
for key in set(self.external_data) - set(keys):
|
||||||
|
del self.external_data[key]
|
||||||
self.save(sync=True)
|
self.save(sync=True)
|
||||||
if poster_url != self.prefered_poster_url():
|
if poster_url != self.prefered_poster_url():
|
||||||
self.remove_poster()
|
self.remove_poster()
|
||||||
|
|
|
||||||
|
|
@ -217,6 +217,11 @@ POSTER_PRECEDENCE = ()
|
||||||
POSTER_ONLY_PORTRAIT = ()
|
POSTER_ONLY_PORTRAIT = ()
|
||||||
|
|
||||||
USE_IMDB = False
|
USE_IMDB = False
|
||||||
|
ADDITIONAL_IMDB_KEYS = [
|
||||||
|
'cast',
|
||||||
|
'links', 'reviews', 'posters',
|
||||||
|
'alternativeTitles', 'originalTitle',
|
||||||
|
]
|
||||||
|
|
||||||
#If you set VIDEO_PREFIX make sure cookies work accros subsomains
|
#If you set VIDEO_PREFIX make sure cookies work accros subsomains
|
||||||
#by setting SESSION_COOKIE_DOMAIN to ".domain.tld"
|
#by setting SESSION_COOKIE_DOMAIN to ".domain.tld"
|
||||||
|
|
|
||||||
|
|
@ -114,7 +114,8 @@ pandora.ui.editor = function(data) {
|
||||||
// async to not capture keyboard input
|
// async to not capture keyboard input
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
var created = Ox.formatDate(new Date(), '%Y-%m-%dT%H:%M:%SZ'),
|
var created = Ox.formatDate(new Date(), '%Y-%m-%dT%H:%M:%SZ'),
|
||||||
type = Ox.getObjectById(pandora.site.layers, data.layer).type;
|
layer = Ox.getObjectById(pandora.site.layers, data.layer),
|
||||||
|
type = layer.type;
|
||||||
that.addAnnotation(data.layer, Ox.extend(
|
that.addAnnotation(data.layer, Ox.extend(
|
||||||
{
|
{
|
||||||
created: created,
|
created: created,
|
||||||
|
|
@ -131,7 +132,8 @@ pandora.ui.editor = function(data) {
|
||||||
place: {lat: null, lng: null}
|
place: {lat: null, lng: null}
|
||||||
} : type == 'event' ? {
|
} : type == 'event' ? {
|
||||||
event: {start: '', end: ''}
|
event: {start: '', end: ''}
|
||||||
} : {}
|
} : {},
|
||||||
|
layer.getDefaults ? pandora[layer.getDefaults](data) : {}
|
||||||
));
|
));
|
||||||
Ox.Request.clearCache();
|
Ox.Request.clearCache();
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1274,6 +1274,15 @@ pandora.getClipVideos = function(clip, resolution) {
|
||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
pandora.getCurrentFrameAnnotation = function(data) {
|
||||||
|
var ui = pandora.user.ui,
|
||||||
|
position = ui.videoPoints[ui.item].position,
|
||||||
|
resolution = Ox.max(pandora.site.video.resolutions);
|
||||||
|
return {
|
||||||
|
value: '<img src="/' + ui.item + '/' + resolution + 'p' + position + '.jpg">\n\n'
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
var itemTitles = {}, documentTitles = {};
|
var itemTitles = {}, documentTitles = {};
|
||||||
pandora.getWindowTitle = function(itemData) {
|
pandora.getWindowTitle = function(itemData) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue