use new form element syntax
This commit is contained in:
parent
e965ae21c2
commit
68f9b40a80
7 changed files with 18 additions and 18 deletions
|
@ -133,11 +133,11 @@ function constructList() {
|
|||
.html(app.actions[id].code[1].replace('/\n/<br>\n/g'))
|
||||
.hide();
|
||||
var $button = new Ox.Button({
|
||||
title: [
|
||||
type: "image"
|
||||
values: [
|
||||
{id: "one", title: "right"},
|
||||
{id: "two", title: "down"},
|
||||
],
|
||||
type: "image"
|
||||
})
|
||||
.addClass("margin")
|
||||
.click(function() { $code.toggle()})
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
pandora.ui.allItems = function() {
|
||||
|
||||
var that = Ox.Element()
|
||||
.addClass('OxSelectable' + (pandora.user.ui._list ? '' : ' OxSelected'))
|
||||
.addClass('OxSelectableElement' + (pandora.user.ui._list ? '' : ' OxSelected'))
|
||||
.css({
|
||||
height: '16px',
|
||||
cursor: 'default',
|
||||
|
|
|
@ -66,9 +66,7 @@ pandora.ui.contactForm = function() {
|
|||
.css({width: width + 'px'})
|
||||
.bindEvent({
|
||||
validate: function(data) {
|
||||
$sendButton.options({
|
||||
disabled: !data.valid
|
||||
});
|
||||
$sendButton.options({disabled: !data.valid});
|
||||
}
|
||||
})
|
||||
.appendTo(that),
|
||||
|
|
|
@ -279,7 +279,7 @@ pandora.ui.folderList = function(id) {
|
|||
} else if (id == 'favorite' || (id == 'featured' && pandora.user.level == 'admin')) {
|
||||
// this makes the button trigger a change event,
|
||||
// which is already being handled in folders.js
|
||||
pandora.$ui.manageListsButton[id].options({selected: true});
|
||||
pandora.$ui.manageListsButton[id].options({value: true});
|
||||
/*
|
||||
if (!pandora.site.sectionFolders.items[i].showBrowser) {
|
||||
pandora.site.sectionFolders.items[i].showBrowser = true;
|
||||
|
|
|
@ -3,12 +3,13 @@
|
|||
pandora.ui.sectionButtons = function() {
|
||||
var that = Ox.ButtonGroup({
|
||||
buttons: [
|
||||
{id: 'items', selected: pandora.user.ui.section == 'items', title: pandora.site.itemName.plural},
|
||||
{id: 'edits', selected: pandora.user.ui.section == 'edits', title: 'Edits', disabled: true},
|
||||
{id: 'texts', selected: pandora.user.ui.section == 'texts', title: 'Texts', disabled: true}
|
||||
{id: 'items', title: pandora.site.itemName.plural},
|
||||
{id: 'edits', title: 'Edits', disabled: true},
|
||||
{id: 'texts', title: 'Texts', disabled: true}
|
||||
],
|
||||
id: 'sectionButtons',
|
||||
selectable: true
|
||||
selectable: true,
|
||||
value: pandora.user.ui.section
|
||||
}).css({
|
||||
float: 'left',
|
||||
margin: '4px'
|
||||
|
|
|
@ -5,10 +5,11 @@ pandora.ui.sectionSelect = function() {
|
|||
var that = Ox.Select({
|
||||
id: 'sectionSelect',
|
||||
items: [
|
||||
{checked: pandora.user.ui.section == 'items', id: 'items', title: pandora.site.itemName.plural},
|
||||
{checked: pandora.user.ui.section == 'edits', id: 'edits', title: 'Edits', disabled: true},
|
||||
{checked: pandora.user.ui.section == 'texts', id: 'texts', title: 'Texts', disabled: true}
|
||||
]
|
||||
{id: 'items', title: pandora.site.itemName.plural},
|
||||
{id: 'edits', title: 'Edits', disabled: true},
|
||||
{id: 'texts', title: 'Texts', disabled: true}
|
||||
],
|
||||
value: pandora.user.ui.section
|
||||
}).css({
|
||||
float: 'left',
|
||||
margin: '4px'
|
||||
|
|
|
@ -5,9 +5,9 @@ pandora.ui.sectionbar = function(mode) {
|
|||
size: 24
|
||||
})
|
||||
.append(
|
||||
mode == 'buttons' ?
|
||||
pandora.$ui.sectionButtons = pandora.ui.sectionButtons() :
|
||||
pandora.$ui.sectionSelect = pandora.ui.sectionSelect()
|
||||
mode == 'buttons'
|
||||
? pandora.$ui.sectionButtons = pandora.ui.sectionButtons()
|
||||
: pandora.$ui.sectionSelect = pandora.ui.sectionSelect()
|
||||
);
|
||||
that.toggle = function() {
|
||||
|
||||
|
|
Loading…
Reference in a new issue