diff --git a/static/js/pandora/ui/folders.js b/static/js/pandora/ui/folders.js index 277117b7..3a0c9319 100644 --- a/static/js/pandora/ui/folders.js +++ b/static/js/pandora/ui/folders.js @@ -19,7 +19,7 @@ pandora.ui.folders = function() { var extras; if (folder.id == 'personal') { if (pandora.user.level == 'guest') { - extras = [infoButton('Personal Lists', 'To create and publish your own lists of movies, please sign up or sign in.')]; + extras = [infoButton('Personal Lists', 'To create and share your own lists of movies, please sign up or sign in.')]; } else { extras = [Ox.Select({ items: [ @@ -256,26 +256,30 @@ pandora.ui.folders = function() { }).bindEvent({ click: function() { var $dialog = Ox.Dialog({ - buttons: Ox.merge([ - Ox.Button({title: 'Close'}).bindEvent({ - click: function() { - $dialog.close(); - } - }) - ], title != 'Featured Lists' ? [ - Ox.Button({title: 'Sign Up'}).bindEvent({ - click: function() { - $dialog.close(); - pandora.$ui.accountDialog = pandora.ui.accountDialog('signup').open(); - } - }), - Ox.Button({title: 'Sign In'}).bindEvent({ - click: function() { - $dialog.close(); - pandora.$ui.accountDialog = pandora.ui.accountDialog('signin').open(); - } - }) - ] : []), + buttons: Ox.merge( + title != 'Featured Lists' ? [ + Ox.Button({title: 'Sign Up...'}).bindEvent({ + click: function() { + $dialog.close(); + pandora.$ui.accountDialog = pandora.ui.accountDialog('signup').open(); + } + }), + Ox.Button({title: 'Sign In...'}).bindEvent({ + click: function() { + $dialog.close(); + pandora.$ui.accountDialog = pandora.ui.accountDialog('signin').open(); + } + }), + {} + ] : [], + [ + Ox.Button({title: 'Close'}).bindEvent({ + click: function() { + $dialog.close(); + } + }) + ] + ), content: Ox.Element() .append( $('') diff --git a/static/js/pandora/ui/menu.js b/static/js/pandora/ui/menu.js index 53fdfc19..3aba4591 100644 --- a/static/js/pandora/ui/menu.js +++ b/static/js/pandora/ui/menu.js @@ -332,14 +332,14 @@ pandora.ui.mainMenu = function() { }), [ {}, - { id: 'newlist', title: 'New List', keyboard: 'control n' }, - { id: 'newlistfromselection', title: 'New List from Selection', disabled: ui.listSelection.length == 0, keyboard: 'shift control n' }, - { id: 'newsmartlist', title: 'New Smart List', keyboard: 'alt control n' }, - { id: 'newsmartlistfromresults', title: 'New Smart List from Results', keyboard: 'shift alt control n' }, + { id: 'newlist', title: 'New List', disabled: isGuest, keyboard: 'control n' }, + { id: 'newlistfromselection', title: 'New List from Selection', disabled: isGuest || ui.listSelection.length == 0, keyboard: 'shift control n' }, + { id: 'newsmartlist', title: 'New Smart List', disabled: isGuest, keyboard: 'alt control n' }, + { id: 'newsmartlistfromresults', title: 'New Smart List from Results', disabled: isGuest, keyboard: 'shift alt control n' }, {}, - { id: 'duplicatelist', title: 'Duplicate Selected List', disabled: !pandora.user.ui._list, keyboard: 'control d' }, - { id: 'editlist', title: 'Edit Selected List...', disabled: !pandora.user.ui._list, keyboard: 'control e' }, - { id: 'deletelist', title: 'Delete Selected List...', disabled: !pandora.user.ui._list, keyboard: 'delete' }, + { id: 'duplicatelist', title: 'Duplicate Selected List', disabled: isGuest || !pandora.user.ui._list, keyboard: 'control d' }, + { id: 'editlist', title: 'Edit Selected List...', disabled: isGuest || !pandora.user.ui._list, keyboard: 'control e' }, + { id: 'deletelist', title: 'Delete Selected List...', disabled: isGuest || !pandora.user.ui._list, keyboard: 'delete' }, ] )}; };