Added div for histogram and style for it.
authorMisha Zatsman <misha-arvados@zatsman.com>
Tue, 6 May 2014 21:13:07 +0000 (21:13 +0000)
committerMisha Zatsman <misha-arvados@zatsman.com>
Tue, 6 May 2014 21:13:07 +0000 (21:13 +0000)
apps/workbench/app/assets/javascripts/sizing.js
apps/workbench/app/assets/stylesheets/keep_disks.css.scss
apps/workbench/app/controllers/keep_disks_controller.rb
apps/workbench/app/views/keep_disks/_content_layout.html.erb [new file with mode: 0644]

index 55d2301387c90aa703d59ead3fa1d552c36014b5..640893fe0ca04f36aa4388f96da60c9834920b94 100644 (file)
@@ -23,7 +23,7 @@ function smart_scroll_fixup(s) {
         a = s[i];
         var h = window.innerHeight - a.getBoundingClientRect().top - 20;
         height = String(h) + "px";
-        a.style.height = height;
+        a.style['max-height'] = height;
     }
 }
 
index 1f7780bbb0cc07026825ccb549f44c6d71ed8e89..aff8b50f18ddfcf7cb8bd228b5055e3be4c36c1d 100644 (file)
@@ -1,3 +1,10 @@
 // Place all the styles related to the KeepDisks controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+/* Margin allows us some space between the table above. */
+div.cache-age-vs-disk-histogram {
+    margin-top: 20px;
+}
+
+
index cc8922883283fcafe5f99a56ee669283dfaffa40..0e1a9818ed8d38fc9f8d76d589ccd88ce23a8204 100644 (file)
@@ -4,4 +4,8 @@ class KeepDisksController < ApplicationController
     @object = KeepDisk.new defaults.merge(params[:keep_disk] || {})
     super
   end
+  def index
+    # TODO(misha):Retrieve the histogram info
+    super
+  end
 end
diff --git a/apps/workbench/app/views/keep_disks/_content_layout.html.erb b/apps/workbench/app/views/keep_disks/_content_layout.html.erb
new file mode 100644 (file)
index 0000000..7178b9c
--- /dev/null
@@ -0,0 +1,6 @@
+<% content_for :tab_panes do %>
+<div class='cache-age-vs-disk-histogram'>Histogram will go here.</div>
+<% end %>
+<%= content_for :content_top %>
+<%= content_for :tab_line_buttons %>
+<%= content_for :tab_panes %>