[ARVADOS] updated: 715a760e661e589d454dadca9040729e651edc8a

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/sizing.js  |  5 +++--
 apps/workbench/app/views/jobs/_show_log.html.erb | 25 +++++++++---------------
 2 files changed, 12 insertions(+), 18 deletions(-)

       via  715a760e661e589d454dadca9040729e651edc8a (commit)
      from  549f4a1deddb41f6abbc493a660d9fb0976da91a (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 715a760e661e589d454dadca9040729e651edc8a
Author: Peter Amstutz <tetron at swyman.shell.4xphq.arvadosapi.com>
Date:   Wed Jun 18 14:41:43 2014 +0000

    2883: Use smart scrolling so keep the sorting and filtering selections on the
    page when scrolling the output.

diff --git a/apps/workbench/app/assets/javascripts/sizing.js b/apps/workbench/app/assets/javascripts/sizing.js
index 3d60274..71761db 100644
--- a/apps/workbench/app/assets/javascripts/sizing.js
+++ b/apps/workbench/app/assets/javascripts/sizing.js
@@ -20,9 +20,10 @@ function smart_scroll_fixup(s) {
     }
 
     s.each(function(i, a) {
-        var h = window.innerHeight - $(a).offset().top;
+        a = $(a);
+        var h = window.innerHeight - a.offset().top - a.attr("data-smart-scroll-padding-bottom");
         height = String(h) + "px";
-        $(a).css('max-height', height);
+        a.css('max-height', height);
     });
 }
 
diff --git a/apps/workbench/app/views/jobs/_show_log.html.erb b/apps/workbench/app/views/jobs/_show_log.html.erb
index 2c060cd..8508287 100644
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -101,15 +101,15 @@ $("#set-show-failed-only").on("click", function() {
   <h3>Summary</h3>
   <div id="log-viewer-overview"></div>
 
-  <% if @object.tasks_summary[:failed] > 0 %>
-    <button id="set-show-failed-only" class="btn btn-danger" style="margin-top: 1em">
-      Show failed task output only
-    </button>
-  <% end %>
-
   <div class="h3">Log
 
     <span class="pull-right">
+      <% if @object.tasks_summary[:failed] > 0 %>
+        <button id="set-show-failed-only" class="btn btn-danger">
+          Show failed task output only
+        </button>
+      <% end %>
+
       <button id="filter-all" class="btn">
         Select all
       </button>
@@ -162,12 +162,7 @@ $("#set-show-failed-only").on("click", function() {
 
   </div>
 
-  <div class="log-viewer-paging-div">
-    <a href="#" class="log-viewer-page-up"><span class='glyphicon glyphicon-arrow-up'></span></a>
-    <span class="log-viewer-paging"></span>
-    <a href="#" class="log-viewer-page-down"><span class='glyphicon glyphicon-arrow-down'></span></a>
-  </div>
-
+  <div class="smart-scroll" data-smart-scroll-padding-bottom="50" style="margin-bottom: 0px">
   <table class="log-viewer-table">
     <thead>
       <tr>
@@ -192,15 +187,13 @@ $("#set-show-failed-only").on("click", function() {
       </tr>
     </tbody>
   </table>
-
-
-  <div style="font-size: 18px">
+</div>
+  <div class="log-viewer-paging-div" style="margin-bottom: -15px">
     <a href="#" class="log-viewer-page-up"><span class='glyphicon glyphicon-arrow-up'></span></a>
     <span class="log-viewer-paging"></span>
     <a href="#" class="log-viewer-page-down"><span class='glyphicon glyphicon-arrow-down'></span></a>
   </div>
 
-
 </div>
 
 <% if !@object.log %>

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


hooks/post-receive
--