merge
This commit is contained in:
commit
4a6ac7fae5
6 changed files with 16 additions and 15 deletions
|
@ -72,9 +72,9 @@ pandora.ui.contactForm = function() {
|
|||
.appendTo(that),
|
||||
|
||||
$receiptCheckbox = Ox.Checkbox({
|
||||
checked: pandora.user.level != 'guest',
|
||||
id: 'receipt',
|
||||
title: 'Send a receipt to ' + pandora.user.email,
|
||||
value: pandora.user.level != 'guest',
|
||||
width: width - 136
|
||||
})
|
||||
.css({float: 'left', margin: '8px 4px 8px 0'})
|
||||
|
|
|
@ -315,11 +315,11 @@ pandora.ui.filesView = function(options, self) {
|
|||
});
|
||||
|
||||
self.$checkbox = Ox.Checkbox({
|
||||
checked: false,
|
||||
id: 'go',
|
||||
title: 'Switch to this '
|
||||
+ pandora.site.itemName.singular.toLowerCase()
|
||||
+ ' after moving files',
|
||||
value: false,
|
||||
width: 240
|
||||
});
|
||||
|
||||
|
@ -444,15 +444,15 @@ pandora.ui.filesView = function(options, self) {
|
|||
|
||||
function updateForm() {
|
||||
if (self.selected.length == self.numberOfItems) {
|
||||
self.wasChecked = self.$checkbox.options('checked');
|
||||
self.wasChecked = self.$checkbox.value();
|
||||
self.$checkbox.options({
|
||||
checked: true,
|
||||
disabled: true
|
||||
disabled: true,
|
||||
value: true
|
||||
});
|
||||
} else {
|
||||
self.$checkbox.options({
|
||||
checked: self.wasChecked,
|
||||
disabled: false
|
||||
disabled: false,
|
||||
value: self.wasChecked
|
||||
});
|
||||
}
|
||||
self.$moveButton.options({
|
||||
|
|
|
@ -9,10 +9,11 @@ pandora.ui.findElement = function() {
|
|||
pandora.$ui.findListSelect = Ox.Select({
|
||||
items: [
|
||||
{id: 'all', title: 'Find: All ' + pandora.site.itemName.plural},
|
||||
{id: 'list', title: 'Find: This List', checked: true}
|
||||
{id: 'list', title: 'Find: This List'}
|
||||
],
|
||||
overlap: 'right',
|
||||
type: 'image'
|
||||
type: 'image',
|
||||
value: 'list'
|
||||
})
|
||||
.bindEvent({
|
||||
change: function(data) {
|
||||
|
@ -36,7 +37,6 @@ pandora.ui.findElement = function() {
|
|||
[{}, {
|
||||
id: 'advanced',
|
||||
title: 'Find: Advanced',
|
||||
checked: findKey == 'advanced'
|
||||
}]
|
||||
),
|
||||
overlap: 'right',
|
||||
|
|
|
@ -183,11 +183,12 @@ pandora.ui.listGeneralPanel = function(listData) {
|
|||
.appendTo(that)
|
||||
: Ox.Select({
|
||||
items: [
|
||||
{id: 'private', title: 'Private', checked: listData.status == 'private'},
|
||||
{id: 'public', title: 'Public', checked: listData.status == 'public'}
|
||||
{id: 'private', title: 'Private'},
|
||||
{id: 'public', title: 'Public'}
|
||||
],
|
||||
label: 'Status',
|
||||
labelWidth: 80,
|
||||
value: listData.status,
|
||||
width: 320
|
||||
})
|
||||
.css({position: 'absolute', left: '160px', top: '64px'})
|
||||
|
|
|
@ -9,13 +9,14 @@ pandora.ui.logsDialog = function() {
|
|||
|
||||
$findSelect = Ox.Select({
|
||||
items: [
|
||||
{id: 'all', title: 'Find: All', checked: true},
|
||||
{id: 'all', title: 'Find: All'},
|
||||
{id: 'user', title: 'Find: User'},
|
||||
{id: 'url', title: 'Find: URL'},
|
||||
{id: 'text', title: 'Find: Text'}
|
||||
],
|
||||
overlap: 'right',
|
||||
type: 'image'
|
||||
type: 'image',
|
||||
value: 'all'
|
||||
})
|
||||
.bindEvent({
|
||||
change: function(data) {
|
||||
|
|
|
@ -10,7 +10,6 @@ pandora.ui.sortSelect = function(isNavigationView) {
|
|||
if (isClipView) {
|
||||
items = pandora.site.clipKeys.map(function(key) {
|
||||
return Ox.extend(Ox.clone(key), {
|
||||
checked: key.id == pandora.user.ui[sortKey][0].key,
|
||||
title: 'Sort by ' + (!pandora.user.ui.item ? 'Clip ' : '') + key.title
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue