projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2919-provenance-graph-cutoff
[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 96dc34870a8468ef9869ae5cb891fe9e807d458c..20af6485b088c67f4ad6ae612ffc63916ead8c4e 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 %>
<% 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 %>
<% end %>
<% content_for :tab_line_buttons do %>
@@
-8,12
+8,12
@@
<% if controller.model_class.name == 'User' %>
<%= link_to "Add a new #{controller.model_class.to_s.underscore.gsub '_', ' '}", setup_user_popup_path,
<% 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",
+ {class: 'btn btn-primary pull-right', :remote => true, 'data-toggle' => "modal",
'data-target' => '#user-setup-modal-window', return_to: request.url} %>
<div id="user-setup-modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
<% else %>
'data-target' => '#user-setup-modal-window', return_to: request.url} %>
<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.to_s.underscore.gsub '_', ' '}",
- { action: 'create'
, return_to: request.url },
+ <%= button_to "Add a new #{controller.
controller_name.singularize.humanize.downcase}",
+ { action: 'create'
},
{ class: 'btn btn-primary pull-right' } %>
<% end %>
{ class: 'btn btn-primary pull-right' } %>
<% end %>