0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

merge

Browse source
This commit is contained in:
j 2011-10-18 22:07:32 +02:00
commit 34f778f331
3 changed files with 79 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
static/js/pandora/ui/folders.js
View file

@ -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({
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({
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(
$('<img>')

14
static/js/pandora/ui/menu.js
View file

@ -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' },
]
)};
};

84
static/js/pandora/ui/preferencesDialog.js
View file

@ -6,62 +6,72 @@ pandora.ui.preferencesDialog = function() {
];
var $tabPanel = Ox.TabPanel({
content: function(id) {
var content = Ox.Element().css({padding: '16px', overflowY: 'auto'});
var $content = Ox.Element()
.css({overflowY: 'auto'})
.append(
$('<img>')
.attr({src: '/static/png/icon64.png'})
.css({position: 'absolute', left: '16px', top: '16px'})
);
if (id == 'account') {
content.append(Ox.FormElementGroup({
elements: Ox.values(Ox.map(pandora.user.preferences, function(v, k) {
return Ox.Input({
id: k,
width: 400,
label: Ox.toTitleCase(k),
value: v
});
}))
}));
$content.append(
Ox.Form({
items: [
Ox.Input({
disabled: true,
id: 'username',
label: 'Username',
labelWidth: 120,
value: pandora.user.username,
width: 320
}),
Ox.Input({
id: 'password',
label: 'New Passowrd',
labelWidth: 120,
type: 'password',
width: 320
}),
Ox.Input({
id: 'email',
label: 'E-Mail Address',
labelWidth: 120,
value: pandora.user.email,
width: 320
})
]
})
.css({position: 'absolute', left: '96px', top: '16px'})
);
} else {
/*
content.append(Ox.FormElementGroup({
elements: [
Ox.Checkbox({
checked: true ,
id: 'showEpisodes',
title: 'Show Episodes',
width: 400
width: 320
}),
Ox.Checkbox({
checked: true ,
id: 'newsletter',
title: 'Receive Newsletter',
width: 400
width: 320
})
]
}));
*/
}
return Ox.SplitPanel({
elements: [
{
element: Ox.Element()
.css({padding: '16px'})
.append(
$('<img>')
.attr({src: '/static/png/logo256.png'})
.css({width: '128px'})
),
size: 144
},
{
element: content
}
],
orientation: 'horizontal'
});
return $content;
},
tabs: tabs
});
var $dialog = Ox.Dialog({
buttons: [
Ox.Button({
id: 'close',
title: 'Close'
id: 'done',
title: 'Done'
}).bindEvent({
click: function() {
$dialog.close();
@ -71,12 +81,12 @@ pandora.ui.preferencesDialog = function() {
],
//closeButton: true,
content: $tabPanel,
height: Math.round((window.innerHeight - 24) * 0.5),
height: 192,
//maximizeButton: true,
minHeight: 256,
minWidth: 640,
minHeight: 192,
minWidth: 432,
title: 'Preferences',
width: Math.round(window.innerWidth * 0.5),
width: 432
});
return $dialog;