merge app into pandora
This commit is contained in:
parent
7081cd7544
commit
40b2ca0dff
35 changed files with 735 additions and 734 deletions
|
|
@ -1,27 +1,27 @@
|
|||
// vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
pandora.ui.contentPanel = function() {
|
||||
var that = new Ox.SplitPanel({
|
||||
elements: app.user.ui.item == '' ? [
|
||||
elements: pandora.user.ui.item == '' ? [
|
||||
{
|
||||
collapsed: !app.user.ui.showGroups,
|
||||
collapsed: !pandora.user.ui.showGroups,
|
||||
collapsible: true,
|
||||
element: app.$ui.browser = pandora.ui.browser(),
|
||||
element: pandora.$ui.browser = pandora.ui.browser(),
|
||||
resizable: true,
|
||||
resize: [96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 256],
|
||||
size: app.user.ui.groupsSize
|
||||
size: pandora.user.ui.groupsSize
|
||||
},
|
||||
{
|
||||
element: app.$ui.list = pandora.ui.list(app.user.ui.lists[app.user.ui.list].listView)
|
||||
element: pandora.$ui.list = pandora.ui.list(pandora.user.ui.lists[pandora.user.ui.list].listView)
|
||||
}
|
||||
] : [
|
||||
{
|
||||
collapsed: !app.user.ui.showMovies,
|
||||
collapsed: !pandora.user.ui.showMovies,
|
||||
collapsible: true,
|
||||
element: app.$ui.browser = pandora.ui.browser(),
|
||||
element: pandora.$ui.browser = pandora.ui.browser(),
|
||||
size: 112 + Ox.UI.SCROLLBAR_SIZE
|
||||
},
|
||||
{
|
||||
element: app.$ui.item = pandora.ui.item(app.user.ui.item, app.user.ui.itemView)
|
||||
element: pandora.$ui.item = pandora.ui.item(pandora.user.ui.item, pandora.user.ui.itemView)
|
||||
}
|
||||
],
|
||||
orientation: 'vertical'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue