0x2620/cablegates
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

adding site section

Browse source
This commit is contained in:
rlx 2011-01-21 19:10:42 +00:00
parent 5a1848960e
commit e826f29bc4
4 changed files with 466 additions and 329 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/templates/site.json
View file

@ -72,7 +72,7 @@
{"id": "news", "title": "News"}, {"id": "news", "title": "News"},
{"id": "tour", "title": "Take a Tour"}, {"id": "tour", "title": "Take a Tour"},
{"id": "faq", "title": "Frequently Asked Questions"}, {"id": "faq", "title": "Frequently Asked Questions"},
{"id": "tos", "title": "Terms of Service"} {"id": "terms", "title": "Terms of Service"}
], ],
"sortKeys": [ "sortKeys": [
{"id": "title", "title": "Title", "width": 180, "removable": false, "type": "title"}, {"id": "title", "title": "Title", "width": 180, "removable": false, "type": "title"},
@ -127,7 +127,7 @@
{"id": "pixels"} {"id": "pixels"}
], ],
"user": { "user": {
"group": "guest", "level": "guest",
"lists": { "lists": {
"history": [ "history": [
{"id": "all_movies", "title": "All Movies", "query": {}} {"id": "all_movies", "title": "All Movies", "query": {}}

1
pandora/urls.py
View file

@ -42,6 +42,7 @@ if settings.DEBUG:
urlpatterns += patterns('', urlpatterns += patterns('',
(r'^.*?embed$', 'app.views.embed'), (r'^.*?embed$', 'app.views.embed'),
(r'^[A-Z0-9].*$', 'app.views.index'), (r'^[A-Z0-9].*$', 'app.views.index'),
(r'^[a-z0-9].+$', 'app.views.index'),
(r'^$', 'app.views.index'), (r'^$', 'app.views.index'),
) )

5
pandora/user/models.py
View file

@ -95,7 +95,10 @@ def get_user_json(user):
result = {} result = {}
for key in ('username', ): for key in ('username', ):
result[key] = getattr(user, key) result[key] = getattr(user, key)
result['admin'] = user.is_staff if user.is_staff:
result['level'] = 'admin'
else:
result['level'] = 'user'
result['groups'] = [g.name for g in user.groups.all()] result['groups'] = [g.name for g in user.groups.all()]
result['preferences'] = profile.get_preferences() result['preferences'] = profile.get_preferences()
result['ui'] = profile.get_ui() result['ui'] = profile.get_ui()

225
static/js/pandora.js
View file

@ -21,15 +21,26 @@ var pandora = new Ox.App({
ui: { ui: {
sectionFolders: { sectionFolders: {
site: $.merge([ site: $.merge([
{id: "site", title: "Site"}, {id: 'site', title: 'Site', items: $.merge([
{id: "user", title: "User"} {id: 'home', title: 'Home'}
], data.user.group == 'admin' ? [ ], $.merge(data.config.sitePages, [
{id: "admin", title: "Admin"} {id: 'software', title: 'Software'},
{id: 'help', title: 'Help'}
]))},
{id: 'user', title: 'User', items: [
{id: 'preferences', title: 'Preferences'},
{id: 'archives', title: 'Archives'}
]}
], data.user.level == 'admin' ? [
{id: 'admin', title: 'Admin', items: [
{id: 'statistics', title: 'Statistics'},
{id: 'users', title: 'Users'}
]}
] : []), ] : []),
items: [ items: [
{id: "personal", title: "Personal Lists"}, {id: 'personal', title: 'Personal Lists'},
{id: "favorite", title: "Favorite Lists", showBrowser: false}, {id: 'favorite', title: 'Favorite Lists', showBrowser: false},
{id: "featured", title: "Featured Lists", showBrowser: false} {id: 'featured', title: 'Featured Lists', showBrowser: false}
], ],
}, },
infoRatio: 16 / 9, infoRatio: 16 / 9,
@ -46,7 +57,7 @@ var pandora = new Ox.App({
app.config.user.ui.theme = 'classic' app.config.user.ui.theme = 'classic'
} }
if (app.user.group == 'guest') { if (app.user.level == 'guest') {
app.user = $.extend({}, app.config.user); app.user = $.extend({}, app.config.user);
} }
@ -948,6 +959,52 @@ var pandora = new Ox.App({
}, },
folderList: function(id) { folderList: function(id) {
var i = Ox.getPositionById(app.ui.sectionFolders[app.user.ui.section], id), var i = Ox.getPositionById(app.ui.sectionFolders[app.user.ui.section], id),
that;
if (app.user.ui.section == 'site') {
that = new Ox.TextList({
columns: [
{
format: function() {
return $('<img>').attr({
src: 'static/oxjs/build/png/ox.ui/icon16.png'
});
},
id: 'id',
operator: '+',
unique: true,
visible: true,
width: 16
},
{
id: 'title',
operator: '+',
visible: true,
width: app.user.ui.sidebarSize - 16
}
],
max: 1,
min: 1,
request: function(data, callback) {
var result = {data: {}};
if (!data.range) {
result.data.items = Ox.getObjectById(app.ui.sectionFolders.site, id).items.length;
} else {
result.data.items = Ox.getObjectById(app.ui.sectionFolders.site, id).items;
}
callback(result);
},
sort: [{key: '', operator: ''}]
})
.bindEvent({
select: function(event, data) {
// fixme: duplicated
$.each(app.$ui.folderList, function(id_, $list) {
id != id_ && $list.options('selected', []);
})
URL.set((id == 'admin' ? 'admin/' : '' ) + data.ids[0]);
},
});
} else if (app.user.ui.section == 'items') {
that = new Ox.TextList({ that = new Ox.TextList({
columns: [ columns: [
{ {
@ -1053,7 +1110,7 @@ var pandora = new Ox.App({
sort: [ sort: [
{key: 'position', operator: '+'} {key: 'position', operator: '+'}
], ],
sortable: id == 'personal' || id == 'favorite' || app.user.group == 'admin' sortable: id == 'personal' || id == 'favorite' || app.user.level == 'admin'
}) })
.css({ .css({
left: 0, left: 0,
@ -1121,7 +1178,7 @@ var pandora = new Ox.App({
Ox.Request.emptyCache(); // fixme: remove Ox.Request.emptyCache(); // fixme: remove
$list.reloadList(); $list.reloadList();
}); });
} else if (id == 'featured' && app.user.group == 'admin') { } else if (id == 'featured' && app.user.level == 'admin') {
pandora.api.editList({ pandora.api.editList({
id: data.ids[0], id: data.ids[0],
status: 'public' status: 'public'
@ -1168,7 +1225,7 @@ var pandora = new Ox.App({
}) })
URL.set('?find=list:' + data.ids[0]); URL.set('?find=list:' + data.ids[0]);
} else { } else {
URL.set(''); URL.set('?find=');
} }
}, },
submit: function(event, data) { submit: function(event, data) {
@ -1183,6 +1240,7 @@ var pandora = new Ox.App({
}); });
} }
}); });
}
return that; return that;
}, },
folders: function() { folders: function() {
@ -1199,22 +1257,38 @@ var pandora = new Ox.App({
app.$ui.folderBrowser = {}; app.$ui.folderBrowser = {};
app.$ui.folderList = {}; app.$ui.folderList = {};
if (app.user.ui.section == 'site') { if (app.user.ui.section == 'site') {
/*
$.each(app.ui.sectionFolders.site, function(i, folder) { $.each(app.ui.sectionFolders.site, function(i, folder) {
var extras = []; var height = (Ox.getObjectById(app.ui.sectionFolders.site, folder.id).items.length * 16);
app.$ui.folder[i] = new Ox.CollapsePanel({ app.$ui.folder[i] = new Ox.CollapsePanel({
id: id, id: folder.id,
collapsed: !app.user.ui.showSection[id], collapsed: !app.user.ui.showFolder.site[folder.id],
extras: extras,
size: 16, size: 16,
title: Ox.getObjectById(app.config.sections, id).title title: folder.title
}) })
.bindEvent({
toggle: function(event, data) {
}
}); });
*/ //alert(JSON.stringify(Ox.getObjectById(app.ui.sectionFolders.site, folder.id)))
app.$ui.folder[i].$content.css({
height: height + 'px'
})
//.appendTo(that);
app.$ui.folderList[folder.id] = ui.folderList(folder.id)
.css({
height: height + 'px'
})
.appendTo(app.$ui.folder[i].$content);
app.$ui.folder.forEach(function($folder) {
that.append($folder);
});
});
//resizeFolders();
} else if (app.user.ui.section == 'items') { } else if (app.user.ui.section == 'items') {
$.each(app.ui.sectionFolders.items, function(i, folder) { $.each(app.ui.sectionFolders.items, function(i, folder) {
var extras; var extras;
if (folder.id == 'personal' && app.user.group != 'guest') { if (folder.id == 'personal' && app.user.level != 'guest') {
extras = [new Ox.Select({ extras = [new Ox.Select({
items: [ items: [
{ id: 'new', title: 'New List...' }, { id: 'new', title: 'New List...' },
@ -1254,7 +1328,7 @@ var pandora = new Ox.App({
} }
} }
})]; })];
} else if (folder.id == 'favorite' && app.user.group != 'guest') { } else if (folder.id == 'favorite' && app.user.level != 'guest') {
extras = [new Ox.Button({ extras = [new Ox.Button({
selectable: true, selectable: true,
style: 'symbol', style: 'symbol',
@ -1278,7 +1352,7 @@ var pandora = new Ox.App({
resizeFolders(); resizeFolders();
} }
})]; })];
} else if (folder.id == 'featured' && app.user.group == 'admin') { } else if (folder.id == 'featured' && app.user.level == 'admin') {
extras = [new Ox.Button({ extras = [new Ox.Button({
selectable: true, selectable: true,
style: 'symbol', style: 'symbol',
@ -1351,7 +1425,7 @@ var pandora = new Ox.App({
function init(event, data) { function init(event, data) {
Ox.print('init', i, counter) Ox.print('init', i, counter)
if (++counter == 3) { if (++counter == 3) {
$.each(app.$ui.folder, function(i, $folder) { app.$ui.folder.forEach(function($folder) {
that.append($folder); that.append($folder);
}); });
resizeFolders(); resizeFolders();
@ -2141,7 +2215,7 @@ var pandora = new Ox.App({
height = imageHeight * width / imageWidth; height = imageHeight * width / imageWidth;
app.ui.infoRatio = width / height; app.ui.infoRatio = width / height;
!app.user.ui.showInfo && app.$ui.leftPanel.css({bottom: -height - 16}); !app.user.ui.showInfo && app.$ui.leftPanel.css({bottom: -height - 16});
app.$ui.leftPanel.size('infoPanel', height + 16); app.$ui.leftPanel.size(2, height + 16);
$still.css({ $still.css({
position: 'absolute', position: 'absolute',
left: 0, left: 0,
@ -2227,7 +2301,7 @@ var pandora = new Ox.App({
return that; return that;
}, },
mainMenu: function() { mainMenu: function() {
var isGuest = app.user.group == 'guest', var isGuest = app.user.level == 'guest',
that = new Ox.MainMenu({ that = new Ox.MainMenu({
extras: [ extras: [
$('<div>').html('beta').css({marginRight: '8px', color: 'rgb(128, 128, 128)'}), $('<div>').html('beta').css({marginRight: '8px', color: 'rgb(128, 128, 128)'}),
@ -2244,7 +2318,7 @@ var pandora = new Ox.App({
{ id: 'news', title: app.config.site.name + ' News' }, { id: 'news', title: app.config.site.name + ' News' },
{ id: 'tour', title: 'Take a Tour' }, { id: 'tour', title: 'Take a Tour' },
{ id: 'faq', title: 'Frequently Asked Questions' }, { id: 'faq', title: 'Frequently Asked Questions' },
{ id: 'tos', title: 'Terms of Service' }, { id: 'terms', title: 'Terms of Service' },
{}, {},
{ id: 'software', title: 'Software', items: [ { id: 'software', title: 'Software', items: [
{ id: 'about', title: 'About' }, { id: 'about', title: 'About' },
@ -2454,7 +2528,7 @@ var pandora = new Ox.App({
} else if (data.id == 'register') { } else if (data.id == 'register') {
app.$ui.accountDialog = ui.accountDialog('register').open(); app.$ui.accountDialog = ui.accountDialog('register').open();
} else if (data.id == 'loginlogout') { } else if (data.id == 'loginlogout') {
app.$ui.accountDialog = (app.user.group == 'guest' ? app.$ui.accountDialog = (app.user.level == 'guest' ?
ui.accountDialog('login') : ui.accountLogoutDialog()).open(); ui.accountDialog('login') : ui.accountLogoutDialog()).open();
} else if (data.id == 'places') { } else if (data.id == 'places') {
var $manage = new Ox.SplitPanel({ var $manage = new Ox.SplitPanel({
@ -2803,7 +2877,17 @@ var pandora = new Ox.App({
return that; return that;
}, },
rightPanel: function() { rightPanel: function() {
var that = new Ox.SplitPanel({ var that;
if (app.user.ui.section == 'site') {
that = new Ox.Element()
.html(app.user.ui.sitePage)
.bindEvent({
resize: function(event, data) {
}
});
} else if (app.user.ui.section == 'items') {
that = new Ox.SplitPanel({
elements: [ elements: [
{ {
element: app.$ui.toolbar = ui.toolbar(), element: app.$ui.toolbar = ui.toolbar(),
@ -2820,7 +2904,8 @@ var pandora = new Ox.App({
id: 'rightPanel', id: 'rightPanel',
orientation: 'vertical' orientation: 'vertical'
}) })
.bindEvent('resize', function(event, data) { .bindEvent({
resize: function(event, data) {
//Ox.print('???? resize rightPanel', event, data) //Ox.print('???? resize rightPanel', event, data)
if (!app.user.ui.item) { if (!app.user.ui.item) {
resizeGroups(data); resizeGroups(data);
@ -2837,7 +2922,9 @@ var pandora = new Ox.App({
width: data - (app.user.ui.showAnnotations * app.user.ui.annotationsSize) - 1 width: data - (app.user.ui.showAnnotations * app.user.ui.annotationsSize) - 1
}); });
} }
}
}); });
}
return that; return that;
}, },
sectionbar: function(mode) { sectionbar: function(mode) {
@ -2867,10 +2954,21 @@ var pandora = new Ox.App({
}).css({ }).css({
float: 'left', float: 'left',
margin: '4px' margin: '4px'
})
.bindEvent({
change: function(event, data) {
var section = data.selected[0];
if (section == 'site') {
URL.set(app.user.ui.sitePage);
} else if (section == 'items') {
URL.set(Query.toString());
}
}
}); });
return that; return that;
}, },
sectionSelect: function() { sectionSelect: function() {
// fixme: duplicated
var that = new Ox.Select({ var that = new Ox.Select({
id: 'sectionSelect', id: 'sectionSelect',
items: [ items: [
@ -2882,6 +2980,9 @@ var pandora = new Ox.App({
}).css({ }).css({
float: 'left', float: 'left',
margin: '4px' margin: '4px'
})
.bindEvent({
}); });
return that; return that;
}, },
@ -3107,13 +3208,21 @@ var pandora = new Ox.App({
function getFoldersHeight() { function getFoldersHeight() {
var height = 48; var height = 48;
app.ui.sectionFolders[app.user.ui.section].forEach(function(folder, i) {
height += app.user.ui.showFolder[app.user.ui.section][folder.id] * (
!!folder.showBrowser * 40 + folder.items * 16
);
Ox.print('h', height)
});
/*
$.each(app.user.ui.showFolder[app.user.ui.section], function(id, show) { $.each(app.user.ui.showFolder[app.user.ui.section], function(id, show) {
var i = Ox.getPositionById(app.ui.sectionFolders[app.user.ui.section], id); var i = Ox.getPositionById(app.ui.sectionFolders[app.user.ui.section], id);
height += show * app.ui.sectionFolders[app.user.ui.section][i].items * 16; height += show * (
if (app.ui.sectionFolders[app.user.ui.section][i].showBrowser) { app.ui.sectionFolders[app.user.ui.section][i].showBrowser * 40 +
height += show * 40; app.ui.sectionFolders[app.user.ui.section][i].items * 16
} );
}); });
*/
return height; return height;
} }
@ -3124,7 +3233,6 @@ var pandora = new Ox.App({
if (getFoldersHeight() > app.$ui.leftPanel.height() - 24 - 1 - app.$ui.info.height()) { if (getFoldersHeight() > app.$ui.leftPanel.height() - 24 - 1 - app.$ui.info.height()) {
width -= app.ui.scrollbarSize; width -= app.ui.scrollbarSize;
} }
Ox.print('width', width)
return width; return width;
} }
@ -3202,20 +3310,28 @@ var pandora = new Ox.App({
function resizeFolders() { function resizeFolders() {
var width = getFoldersWidth(), var width = getFoldersWidth(),
columnWidth = {};
if (app.user.ui.section == 'site') {
columnWidth.title = width - 16;
} else if (app.user.ui.section == 'items') {
columnWidth = {user: parseInt((width - 88) * 0.4)}; columnWidth = {user: parseInt((width - 88) * 0.4)};
columnWidth.name = (width - 88) - columnWidth.user; columnWidth.name = (width - 88) - columnWidth.user;
}
//Ox.print('sectionsWidth', width) //Ox.print('sectionsWidth', width)
$.each(app.$ui.folderList, function(id, $list) { $.each(app.$ui.folderList, function(id, $list) {
var height, var i = Ox.getPositionById(app.ui.sectionFolders[app.user.ui.section], id);
i = Ox.getPositionById(app.ui.sectionFolders[app.user.ui.section], id);
//alert(app.user.ui.section + ' ' + id + ' ' + i)
app.$ui.folder[i].css({width: width + 'px'}); app.$ui.folder[i].css({width: width + 'px'});
$list.css({width: width + 'px'}); $list.css({width: width + 'px'});
Ox.print('...', id, $list.options())
if (app.user.ui.section == 'site') {
$list.resizeColumn('title', columnWidth.title);
} else if (app.user.ui.section == 'items') {
if (app.ui.sectionFolders[app.user.ui.section][i].showBrowser) { if (app.ui.sectionFolders[app.user.ui.section][i].showBrowser) {
$list.resizeColumn('user', columnWidth.user) $list.resizeColumn('user', columnWidth.user)
.resizeColumn('name', columnWidth.name); .resizeColumn('name', columnWidth.name);
} else { } else {
$list.resizeColumn(i == 1 ? 'id' : 'name', width - 88); $list.resizeColumn(id == 'favorite' ? 'id' : 'name', width - 88);
}
} }
if (!app.user.ui.showFolder[app.user.ui.section][id]) { if (!app.user.ui.showFolder[app.user.ui.section][id]) {
app.$ui.folder[i].update(); app.$ui.folder[i].update();
@ -3258,7 +3374,6 @@ var pandora = new Ox.App({
}, },
range: [0, 1] range: [0, 1]
}, function(result) { }, function(result) {
alert(JSON.stringify(result))
var folder, list; var folder, list;
if (result.data.items.length) { if (result.data.items.length) {
list = result.data.items[0]; list = result.data.items[0];
@ -3504,12 +3619,23 @@ var pandora = new Ox.App({
item: '' item: ''
}); });
}, },
'^(|about|faq|home|news|software|terms|tour)$': function(url) { '^(|about|archives|faq|help|home|news|preferences|software|terms|tour)$': function(url) {
UI.set({ UI.set({
section: 'site', section: 'site',
sitePage: url || 'home' sitePage: url || 'home'
}); });
}, },
'^admin': function(url) {
var split = url.split('/'),
section = new RegExp(
'^ˆ(statistics|users)$'
)(split[1]);
section = section ? section[0] : 'users';
UI.set({
section: 'site',
sitePage: url
})
},
'^(find)$': function() { '^(find)$': function() {
Query.fromString('?find='); // fixme: silly hack Query.fromString('?find='); // fixme: silly hack
UI.set({ UI.set({
@ -3528,7 +3654,9 @@ var pandora = new Ox.App({
var split = url.split('/'), var split = url.split('/'),
item = split[0], item = split[0],
view = new RegExp( view = new RegExp(
'^(calendar|clips|files|info|map|player|statistics|timeline)$' '^(' + $.map(app.config.itemViews, function(v) {
return v.id
}).join('|') + ')$'
)(split[1]); )(split[1]);
view = view ? view[0] : app.user.ui.itemView; view = view ? view[0] : app.user.ui.itemView;
UI.set({ UI.set({
@ -3540,11 +3668,6 @@ var pandora = new Ox.App({
'^texts$': function() { '^texts$': function() {
UI.set({ UI.set({
section: 'texts' section: 'texts'
});
},
'^admin$': function() {
UI.set({
section: 'admin'
}); });
} }
}; };
@ -3577,7 +3700,16 @@ var pandora = new Ox.App({
update: function() { update: function() {
URL.parse(); URL.parse();
if (app.user.ui.section == 'items') { if (app.user.ui.section == 'site') {
if (old.user.ui.section == 'site') {
app.$ui.mainPanel.replace(1, app.$ui.rightPanel = ui.rightPanel());
} else {
app.$ui.appPanel.replace(1, app.$ui.mainPanel = ui.mainPanel());
}
} else if (app.user.ui.section == 'items') {
if (old.user.ui.section == 'site') {
app.$ui.appPanel.replace(1, app.$ui.mainPanel = ui.mainPanel());
} else {
if (!old.user.ui.item) { if (!old.user.ui.item) {
if (!app.user.ui.item) { if (!app.user.ui.item) {
app.$ui.mainPanel.replace(1, app.$ui.rightPanel = ui.rightPanel()); app.$ui.mainPanel.replace(1, app.$ui.rightPanel = ui.rightPanel());
@ -3602,6 +3734,7 @@ var pandora = new Ox.App({
} }
} }
} }
}
delete old.user.ui; delete old.user.ui;
} }