3200: Adjust layout of tab load error page.

[arvados.git] / apps / workbench / app / assets / javascripts / tab_panes.js

diff --git a/apps/workbench/app/assets/javascripts/tab_panes.js b/apps/workbench/app/assets/javascripts/tab_panes.js
index 78658786b2ed91ebce027718ff50077b53c4348b..daede2ca14ca4ff7a76a2c2886ee7ec78f062dba 100644 (file)
--- a/apps/workbench/app/assets/javascripts/tab_panes.js
+++ b/apps/workbench/app/assets/javascripts/tab_panes.js
@@ -23,17 +23,16 @@ $(document).on('shown.bs.tab', '[data-toggle="tab"]', function(e) {
                     errhtml = jqxhr.responseText;
                 }
             } else {
-                errhtml = (jqxhr.responseText ||
-                           'The server returned an error when loading this tab.').
+                errhtml = (jqxhr.responseText || status).
                     replace(/&/g, '&').
                     replace(/</g, '&lt;').
                     replace(/>/g, '&gt;');
             }
             $('> div > div', this).html(
-                '<div><iframe></iframe>' +
-                    '<p><a href="#" class="btn btn-primary tab_reload">' +
+                '<div><p>An error occurred when this information was requested. ' +
+                    '<a href="#" class="btn btn-primary tab_reload">' +
                     '<i class="fa fa-fw fa-refresh"></i> ' +
-                    'Reload tab</a></p></div>');
+                    'Reload tab</a></p><iframe></iframe></div>');
             $('.tab_reload', this).click(function() {
                 $('> div > div', $pane).html(
                     '<div class="spinner spinner-32px spinner-h-center"></div>');