From 987ccf8af659fa94b3bfd674ced96262020d93db Mon Sep 17 00:00:00 2001 From: rolux Date: Sun, 4 Sep 2011 21:15:53 +0000 Subject: [PATCH] use splitpanel tooltips --- static/js/pandora/ui/contentPanel.js | 6 ++++-- static/js/pandora/ui/item.js | 2 ++ static/js/pandora/ui/leftPanel.js | 3 ++- static/js/pandora/ui/mainPanel.js | 3 ++- static/js/pandora/ui/menu.js | 6 ++++++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/static/js/pandora/ui/contentPanel.js b/static/js/pandora/ui/contentPanel.js index 82ba6a33d..28a087e8d 100644 --- a/static/js/pandora/ui/contentPanel.js +++ b/static/js/pandora/ui/contentPanel.js @@ -8,7 +8,8 @@ pandora.ui.contentPanel = function() { element: pandora.$ui.browser = pandora.ui.browser(), resizable: true, resize: [96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 256], - size: pandora.user.ui.groupsSize + size: pandora.user.ui.groupsSize, + tooltip: 'groups' }, { element: pandora.$ui.list = pandora.ui.list() @@ -18,7 +19,8 @@ pandora.ui.contentPanel = function() { collapsed: !pandora.user.ui.showMovies, collapsible: true, element: pandora.$ui.browser = pandora.ui.browser(), - size: 112 + Ox.UI.SCROLLBAR_SIZE + size: 112 + Ox.UI.SCROLLBAR_SIZE, + tooltip: pandora.site.itemName.plural.toLowerCase() }, { element: pandora.$ui.item = pandora.ui.item() diff --git a/static/js/pandora/ui/item.js b/static/js/pandora/ui/item.js index e2e40cf04..fd5e11c79 100644 --- a/static/js/pandora/ui/item.js +++ b/static/js/pandora/ui/item.js @@ -293,6 +293,7 @@ pandora.ui.item = function() { subtitles: result.data.layers.subtitles ? result.data.layers.subtitles.map(function(subtitle) { return {'in': subtitle['in'], out: subtitle.out, text: subtitle.value}; }) : [], + tooltips: true, timeline: '/' + pandora.user.ui.item + '/timeline16p.png', video: video, volume: pandora.user.ui.videoVolume, @@ -356,6 +357,7 @@ pandora.ui.item = function() { subtitles: result.data.layers.subtitles ? result.data.layers.subtitles.map(function(subtitle) { return {'in': subtitle['in'], out: subtitle.out, text: subtitle.value}; }) : [], + tooltips: true, video: video, videoRatio: result.data.videoRatio, videoSize: pandora.user.ui.videoSize, diff --git a/static/js/pandora/ui/leftPanel.js b/static/js/pandora/ui/leftPanel.js index 5085aacdf..395ef1fc4 100644 --- a/static/js/pandora/ui/leftPanel.js +++ b/static/js/pandora/ui/leftPanel.js @@ -13,7 +13,8 @@ pandora.ui.leftPanel = function() { collapsed: !pandora.user.ui.showInfo, collapsible: true, element: pandora.$ui.info = pandora.ui.info(), - size: Math.round(pandora.user.ui.sidebarSize / pandora.user.infoRatio) + size: Math.round(pandora.user.ui.sidebarSize / pandora.user.infoRatio), + tooltip: 'info' } ], id: 'leftPanel', diff --git a/static/js/pandora/ui/mainPanel.js b/static/js/pandora/ui/mainPanel.js index 7ecca0d0b..3eef70079 100644 --- a/static/js/pandora/ui/mainPanel.js +++ b/static/js/pandora/ui/mainPanel.js @@ -8,7 +8,8 @@ pandora.ui.mainPanel = function() { element: pandora.$ui.leftPanel = pandora.ui.leftPanel(), resizable: true, resize: [192, 256, 320, 384], - size: pandora.user.ui.sidebarSize + size: pandora.user.ui.sidebarSize, + tooltip: 'lists' }, { element: pandora.$ui.rightPanel = pandora.ui.rightPanel() diff --git a/static/js/pandora/ui/menu.js b/static/js/pandora/ui/menu.js index bff9f0d39..f45928085 100644 --- a/static/js/pandora/ui/menu.js +++ b/static/js/pandora/ui/menu.js @@ -80,6 +80,12 @@ pandora.ui.mainMenu = function() { {}, { id: 'usesiteposter', title: 'Always Use ' + pandora.site.site.name + ' Poster' } ] }, + { id: 'columns', title: 'Column Layout', items: [ + { id: 'loadlayout', title: 'Load...' }, + { id: 'savelayout', title: 'Save...' }, + {}, + { id: 'resetlayout', title: 'Reset' } + ]}, {}, { id: 'openmovie', title: ['Open ' + pandora.site.itemName.singular, 'Open ' + pandora.site.itemName.plural], items: [ { group: 'movieview', min: 1, max: 1, items: $.map(pandora.site.itemViews, function(view, i) {