[ARVADOS] updated: 8c19d0da4331ba9c2605543f70c0f55875f41497

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/actions_controller.rb           |  2 +-
 apps/workbench/app/controllers/projects_controller.rb          |  2 +-
 .../app/views/application/_name_and_description.html.erb       |  1 -
 .../_show_description.html.erb}                                |  7 -------
 apps/workbench/app/views/projects/_show_summary.html.erb       |  1 -
 apps/workbench/app/views/projects/show.html.erb                | 10 ++++++++++
 apps/workbench/test/integration/anonymous_access_test.rb       |  2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)
 copy apps/workbench/app/views/{application/_name_and_description.html.erb => projects/_show_description.html.erb} (54%)
 delete mode 100644 apps/workbench/app/views/projects/_show_summary.html.erb

       via  8c19d0da4331ba9c2605543f70c0f55875f41497 (commit)
       via  9b3c1e9692fbb590c20b334f1e2ec1c799baba91 (commit)
      from  1c6d77f980ea3d560fec8c4f0dafe3fe0d2b23fc (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 8c19d0da4331ba9c2605543f70c0f55875f41497
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Mar 6 13:05:10 2015 -0500

    5261: Rename Summary tab to Description.

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 7086dcd..84b6249 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -95,7 +95,7 @@ class ActionsController < ApplicationController
       # the destination project.
       redirect_to project_url(@object.uuid, anchor: 'Data_collections')
     else
-      # Otherwise just land on the default (Summary) tab.
+      # Otherwise just land on the default (Description) tab.
       redirect_to @object
     end
   end
diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index f003621..3302771 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -44,7 +44,7 @@ class ProjectsController < ApplicationController
   def show_pane_list
     pane_list = []
     if @object.uuid != current_user.andand.uuid
-      pane_list << 'Summary'
+      pane_list << 'Description'
     end
     pane_list <<
       {
diff --git a/apps/workbench/app/views/projects/_show_summary.html.erb b/apps/workbench/app/views/projects/_show_description.html.erb
similarity index 100%
rename from apps/workbench/app/views/projects/_show_summary.html.erb
rename to apps/workbench/app/views/projects/_show_description.html.erb
diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index d81eb9f..09e3330 100644
--- a/apps/workbench/test/integration/anonymous_access_test.rb
+++ b/apps/workbench/test/integration/anonymous_access_test.rb
@@ -55,7 +55,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
   test "selection actions when anonymous user accesses shared project" do
     visit PUBLIC_PROJECT
 
-    assert_selector 'a', text: 'Summary'
+    assert_selector 'a', text: 'Description'
     assert_selector 'a', text: 'Data collections'
     assert_selector 'a', text: 'Jobs and pipelines'
     assert_selector 'a', text: 'Pipeline templates'

commit 9b3c1e9692fbb590c20b334f1e2ec1c799baba91
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Mar 6 12:47:06 2015 -0500

    5261: Move project name from Summary tab back to heading area.

diff --git a/apps/workbench/app/views/application/_name_and_description.html.erb b/apps/workbench/app/views/application/_name_and_description.html.erb
index 0144a4d..68a201f 100644
--- a/apps/workbench/app/views/application/_name_and_description.html.erb
+++ b/apps/workbench/app/views/application/_name_and_description.html.erb
@@ -9,4 +9,3 @@
     <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual' } %>
   </div>
 <% end %>
-
diff --git a/apps/workbench/app/views/projects/_show_summary.html.erb b/apps/workbench/app/views/projects/_show_summary.html.erb
index c4d4804..7260940 100644
--- a/apps/workbench/app/views/projects/_show_summary.html.erb
+++ b/apps/workbench/app/views/projects/_show_summary.html.erb
@@ -1 +1,5 @@
-<%= render partial: 'name_and_description' %>
+<% if @object.respond_to? :description %>
+  <div class="arv-description-as-subtitle">
+    <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual' } %>
+  </div>
+<% end %>
diff --git a/apps/workbench/app/views/projects/show.html.erb b/apps/workbench/app/views/projects/show.html.erb
index 78966f0..0bf1e45 100644
--- a/apps/workbench/app/views/projects/show.html.erb
+++ b/apps/workbench/app/views/projects/show.html.erb
@@ -1,3 +1,13 @@
+<% content_for :content_top do %>
+  <h2>
+    <% if @object.uuid == current_user.andand.uuid %>
+      Home
+    <% else %>
+      <%= render_editable_attribute @object, 'name', nil, { 'data-emptytext' => "New #{controller.model_class.to_s.underscore.gsub("_"," ")}" } %>
+    <% end %>
+  </h2>
+<% end %>
+
 <% content_for :tab_line_buttons do %>
   <% if @object.editable? %>
     <div class="btn-group btn-group-sm">

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


hooks/post-receive
--