[ARVADOS] updated: 09f524053fa42eec0dbed316faaa078ac68d0d2c

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/tab_panes.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

       via  09f524053fa42eec0dbed316faaa078ac68d0d2c (commit)
      from  b6ee157889043600b012f33382da0347d07ee211 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 09f524053fa42eec0dbed316faaa078ac68d0d2c
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Jul 24 10:45:07 2014 -0400

    3200: Adjust layout of tab load error page.

diff --git a/apps/workbench/app/assets/javascripts/tab_panes.js b/apps/workbench/app/assets/javascripts/tab_panes.js
index 7865878..daede2c 100644
--- 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, '<').
                     replace(/>/g, '>');
             }
             $('> 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>');

-----------------------------------------------------------------------


hooks/post-receive
--