X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8010ff47f31c6cb38a21cf72de6b0ab8def81d17..f102390c598ec819f31fdccc603f19c39eb9e1c8:/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 c1f48bd851..aa1ffda017 100644
--- a/apps/workbench/app/views/application/404.html.erb
+++ b/apps/workbench/app/views/application/404.html.erb
@@ -1,12 +1,36 @@
+<%
+   if (controller.andand.action_name == 'show') and params[:uuid]
+     class_name = controller.model_class.to_s.underscore
+     class_name_h = class_name.humanize(capitalize: false)
+     req_item = safe_join([class_name_h, " with UUID ",
+                           raw("<code>"), params[:uuid], raw("</code>")], "")
+     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 item you requested was not found.
+<p>The <%= req_item %> was not found.</p>
 
-<% if controller.andand.action_name == 'show' %>
-Perhaps you'd like to
-<%= link_to("browse all #{controller.model_class.to_s.underscore.pluralize.humanize(capitalize: false)}",
-            action: :index) %>?
-<% end %>
+<% if !current_user %>
+
+  <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>
 
-</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>
+
+<% end %>
 
+<% error_message = "The #{req_item_plain_text} was not found." %>
+<%= render :partial => "report_error", :locals => {error_message: error_message, error_type: '404'} %>