Merge branch 'master' into 3016-pipeline-template-search-string

[arvados.git] / apps / workbench / app / views / application / index.html.erb

diff --git a/apps/workbench/app/views/application/index.html.erb b/apps/workbench/app/views/application/index.html.erb
index f6bd49c07f51557f629ec5660d839f13236522d0..0e72f7a2ddadf4f7947cb08b2afc0aa90a5cde50 100644 (file)
--- a/apps/workbench/app/views/application/index.html.erb
+++ b/apps/workbench/app/views/application/index.html.erb
@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-<%= controller.model_class.to_s.pluralize.underscore.capitalize.gsub('_', ' ') %>
+<%= controller.controller_name.humanize.capitalize %>
 <% end %>
 
 <% content_for :tab_line_buttons do %>
@@ -7,14 +7,18 @@
   <% if controller.model_class.creatable? %>
 
     <% if controller.model_class.name == 'User' %>
-      <%= link_to "Add a new #{controller.model_class.to_s.underscore.gsub '_', ' '}", setup_user_popup_path,
-        {class: 'btn btn-primary pull-right', :remote => true, 'data-toggle' =>  "modal",
-          'data-target' => '#user-setup-modal-window', return_to: request.url}  %>
+      <%= 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>
     <% else %>
-      <%= button_to "Add a new #{controller.model_class_for_display.underscore.gsub '_', ' '}",
-        { action: 'create', return_to: request.url },
-        { class: 'btn btn-primary pull-right' } %>
+      <%= 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 %>
 
   <% end %>