X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9074f3f32aa13274f266bfb091bdac43426bb4d9..df9e166a5ffc4aa79658bec1a5d552a3b413f0d8:/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 7d15d95557..aa1ffda017 100644
--- a/apps/workbench/app/views/application/404.html.erb
+++ b/apps/workbench/app/views/application/404.html.erb
@@ -7,26 +7,30 @@
      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>
+    (I notice you are not logged in. If you're looking for a private
+    page, you'll need to <%=link_to 'log in', arvados_api_client.arvados_login_url(return_to: strip_token_from_path(request.url))%> first.)
+  </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." %>
-<strong>Would you like to report this problem?</strong></br>
-<%= 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'} %>