diff --git a/public/language/en-GB/global.json b/public/language/en-GB/global.json index 75f9e2251b..09a90dea4c 100644 --- a/public/language/en-GB/global.json +++ b/public/language/en-GB/global.json @@ -10,7 +10,7 @@ "500.title": "Internal Error.", "500.message": "Oops! Looks like something went wrong!", "400.title": "Bad Request.", - "400.message": "It looks like this link is malformed, please double-check and try again. Otherwise, return to the home page.", + "400.message": "It looks like this link is malformed, please double-check and try again.
Return to the home page.
", "register": "Register", "login": "Login", diff --git a/public/language/en-GB/pages.json b/public/language/en-GB/pages.json index 060156a76b..3f1863fd32 100644 --- a/public/language/en-GB/pages.json +++ b/public/language/en-GB/pages.json @@ -68,7 +68,7 @@ "confirm": "Email Confirmed", - "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", + "maintenance.text": "%1 is currently undergoing maintenance.
Please come back another time.", "maintenance.messageIntro": "Additionally, the administrator has left this message:", "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time." diff --git a/src/controllers/topics.js b/src/controllers/topics.js index 3b7c42d958..4efbd29b6f 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -22,7 +22,7 @@ const upload_url = nconf.get('upload_url'); topicsController.get = async function getTopic(req, res, next) { const tid = req.params.topic_id; - + throw new Error('db connection not found'); if ( (req.params.post_index && !utils.isNumber(req.params.post_index) && req.params.post_index !== 'unread') || !utils.isNumber(tid) diff --git a/src/views/400.tpl b/src/views/400.tpl index 6658e27f99..fb10fcfa81 100644 --- a/src/views/400.tpl +++ b/src/views/400.tpl @@ -1,9 +1,12 @@ -
- [[global:400.title]] +
+

[[global:400.title]]

-

{{{ if error }}}{error}{{{ else }}}[[global:400.message, {config.relative_path}]]{{{ end }}}

- - {{{ if returnLink }}} -

[[error:goback]]

- {{{ end }}} +
+
+
+ +
+ {{{ if error }}}{error}{{{ else }}}[[global:400.message, {config.relative_path}]]{{{ end }}} +
+
diff --git a/src/views/403.tpl b/src/views/403.tpl index a68d8672f8..806eceb30c 100644 --- a/src/views/403.tpl +++ b/src/views/403.tpl @@ -1,13 +1,15 @@ -
- [[global:403.title]] +
+

[[global:403.title]]

-

{{{ if error }}}{error}{{{ else }}}[[global:403.message]]{{{ end }}}

- - {{{ if returnLink }}} -

[[error:goback]]

- {{{ end }}} - - {{{ if !loggedIn }}} -

[[global:403.login, {config.relative_path}]]

- {{{ end }}} -
\ No newline at end of file +
+
+
+ +
+ {{{ if error }}}{error}{{{ else }}}[[global:403.message]]{{{ end }}} + {{{ if !loggedIn }}} + [[global:403.login, {config.relative_path}]] + {{{ end }}} +
+
+
diff --git a/src/views/500.tpl b/src/views/500.tpl index e0ddffae26..b24f7342a3 100644 --- a/src/views/500.tpl +++ b/src/views/500.tpl @@ -1,10 +1,13 @@ -
- [[global:500.title]] -

[[global:500.message]]

-

{path}

- {{{ if error }}}

{error}

{{{ end }}} +
+

[[global:500.title]]

- {{{ if returnLink }}} -

[[error:goback]]

- {{{ end }}} -
+
+
+
+ +
+ [[global:500.message]] + {{{ if error }}}
{error}
{{{ end }}} +
+
+
\ No newline at end of file diff --git a/src/views/503.tpl b/src/views/503.tpl index 2654ab8429..800de34b7d 100644 --- a/src/views/503.tpl +++ b/src/views/503.tpl @@ -1,12 +1,15 @@ -

[[pages:maintenance.text, {site_title}]]

-

-{{{ if message }}} -
-
-

[[pages:maintenance.messageIntro]]

-
- {message} +
+

[[pages:maintenance.text, {site_title}]]

+ +
+
+
+ +
+ {{{ if message }}} + [[pages:maintenance.messageIntro]] +
{message}
+ {{{ end }}}
-{{{ end }}} \ No newline at end of file