diff --git a/pandora/scripts/item_icon b/pandora/scripts/item_icon index 94b7b407..16267c1c 100755 --- a/pandora/scripts/item_icon +++ b/pandora/scripts/item_icon @@ -20,13 +20,13 @@ import sys static_root = os.path.join(os.path.dirname(__file__), '..', '..', 'static') def render_icon(frame, timeline, icon): - icon_width = 512 - icon_height = 512 + icon_width = 1024 + icon_height = 1024 icon_image = Image.new('RGBA', (icon_width, icon_height), (0, 0, 0, 0)) frame_width = icon_width - frame_ratio = 4 / 3 + frame_ratio = 1 frame_height = int(round(frame_width / frame_ratio)) - frame_image = Image.open(frame) if frame else Image.new('RGB', (512, 384), (0, 0, 0)) + frame_image = Image.open(frame) if frame else Image.new('RGB', (1024, 768), (0, 0, 0)) frame_image_ratio = frame_image.size[0] / frame_image.size[1] if frame_ratio < frame_image_ratio: frame_image = frame_image.resize((int(frame_height * frame_image_ratio), frame_height), Image.ANTIALIAS) @@ -36,13 +36,20 @@ def render_icon(frame, timeline, icon): frame_image = frame_image.resize((frame_width, int(frame_width / frame_image_ratio)), Image.ANTIALIAS) top = int((frame_image.size[1] - frame_height) / 2) frame_image = frame_image.crop((0, top, frame_width, top + frame_height)) - mask_image = Image.open(os.path.join(static_root, 'png', 'icon.mask.png')) icon_image.paste(frame_image, (0, 0)) - timeline_image = Image.open(timeline) if timeline else Image.new('RGB', (512, 128), (0, 0, 0)) - timeline_image = timeline_image.resize((icon_width, 128), Image.ANTIALIAS) - icon_image.paste(timeline_image, (0, icon_height - 128)) + timeline_left = 64 + timeline_top = 832 + timeline_width = 896 + timeline_height = 128 + timeline_image = Image.new('RGB', (timeline_width + 8, timeline_height + 8), (255, 255, 255)) + mask_image = Image.open(os.path.join(static_root, 'png', 'iconTimelineOuterMask.png')) + icon_image.paste(timeline_image, (timeline_left - 4, timeline_top - 4), mask=mask_image) + timeline_image = Image.open(timeline) if timeline else Image.new('RGB', (timeline_width, timeline_height), (0, 0, 0)) + timeline_image = timeline_image.resize((timeline_width, timeline_height), Image.ANTIALIAS) + mask_image = Image.open(os.path.join(static_root, 'png', 'iconTimelineInnerMask.png')) + icon_image.paste(timeline_image, (timeline_left, timeline_top), mask=mask_image) # we're using jpegs with border-radius - # mask_image = Image.open(os.path.join(static_root, 'png', 'icon.mask.png')) + # mask_image = Image.open(os.path.join(static_root, 'png', 'iconMask.png')) # icon_image.putalpha(mask_image) icon_image.save(icon) diff --git a/pandora/templates/api.html b/pandora/templates/api.html index 59d3da74..0d64e930 100644 --- a/pandora/templates/api.html +++ b/pandora/templates/api.html @@ -4,7 +4,7 @@ {{sitename}} API - + diff --git a/pandora/templates/embed.html b/pandora/templates/embed.html index c4e2cc08..4bcb82fe 100644 --- a/pandora/templates/embed.html +++ b/pandora/templates/embed.html @@ -3,7 +3,7 @@ {{settings.SITENAME}} - + + + diff --git a/static/js/pandora/UI.js b/static/js/pandora/UI.js index d7a13eff..8804bb3b 100644 --- a/static/js/pandora/UI.js +++ b/static/js/pandora/UI.js @@ -1,13 +1,8 @@ // vim: et:ts=4:sw=4:sts=4:ft=javascript pandora.UI = (function() { return { - set: function(obj) { - if (arguments.length == 2) { - // translate (key, value) to {key: value} - var obj_ = {}; - obj_[arguments[0]] = arguments[1]; - obj = obj_; - } + set: function(/*{key: val} or key, val*/) { + var obj = Ox.makeObject(arguments); $.each(obj, function(key, val) { Ox.print('key', key, 'val', val); var i = 0, @@ -24,7 +19,6 @@ pandora.UI = (function() { } }); Ox.len(obj) && pandora.api.setUI(obj); - //alert('set ' + JSON.stringify(obj)) } } }()); diff --git a/static/js/pandora/ui/menu.js b/static/js/pandora/ui/menu.js index 53e37310..47352d94 100644 --- a/static/js/pandora/ui/menu.js +++ b/static/js/pandora/ui/menu.js @@ -165,36 +165,33 @@ pandora.ui.mainMenu = function() { }) .bindEvent({ change: function(event, data) { + var value = data.checked[0].id; if (data.id == 'find') { - var id = data.checked[0].id; - pandora.$ui.findSelect.selectItem(id); - } else if (data.id == 'icons') { + pandora.$ui.findSelect.selectItem(value); + } else if (data.id == 'movieview') { + var id = document.location.pathname.split('/')[1]; + if (value == 'info') + url(id + '/info'); + else + url(id); + } else if (data.id == 'ordermovies') { + pandora.$ui.list.sortList(pandora.user.ui.lists[pandora.user.ui.list].sort[0].key, value == 'ascending' ? '' : '-'); + } else if (data.id == 'sortmovies') { + var operator = pandora.getSortOperator(value); + pandora.$ui.mainMenu.checkItem('sortMenu_ordermovies_' + (operator === '' ? 'ascending' : 'descending')); + pandora.$ui.sortSelect.selectItem(value); + pandora.$ui.list.sortList(value, operator); + pandora.URL.set(pandora.Query.toString()); + } else if (data.id == 'viewicons') { + pandora.UI.set({icons: value}) var $list = !pandora.user.ui.item ? pandora.$ui.list : pandora.$ui.browser; /* list.options({ item: }); */ - } else if (data.id == 'movieview') { - var view = data.checked[0].id; - var id = document.location.pathname.split('/')[1]; - if (view == 'info') - url(id + '/info'); - else - url(id); - } else if (data.id == 'ordermovies') { - var id = data.checked[0].id; - pandora.$ui.list.sortList(pandora.user.ui.lists[pandora.user.ui.list].sort[0].key, id == 'ascending' ? '' : '-'); - } else if (data.id == 'sortmovies') { - var id = data.checked[0].id, - operator = pandora.getSortOperator(id); - pandora.$ui.mainMenu.checkItem('sortMenu_ordermovies_' + (operator === '' ? 'ascending' : 'descending')); - pandora.$ui.sortSelect.selectItem(id); - pandora.$ui.list.sortList(id, operator); - pandora.URL.set(pandora.Query.toString()); } else if (data.id == 'viewmovies') { - var view = data.checked[0].id; - url('#view=' + view); + url('#view=' + value); } }, click: function(event, data) { diff --git a/static/png/icon.mask.png b/static/png/icon.mask.png deleted file mode 100644 index f1336538..00000000 Binary files a/static/png/icon.mask.png and /dev/null differ diff --git a/static/png/icon.16.png b/static/png/icon16.png similarity index 100% rename from static/png/icon.16.png rename to static/png/icon16.png diff --git a/static/png/iconMask.png b/static/png/iconMask.png new file mode 100644 index 00000000..df3efd76 Binary files /dev/null and b/static/png/iconMask.png differ diff --git a/static/png/iconTimeline.png b/static/png/iconTimeline.png new file mode 100644 index 00000000..58098d08 Binary files /dev/null and b/static/png/iconTimeline.png differ diff --git a/static/png/iconTimelineInnerMask.png b/static/png/iconTimelineInnerMask.png new file mode 100644 index 00000000..6176d5b5 Binary files /dev/null and b/static/png/iconTimelineInnerMask.png differ diff --git a/static/png/iconTimelineOuterMask.png b/static/png/iconTimelineOuterMask.png new file mode 100644 index 00000000..a9db0b90 Binary files /dev/null and b/static/png/iconTimelineOuterMask.png differ