[ARVADOS] created: 6ba419ef43b3e06b2bc48b0204146349ab64ab5b

[git at public.curoverse.com]

        at  6ba419ef43b3e06b2bc48b0204146349ab64ab5b (commit)


commit 6ba419ef43b3e06b2bc48b0204146349ab64ab5b
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Mar 4 14:49:55 2015 -0500

    5261: Move project name and description into a Summary tab.
    
    Reduce tab font size to reduce chances of word-wrapping tabs.

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 9bc93e3..710bc92 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -277,6 +277,12 @@ span.editable-textile {
   display: none;
 }
 
+/* Hide Angular content until Angular is ready */
 [ng\:cloak], [ng-cloak], .ng-cloak {
     display: none !important;
 }
+
+/* tabs */
+ul.nav.nav-tabs {
+    font-size: 90%
+}
diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index 8c2f72e..f003621 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -43,6 +43,9 @@ class ProjectsController < ApplicationController
   # It also seems to me that something like these could be used to configure the contents of the panes.
   def show_pane_list
     pane_list = []
+    if @object.uuid != current_user.andand.uuid
+      pane_list << 'Summary'
+    end
     pane_list <<
       {
         :name => 'Data_collections',
diff --git a/apps/workbench/app/views/projects/_show_summary.html.erb b/apps/workbench/app/views/projects/_show_summary.html.erb
new file mode 100644
index 0000000..c4d4804
--- /dev/null
+++ b/apps/workbench/app/views/projects/_show_summary.html.erb
@@ -0,0 +1 @@
+<%= render partial: 'name_and_description' %>
diff --git a/apps/workbench/app/views/projects/show.html.erb b/apps/workbench/app/views/projects/show.html.erb
index 5dd1017..78966f0 100644
--- a/apps/workbench/app/views/projects/show.html.erb
+++ b/apps/workbench/app/views/projects/show.html.erb
@@ -1,9 +1,3 @@
-<% if @object.uuid != current_user.andand.uuid # Not the "Home" project %>
-<% content_for :content_top do %>
-  <%= render partial: 'name_and_description' %>
-<% end %>
-<% end %>
-
 <% content_for :tab_line_buttons do %>
   <% if @object.editable? %>
     <div class="btn-group btn-group-sm">

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


hooks/post-receive
--