X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c0c1111f322159333fdf14e3d3e8ce0c00662734..1ec89c1c31669eb89bd1997cfa9d3c50f0204dbe:/apps/workbench/app/views/application/index.html.erb?ds=sidebyside

diff --git a/apps/workbench/app/views/application/index.html.erb b/apps/workbench/app/views/application/index.html.erb
index 4ebedf6d69..3e2a608ed7 100644
--- a/apps/workbench/app/views/application/index.html.erb
+++ b/apps/workbench/app/views/application/index.html.erb
@@ -1,37 +1,30 @@
 <% content_for :page_title do %>
-<%= controller.model_class.to_s.pluralize.underscore.capitalize.gsub '_', ' ' %>
+<%= controller.controller_name.humanize.capitalize %>
 <% end %>
 
-<% if controller.model_class.creatable? %>
-<%= button_to "Add a new #{controller.model_class.to_s.underscore.gsub '_', ' '}", 
-    { action: 'create', return_to: request.url }, 
-    { class: 'btn btn-primary pull-right' } %>
-<% end %>
-<%= form_tag({action: 'compare', controller: params[:controller], method: 'get'}, {method: 'get', id: 'compare', class: 'pull-right small-form-margin'}) do |f| %>
-<%= submit_tag 'Compare selected', {class: 'btn btn-primary', disabled: true, style: 'display: none'} %>
-&nbsp;
-<% end rescue nil %>
+<% content_for :tab_line_buttons do %>
 
-<% pane_list = controller.index_pane_list rescue %w(recent) %>
+  <% if controller.model_class.creatable? %>
 
-<% if pane_list.length > 1 %>
-<div class="tabbable">
-<ul class="nav nav-tabs">
-  <% pane_list.each_with_index do |pane, i| %>
-  <li class="<%= 'active' if i==0 %>"><a href="#<%= pane %>" data-toggle="tab" id="<%= pane %>-tab"> <%= pane.capitalize %></a></li>
-  <% end %>
-</ul>
+    <% if controller.model_class.name == 'User' %>
+      <%= link_to setup_user_popup_path,
+        {class: 'btn btn-sm btn-primary', :remote => true, 'data-toggle' =>  "modal",
+          'data-target' => '#user-setup-modal-window', return_to: request.url} do %>
+        <i class="fa fa-fw fa-plus"></i> Add a new user
+      <% end %>
+      <div id="user-setup-modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
+    <% elsif controller.controller_name == 'manage_account' %>
+      <%# No add button is needed %>
+    <% else %>
+      <%= button_to({action: 'create'}, {class: 'btn btn-sm btn-primary'}) do %>
+        <i class="fa fa-fw fa-plus"></i>
+        Add a new
+        <%= controller.controller_name.singularize.humanize.downcase %>
+      <% end %>
+    <% end %>
 
-<div class="tab-content">
-  <% pane_list.each_with_index do |pane, i| %>
-  <div id="<%= pane %>" class="tab-pane fade in <%= 'active' if i==0 %>">
-    <%= render partial: pane %>
-  </div>
   <% end %>
-</div>
 
-<% else %>
-  <% pane_list.each_with_index do |pane, i| %>
-    <%= render partial: pane %>
-  <% end %>
 <% end %>
+
+<%= render partial: 'content', layout: 'content_layout', locals: {pane_list: controller.index_pane_list }%>