')
+ .append($placeFlag)
+ .append($placeName)
+ .append($placeButton),
+
+ $toolbar = Ox.Bar({size: 24})
+ .append($place),
+
+ $list = pandora.ui.clipList(videoRatio)
+ .bindEvent({
+ init: function(data) {
+ updateStatusbar(data.items);
+ }
+ }),
+
+ $status = $('
')
+ .css({
+ width: '100%',
+ marginTop: '2px',
+ fontSize: '9px',
+ textAlign: 'center',
+ textOverflow: 'ellipsis'
+ }),
+
+ $statusbar = Ox.Bar({size: 16}).append($status),
+
+ $listPanel = Ox.SplitPanel({
+ elements: [
+ {
+ element: $toolbar,
+ size: 24
+ },
+ {
+ element: $list
+ },
+ {
+ element: $statusbar,
+ size: 16
+ }
+ ],
+ orientation: 'vertical'
+ })
+ .bindEvent({
+ resize: function(data) {
+ resizeToolbar(data.size);
+ $list.size();
+ },
+ resizeend: function(data) {
+ var size = data.size;
+ if (listSizes.indexOf(size) == -1) {
+ if (size <= (listSizes[0] + listSizes[1]) / 2) {
+ size = listSizes[0];
+ } else if (size < (listSizes[1] + listSizes[2]) / 2) {
+ size = listSizes[1];
+ } else {
+ size = listSizes[2];
+ }
+ that.size(1, size, function() {
+ $map.resizeMap();
+ resizeToolbar(size);
+ // strangely, the animation may still not be fully
+ // finished, causing the list size to be off by one
+ setTimeout($list.size, 0);
+ });
+ }
+ pandora.UI.set({clipsColumns: listSizes.indexOf(size) + 1});
+ }
+ }),
+
+ that = Ox.SplitPanel({
+ elements: [
+ {
+ element: $map,
+ },
+ {
+ element: $listPanel,
+ resizable: true,
+ resize: listSizes,
+ size: listSize,
+ tooltip: 'clips'
+ }
+ ],
+ orientation: 'horizontal'
+ });
+
+ resizeToolbar(listSize);
+ updateToolbar();
+ updateStatusbar();
+
+ function resizeToolbar(width) {
+ $placeName.options({width: width - 48});
+ }
+
+ function updateStatusbar(items) {
+ $status.html((items || 'No') + ' clip' + (items == 1 ? '' : 's'));
+ }
+
+ function updateToolbar(place) {
+ $placeFlag.attr({
+ src: Ox.getImageByGeoname('icon', 16, place ? place.geoname : '')
+ });
+ $placeName.options({title: place ? place.name : 'No place'});
+ $placeButton.options({disabled: !place});
+ }
+
+ // fixme: this is needed for the main window resize handler
+ pandora.$ui.map = $map;
+
+ return that;
+
+};
\ No newline at end of file
diff --git a/static/js/pandora/ui/siteDialog.js b/static/js/pandora/ui/siteDialog.js
index 796d9b6d..8ea69181 100644
--- a/static/js/pandora/ui/siteDialog.js
+++ b/static/js/pandora/ui/siteDialog.js
@@ -44,6 +44,9 @@ pandora.ui.siteDialog = function(section) {
$dialog.options({
title: Ox.getObjectById(tabs, data.selected).title
});
+ //fixme: this should be using URL.push / UI.set
+ //but that currenlty causes another dialog to be opened
+ history.pushState({}, '', '/' + data.selected);
}
});
var $dialog = Ox.Dialog({
@@ -54,7 +57,9 @@ pandora.ui.siteDialog = function(section) {
}).bindEvent({
click: function() {
$dialog.close();
- pandora.URL.push();
+ //fixme: this should be using URL.push / UI.set
+ //but that currenlty causes a reload
+ history.pushState({}, '', '/');
}
})
],
diff --git a/static/js/pandora/utils.js b/static/js/pandora/utils.js
index d766b812..c8526a3f 100644
--- a/static/js/pandora/utils.js
+++ b/static/js/pandora/utils.js
@@ -435,12 +435,9 @@ pandora.getGroupsSizes = function() {
pandora.getInfoHeight = function() {
// fixme: new, check if it can be used more
- var isVideoPreview
- if (!pandora.user.ui.item) {
- isVideoPreview = pandora.user.ui.listSelection.length && !pandora.isClipView();
- } else {
- isVideoPreview = !pandora.isClipView();
- }
+ var isVideoPreview = pandora.user.ui.item || (
+ pandora.user.ui.listSelection.length && !pandora.isClipView()
+ );
return pandora.user.ui.showInfo * Math.min(
isVideoPreview
? Math.round(pandora.user.ui.sidebarSize / (16/9)) + 16
diff --git a/static/json/pandora.json b/static/json/pandora.json
index 349325ab..a55c6944 100644
--- a/static/json/pandora.json
+++ b/static/json/pandora.json
@@ -9,6 +9,7 @@
"js/pandora/ui/appPanel.js",
"js/pandora/ui/backButton.js",
"js/pandora/ui/browser.js",
+ "js/pandora/ui/clipList.js",
"js/pandora/ui/contentPanel.js",
"js/pandora/ui/deleteListDialog.js",
"js/pandora/ui/editor.js",
@@ -31,6 +32,7 @@
"js/pandora/ui/list.js",
"js/pandora/ui/listDialog.js",
"js/pandora/ui/mainPanel.js",
+ "js/pandora/ui/mapView.js",
"js/pandora/ui/mediaView.js",
"js/pandora/ui/menu.js",
"js/pandora/ui/orderButton.js",