projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 8286-fav-projects
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
application
/
404.html.erb
diff --git
a/apps/workbench/app/views/application/404.html.erb
b/apps/workbench/app/views/application/404.html.erb
index 84af5d3224bf3c8cd0fa2e8b62404f542b11520c..ea6e7033cb23c113fecfebfbb3dad8e6a7c01533 100644
(file)
--- a/
apps/workbench/app/views/application/404.html.erb
+++ b/
apps/workbench/app/views/application/404.html.erb
@@
-7,19
+7,33
@@
req_item_plain_text = safe_join([class_name_h, " with UUID ", params[:uuid]])
else
req_item = "page you requested"
req_item_plain_text = safe_join([class_name_h, " with UUID ", params[:uuid]])
else
req_item = "page you requested"
+ req_item_plain_text = "page you requested"
end
%>
<h2>Not Found</h2>
end
%>
<h2>Not Found</h2>
-<p>The <%= req_item %> was not found.
+<p>The <%= req_item %> was not found.
</p>
-<% if class_name %>
-Perhaps you'd like to
-<%= link_to("browse all #{class_name_h.pluralize}", action: :index, controller: class_name.tableize) %>?
-<% end %>
+<% if !current_user %>
+
+ <p>
+ <%= link_to(arvados_api_client.arvados_login_url(return_to: strip_token_from_path(request.url)),
+ {class: "btn btn-primary report-issue-modal-window"}) do %>
+ <i class="fa fa-fw fa-sign-in"></i> Log in
+ <% end %>
+ to view private data.
+ </p>
+
+<% elsif class_name %>
-</p>
+ <p>
+ Perhaps you'd like to <%= link_to("browse all
+ #{class_name_h.pluralize}", action: :index, controller:
+ class_name.tableize) %>?
+ </p>
+
+<% end %>
<% error_message = "The #{req_item_plain_text} was not found." %>
<% error_message = "The #{req_item_plain_text} was not found." %>
-<%= render :partial => "report_error", :locals => {error_message: error_message} %>
+<%= render :partial => "report_error", :locals => {error_message: error_message
, error_type: '404'
} %>