[ARVADOS] updated: d2517f46eb0d1a668ac8124144220436c80d6f65
git at public.curoverse.com
git at public.curoverse.com
Tue Sep 23 11:20:22 EDT 2014
Summary of changes:
.../app/assets/stylesheets/application.css.scss | 4 ++++
.../app/controllers/application_controller.rb | 2 +-
.../app/views/application/_content_layout.html.erb | 10 ++++++----
.../app/views/application/_show_advanced.html.erb | 2 +-
...ult_show.html.erb => _title_and_buttons.html.erb} | 20 +-------------------
apps/workbench/app/views/application/show.html.erb | 2 +-
apps/workbench/app/views/jobs/_show_status.html.erb | 2 ++
apps/workbench/app/views/jobs/show.html.erb | 2 +-
.../app/views/projects/_show_dashboard.html.erb | 2 +-
9 files changed, 18 insertions(+), 28 deletions(-)
rename apps/workbench/app/views/application/{_default_show.html.erb => _title_and_buttons.html.erb} (79%)
via d2517f46eb0d1a668ac8124144220436c80d6f65 (commit)
from 240ab2c50a01531df162850be255a4c4e1084fc2 (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 d2517f46eb0d1a668ac8124144220436c80d6f65
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Sep 23 11:20:16 2014 -0400
3605: Rename "default_show" to "title_and_buttons". Revert capitalization
change to "curl". Eliminate excess top margin on page title. Restored
RunningOnClient to running list.
diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 2624115..d3abe4f 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -256,4 +256,8 @@ span.editable-textile {
font-size: 80%;
min-width: 1em;
padding: 0px 2px 0px 0px;
+}
+
+#page-wrapper > div > h2 {
+ margin-top: 0px;
}
\ No newline at end of file
diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index d66dbd3..4b775c6 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -694,7 +694,7 @@ class ApplicationController < ActionController::Base
helper_method :running_pipelines
def running_pipelines
- pi = PipelineInstance.order(["started_at asc", "created_at asc"]).filter([["state", "in", ["RunningOnServer"]]])
+ pi = PipelineInstance.order(["started_at asc", "created_at asc"]).filter([["state", "in", ["RunningOnServer", "RunningOnClient"]]])
jobs = {}
pi.each do |pl|
pl.components.each do |k,v|
diff --git a/apps/workbench/app/views/application/_content_layout.html.erb b/apps/workbench/app/views/application/_content_layout.html.erb
index 3e50b6e..4902332 100644
--- a/apps/workbench/app/views/application/_content_layout.html.erb
+++ b/apps/workbench/app/views/application/_content_layout.html.erb
@@ -1,6 +1,8 @@
-<%= content_for :content_top %>
-<div class="pull-right">
- <%= content_for :tab_line_buttons %>
+<div class="clearfix">
+ <%= content_for :content_top %>
+ <div class="pull-right">
+ <%= content_for :tab_line_buttons %>
+ </div>
</div>
-<br clear="all" />
+
<%= content_for :tab_panes %>
diff --git a/apps/workbench/app/views/application/_show_advanced.html.erb b/apps/workbench/app/views/application/_show_advanced.html.erb
index 1cde5c8..70dd96b 100644
--- a/apps/workbench/app/views/application/_show_advanced.html.erb
+++ b/apps/workbench/app/views/application/_show_advanced.html.erb
@@ -3,7 +3,7 @@
'Metadata',
'Python example',
'CLI example',
- 'Curl example'].each do |section| %>
+ 'curl example'].each do |section| %>
<% section_id = section.gsub(" ","_").downcase %>
<div class="panel panel-default">
<div class="panel-heading">
diff --git a/apps/workbench/app/views/application/_default_show.html.erb b/apps/workbench/app/views/application/_title_and_buttons.html.erb
similarity index 79%
rename from apps/workbench/app/views/application/_default_show.html.erb
rename to apps/workbench/app/views/application/_title_and_buttons.html.erb
index 6557442..e1ec160 100644
--- a/apps/workbench/app/views/application/_default_show.html.erb
+++ b/apps/workbench/app/views/application/_title_and_buttons.html.erb
@@ -8,6 +8,7 @@
<% if !['Group','User', 'Collection'].include? @object.class.to_s # projects and collections handle it themselves %>
<%= render partial: 'name_and_description' %>
<% end %>
+<% end %>
<% if @object.class.goes_in_projects? && @object.uuid != current_user.uuid # Not the "Home" project %>
<% content_for :tab_line_buttons do %>
@@ -48,22 +49,3 @@
<% end %>
<% end %>
-<% if @object.respond_to? :properties and !@object.properties.nil? %>
- <% if @object.properties[:page_content] %>
- <% content_for :page_content do %>
- <h1>
- <%= render_markup(@object.properties[:page_title] || @object.uuid) %>
- </h1>
-
- <% if @object.properties[:page_subtitle] %>
- <h4>
- <%= render_markup @object.properties[:page_subtitle] %>
- </h4>
- <% end %>
-
- <%= render_markup @object.properties[:page_content] %>
- <% end %>
- <% end %>
-<% end %>
-
-<% end %>
diff --git a/apps/workbench/app/views/application/show.html.erb b/apps/workbench/app/views/application/show.html.erb
index 86e212e..9b1b002 100644
--- a/apps/workbench/app/views/application/show.html.erb
+++ b/apps/workbench/app/views/application/show.html.erb
@@ -1,2 +1,2 @@
-<%= render partial: 'default_show' %>
+<%= render partial: 'title_and_buttons' %>
<%= render partial: 'content', layout: 'content_layout', locals: {pane_list: controller.show_pane_list }%>
diff --git a/apps/workbench/app/views/jobs/_show_status.html.erb b/apps/workbench/app/views/jobs/_show_status.html.erb
index abd1a4f..cec6340 100644
--- a/apps/workbench/app/views/jobs/_show_status.html.erb
+++ b/apps/workbench/app/views/jobs/_show_status.html.erb
@@ -1,8 +1,10 @@
+<div style="margin-top: 10px">
<% pj = {} %>
<% pj[:job] = @object %>
<% pj[:name] = @object[:name] || "this job" %>
<% tasks = JobTask.filter([['job_uuid', '=', @object.uuid]]).results %>
<%= render partial: 'pipeline_instances/running_component', locals: {tasks: tasks, pj: pj, i: 0, expanded: true} %>
+</div>
<div class="panel panel-default">
<div class="panel-heading">
diff --git a/apps/workbench/app/views/jobs/show.html.erb b/apps/workbench/app/views/jobs/show.html.erb
index d72fa3f..d3047ce 100644
--- a/apps/workbench/app/views/jobs/show.html.erb
+++ b/apps/workbench/app/views/jobs/show.html.erb
@@ -28,5 +28,5 @@
<% end %>
<% end %>
-<%= render partial: 'default_show' %>
+<%= render partial: 'title_and_buttons' %>
<%= render partial: 'content', layout: 'content_layout', locals: {pane_list: controller.show_pane_list }%>
diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index c8f768b..4731594 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -142,7 +142,7 @@
</div>
<div class="col-md-6">
- <% nodes = Node.all.select { |n| (Time.now - n[:last_ping_at]) < 3600 } %>
+ <% nodes = Node.all %>
<div class="panel panel-default" style="min-height: 10em">
<div class="panel-heading"><span class="panel-title">Compute status</span></div>
<div class="panel-body">
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list