Merge branch '8784-dir-listings'

[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 ae7dc223b704a4d77082ea59199fb026a1844ba1..e02d0b3bd751c5698b22d8590e9573fd6ea72efc 100644 (file)
--- a/apps/workbench/app/views/application/404.html.erb
+++ b/apps/workbench/app/views/application/404.html.erb
@@ -1,3 +1,7 @@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
 <%
    if (controller.andand.action_name == 'show') and params[:uuid]
      class_name = controller.model_class.to_s.underscore
@@ -7,26 +11,33 @@
      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>
 
-<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>
+  <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>
+    Perhaps you'd like to <%= link_to("browse all
+    #{class_name_h.pluralize}", action: :index, controller:
+    class_name.tableize) %>?
+  </p>
 
-<p>
-<br/>
-<% error_message = "The #{req_item_plain_text} was not found." %>
-Would you like to report this problem?
-<%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.fullpath, action_method: 'post', error_message: error_message),
-      {class: 'btn btn-primary report-issue-modal-window', 'data-toggle' =>  "modal", 'data-target' => '#report-issue-modal-window', :remote => true, return_to: request.url} do %>
-      <i class="fa fa-fw fa-support"></i> Report problem
 <% end %>
-</p>
+
+<% error_message = "The #{req_item_plain_text} was not found." %>
+<%= render :partial => "report_error", :locals => {error_message: error_message, error_type: '404'} %>