diff --git a/static/50x.html b/static/50x.html
index 338103574..92056b14f 100644
--- a/static/50x.html
+++ b/static/50x.html
@@ -1,21 +1,19 @@
-
-
-We will be back in a minute
-
-
-
-We will be back in a minute.
-
-
-
+
+ We will be back in a moment.
+ We will be back in a moment.
+
+
diff --git a/static/js/pandora/folders.js b/static/js/pandora/folders.js
index 13fcb0509..8820358ca 100644
--- a/static/js/pandora/folders.js
+++ b/static/js/pandora/folders.js
@@ -4,7 +4,7 @@ pandora.ui.folders = function() {
that = Ox.Element()
.css({overflowX: 'hidden', overflowY: 'auto'})
.bindEvent({
- resize: pandora.resizeFolders
+ resize: pandora.resizeFolders,
});
var counter = 0;
//var $sections = [];
diff --git a/static/js/pandora/info.js b/static/js/pandora/info.js
index 0d8a0da89..21923a3b3 100644
--- a/static/js/pandora/info.js
+++ b/static/js/pandora/info.js
@@ -10,7 +10,6 @@ pandora.ui.info = function() {
toggle: function(data) {
Ox.print('INFO TOGGLE')
pandora.UI.set({showInfo: !data.collapsed});
- //pandora.resizeFolders();
},
pandora_find: function() {
if (pandora.user.ui._list != pandora.UI.getPrevious('_list')) {
@@ -19,9 +18,6 @@ pandora.ui.info = function() {
},
pandora_item: updateInfo,
pandora_listselection: updateInfo,
- pandora_showinfo: function(data) {
- pandora.resizeFolders();
- }
});
//pandora.$ui.leftPanel && resize();
diff --git a/static/js/pandora/leftPanel.js b/static/js/pandora/leftPanel.js
index 9ea33df0d..630fa47b3 100644
--- a/static/js/pandora/leftPanel.js
+++ b/static/js/pandora/leftPanel.js
@@ -13,7 +13,7 @@ pandora.ui.leftPanel = function() {
collapsed: !pandora.user.ui.showInfo,
collapsible: true,
element: pandora.$ui.info = pandora.ui.info(),
- size: pandora.getInfoHeight(),
+ size: pandora.getInfoHeight(true),
tooltip: 'info'
}
],
diff --git a/static/js/pandora/list.js b/static/js/pandora/list.js
index 28cb4e081..4c5a08c47 100644
--- a/static/js/pandora/list.js
+++ b/static/js/pandora/list.js
@@ -334,6 +334,7 @@ pandora.ui.list = function() {
return {'in': clip['in'], out: clip.out};
}) : [],
subtitles: isClipsQuery ? data.clips.map(function(clip) {
+ Ox.print('CLIP:::::', clip)
return {'in': clip['in'], out: clip.out, text: clip.annotations[0].value};
}) : []
}
diff --git a/static/js/pandora/menu.js b/static/js/pandora/menu.js
index 047bbf174..2f2f2be15 100644
--- a/static/js/pandora/menu.js
+++ b/static/js/pandora/menu.js
@@ -298,7 +298,9 @@ pandora.ui.mainMenu = function() {
pandora.UI.set({showSidebar: !ui.showSidebar});
},
key_shift_slash: function() {
- pandora.URL.push('/help');
+ if ($('.OxDialog').length == 0 && $('.OxScreen').length == 0) {
+ pandora.URL.push('/help');
+ }
},
pandora_find: function() {
var action = ui._list
-