Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions config/strings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ landing:
label: Useful Docs
style: docs


# partials/footer
footer:
helpText: Questions? Contact your organization's administrators.
Expand Down Expand Up @@ -65,7 +64,7 @@ playlist:
heading: !!js/function (title) => `${title} Playlist`
nav:
previous: <
next: '>'
next: ">"

# errors
error:
Expand All @@ -81,8 +80,10 @@ error:
title: Server Error
heading: Uh oh, that's a 500.
message: Perhaps try to search for something else instead?
sizeLimitNote:
message: "The document is too large to display in Library. We are working on a fix, but in the meantime, you can view the document directly in Google Drive."

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we say "the document may be..." instead of "the document is..." in case all of doctools is down somehow?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will only show in the case that google specifically sends us the exportSizeLimitExceeded error, so I think ok to keep it as "is."

viewButton: "View the document directly in Google Drive"

# warning messages
warning:
duplicate: !!js/function (names, folderId) => `Multiple resources in <a href="https://drive.google.com/drive/u/0/folders/${folderId}" target="_blank">this folder</a> share the same name&#58; ${names.join(', ')}. Only one will be accesible through Library.`

19 changes: 16 additions & 3 deletions layouts/errors/500.ejs
Original file line number Diff line number Diff line change
@@ -1,19 +1,32 @@
<!DOCTYPE html>
<html>
<%- include('partials/head', {title: template('error.500.title'), formatUrl, pathPrefix}) %>
<%- include('partials/head', {title: template('error.500.title'), formatUrl,
pathPrefix}) %>
<body>
<%- include('partials/header', {title: template('error.500.title'), parentLinks: [], formatUrl}) %>
<%- include( 'partials/header', {title: template('error.500.title'),
parentLinks: [], formatUrl} ) %>
<div id="main-search-page">
<div class="main-item">
<div class="tagline">
<h1><%- template('error.500.heading') %></h1>
<p><%- template('error.500.message') %></p>

<% if (err.errors && err.errors.find(error => error.reason ===
'exportSizeLimitExceeded')) { %>
<h3><%- template('error.500.sizeLimitNote.message') %></h3>
<a
href="https://docs.google.com/document/d/<%= locals.docId %>"
class="button btn-footer"
target="_blank"
rel="noopener noreferrer"
><%- template('error.500.sizeLimitNote.viewButton') %></a
>
<% } %>
</div>
<%- include('partials/search', {style: 'homepage', formatUrl}) %>
</div>

<%- include('partials/footer', {style: 'homepage', formatUrl}) %>
</div>

</body>
</html>
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "library",
"version": "1.6.2",
"version": "1.6.3",
"description": "A collaborative newsroom documentation site, powered by Google Docs.",
"main": "server/index.js",
"dependencies": {
Expand Down