From 4d5b0ded2721b1e10f1055396e99a7e6b32ffc0b Mon Sep 17 00:00:00 2001
From: rolux <rolux@rollux.org>
Date: Sun, 21 Aug 2011 08:17:10 +0000
Subject: [PATCH] merging changes

---
 pandora/0xdb.json                | 9 +++++++++
 static/js/pandora/ui/infoView.js | 3 ++-
 static/js/pandora/ui/menu.js     | 4 +++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pandora/0xdb.json b/pandora/0xdb.json
index 73adebf2..e0aa3a22 100644
--- a/pandora/0xdb.json
+++ b/pandora/0xdb.json
@@ -1,4 +1,13 @@
 {
+    "clipKeys": [
+        {"id": "value", "title": "Text"},
+        {"id": "in", "title": "Position"},
+        {"id": "duration": "title": "Duration"},
+        {"id": "hue", "title": "Hue"},
+        {"id": "saturation", "title": "Saturation"},
+        {"id": "lightness": "title": "Lightness"},
+        {"id": "volume": "title": "Volume"}
+    ],
     "groups": [
         {"id": "director", "title": "Director"},
         {"id": "country", "title": "Country"},
diff --git a/static/js/pandora/ui/infoView.js b/static/js/pandora/ui/infoView.js
index 27a1fad8..a89b40ce 100644
--- a/static/js/pandora/ui/infoView.js
+++ b/static/js/pandora/ui/infoView.js
@@ -439,8 +439,9 @@ pandora.ui.infoView = function(data) {
                         }, pandora.user.ui.icons == 'posters' ? {
                             source: selectedImage.source
                         } : {
-                            position: selectedImage.index // fixme: api slightly inconsistent
+                            position: selectedImage.index // fixme: api slightly inconsistent, this shouldn't be "position"
                         }), function() {
+                            // fixme: update the info (video preview) frame as well
                             var src;
                             if (pandora.user.ui.icons == 'frames') {
                                 src = '/' + data.id + '/icon512.jpg?' + Ox.uid()
diff --git a/static/js/pandora/ui/menu.js b/static/js/pandora/ui/menu.js
index c010151a..c22f2bb6 100644
--- a/static/js/pandora/ui/menu.js
+++ b/static/js/pandora/ui/menu.js
@@ -76,7 +76,9 @@ pandora.ui.mainMenu = function() {
                     { 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: pandora.user.ui.icons == icons};
-                        }) }
+                        }) },
+                        {},
+                        { id: 'usesiteposter', title: 'Always Use ' + pandora.site.site.name + ' Poster' }
                     ] },
                     {},
                     { id: 'openmovie', title: ['Open ' + pandora.site.itemName.singular, 'Open ' + pandora.site.itemName.plural], items: [