From 38f37f3a9f35a31b53d0ff983946a590fa6f2c81 Mon Sep 17 00:00:00 2001 From: rolux Date: Sat, 29 Oct 2011 11:39:00 +0000 Subject: [PATCH] switch back to list when using find in item view --- static/js/pandora/UI.js | 2 +- static/js/pandora/helpDialog.js | 7 ++++--- static/js/pandora/mainPanel.js | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/static/js/pandora/UI.js b/static/js/pandora/UI.js index c585272f..e26b3438 100644 --- a/static/js/pandora/UI.js +++ b/static/js/pandora/UI.js @@ -53,7 +53,7 @@ pandora.UI = (function() { if (pandora.$ui.appPanel) { // if we're not on page load, // switch from item view to list view - add['item'] = ''; + args['item'] = ''; } if (!pandora.user.ui.lists[list]) { add['lists.' + that.encode(list)] = {}; diff --git a/static/js/pandora/helpDialog.js b/static/js/pandora/helpDialog.js index 69ed7887..2a3fae4e 100644 --- a/static/js/pandora/helpDialog.js +++ b/static/js/pandora/helpDialog.js @@ -1,6 +1,6 @@ // vim: et:ts=4:sw=4:sts=4:ft=javascript pandora.ui.helpDialog = function() { - var content = Ox.Element(), + var content = Ox.Element().css({margin: '16px'}), that = Ox.Dialog({ buttons: [ Ox.Button({ @@ -27,8 +27,9 @@ pandora.ui.helpDialog = function() { title: 'Help', width: Math.round(window.innerWidth * 0.75) }); - pandora.api.getPage({name: 'help'}, function(response) { - content.html(response.data.body); + pandora.api.getPage({name: 'help'}, function(result) { + //content.html(response.data.body); + content.html('Help is coming soon...') }); return that; diff --git a/static/js/pandora/mainPanel.js b/static/js/pandora/mainPanel.js index 926036e9..2c8d8c56 100644 --- a/static/js/pandora/mainPanel.js +++ b/static/js/pandora/mainPanel.js @@ -41,6 +41,7 @@ pandora.ui.mainPanel = function() { } }, pandora_item: function(data) { + Ox.print('PANDORA_ITEM', data.value, data.previousValue) if (!data.value || !data.previousValue) { that.replaceElement(1, pandora.$ui.rightPanel = pandora.ui.rightPanel()); }