diff --git a/static/js/pandora.js b/static/js/pandora.js index 6cf41577..9477fee8 100644 --- a/static/js/pandora.js +++ b/static/js/pandora.js @@ -288,7 +288,12 @@ appPanel pandora.$ui.body.ajaxStart(pandora.$ui.loadingIcon.start); pandora.$ui.body.ajaxStop(pandora.$ui.loadingIcon.stop); Ox.Request.bindEvent({ - error: pandora.ui.errorDialog + error: pandora.ui.errorDialog, + request: function(data) { + pandora.$ui.loadingIcon.options({ + tooltip: data.requests + ' request' + (data.requests == 1 ? '' : 's') + }); + } }); pandora.site.sectionButtonsWidth = pandora.$ui.sectionButtons.width() + 8; diff --git a/static/js/pandora/errorDialog.js b/static/js/pandora/error.js similarity index 95% rename from static/js/pandora/errorDialog.js rename to static/js/pandora/error.js index 43641bce..5513870b 100644 --- a/static/js/pandora/errorDialog.js +++ b/static/js/pandora/error.js @@ -26,7 +26,7 @@ pandora.ui.errorDialog = function(data) { content: Ox.Element() .append( $('') - .attr({src: Ox.UI.PATH + 'png/icon128.png'}) + .attr({src: '/static/png/icon64.png'}) .css({position: 'absolute', left: '16px', top: '16px', width: '64px', height: '64px'}) ) .append( @@ -41,7 +41,7 @@ pandora.ui.errorDialog = function(data) { title: Ox.toTitleCase(data.status.text), width: 368 }) - .addClass('OxErrorDialog'); + .addClass('OxErrorDialog') .open(); } else { // 0 (timeout) or 500 (error) @@ -84,7 +84,7 @@ pandora.ui.errorDialog = function(data) { title: 'Server ' + Ox.toTitleCase(error), width: 368 }) - .addClass('OxErrorDialog'); + .addClass('OxErrorDialog') .open(); } }, 250); diff --git a/static/js/pandora/folders.js b/static/js/pandora/folders.js index 12b0eac3..ea53e891 100644 --- a/static/js/pandora/folders.js +++ b/static/js/pandora/folders.js @@ -307,6 +307,7 @@ pandora.ui.folders = function() { ), fixedSize: true, height: 128, + removeOnClose: true, width: 304, title: title }).open(); diff --git a/static/js/pandora/item.js b/static/js/pandora/item.js index 2ab7d3af..03072e94 100644 --- a/static/js/pandora/item.js +++ b/static/js/pandora/item.js @@ -321,6 +321,9 @@ pandora.ui.item = function() { operator: '&' } : pandora.site.user.ui.itemFind); }, + info: function(data) { + pandora.ui.annotationDialog(data.layer).open(); + }, muted: function(data) { pandora.UI.set('videoMuted', data.muted); }, diff --git a/static/js/pandora/menu.js b/static/js/pandora/menu.js index b570a5f3..543f7c1c 100644 --- a/static/js/pandora/menu.js +++ b/static/js/pandora/menu.js @@ -7,7 +7,6 @@ pandora.ui.mainMenu = function() { findState = pandora.getFindState(ui.find), that = Ox.MainMenu({ extras: [ - $('