From b70c60594158a28345a0a31f093163b352408489 Mon Sep 17 00:00:00 2001 From: SRIRAM RAO TAKKALLAPELLY Date: Tue, 2 Apr 2024 22:29:08 +0000 Subject: [PATCH] Merged in feature/MAW-864-update-error-pages (pull request #48) Feature/MAW-864 update error pages * MAW-864: error page --- build/dev/web-default-conf-cm.yaml | 30 +- build/prod/web-default-conf-cm.yaml | 14 +- build/qa/web-default-conf-cm.yaml | 14 +- build/stage/web-default-conf-cm.yaml | 14 +- wp/403.html | 1 - wp/404.html | 642 ----------------- wp/500.html | 857 +++++++++++++++++++++++ wp/wp-content/themes/child-theme/404.php | 53 ++ wp/wp-content/themes/thbusiness/404.php | 32 - 9 files changed, 928 insertions(+), 729 deletions(-) delete mode 100644 wp/403.html delete mode 100644 wp/404.html create mode 100644 wp/500.html create mode 100644 wp/wp-content/themes/child-theme/404.php delete mode 100644 wp/wp-content/themes/thbusiness/404.php diff --git a/build/dev/web-default-conf-cm.yaml b/build/dev/web-default-conf-cm.yaml index a05b240c..50f47755 100644 --- a/build/dev/web-default-conf-cm.yaml +++ b/build/dev/web-default-conf-cm.yaml @@ -90,12 +90,6 @@ data: #Cache everything by default set $no_cache 0; - error_page 404 /404.html; - location = /404.html { - root /usr/share/nginx/subdomain/$subdomain-web; - add_header Cache-Control "no-cache" always; - } - #Don't cache POST requests if ($request_method = POST) { @@ -145,8 +139,8 @@ data: # redirect server error pages to the static page /50x.html # - error_page 500 502 503 504 /50x.html; - location = /50x.html { + error_page 500 502 503 504 /500.html; + location = /500.html { root /usr/share/nginx/subdomain/$subdomain-web; add_header Cache-Control "no-cache" always; } @@ -241,12 +235,6 @@ data: #Cache everything by default set $no_cache 0; - error_page 404 /404.html; - location = /404.html { - root /usr/share/nginx/subdomain/www; - add_header Cache-Control "no-cache" always; - } - #Don't cache POST requests if ($request_method = POST) { @@ -296,8 +284,8 @@ data: # redirect server error pages to the static page /50x.html # - error_page 500 502 503 504 /50x.html; - location = /50x.html { + error_page 500 502 503 504 /500.html; + location = /500.html { root /usr/share/nginx/subdomain/www; add_header Cache-Control "no-cache" always; } @@ -392,12 +380,6 @@ data: #Cache everything by default set $no_cache 0; - error_page 404 /404.html; - location = /404.html { - root /usr/share/nginx/subdomain/dev01; - add_header Cache-Control "no-cache" always; - } - #Don't cache POST requests if ($request_method = POST) { @@ -447,8 +429,8 @@ data: # redirect server error pages to the static page /50x.html # - error_page 500 502 503 504 /50x.html; - location = /50x.html { + error_page 500 502 503 504 /500.html; + location = /500.html { root /usr/share/nginx/subdomain/dev01; add_header Cache-Control "no-cache" always; } diff --git a/build/prod/web-default-conf-cm.yaml b/build/prod/web-default-conf-cm.yaml index 954ce628..0544cbd5 100644 --- a/build/prod/web-default-conf-cm.yaml +++ b/build/prod/web-default-conf-cm.yaml @@ -99,12 +99,6 @@ data: #Cache everything by default set $no_cache 0; - - error_page 404 /404.html; - location = /404.html { - root /usr/share/nginx/subdomain/$subdomain; - add_header Cache-Control "no-cache" always; - } #Don't cache POST requests if ($request_method = POST) @@ -154,8 +148,8 @@ data: # redirect server error pages to the static page /50x.html # - error_page 500 502 503 504 /50x.html; - location = /50x.html { + error_page 500 502 503 504 /500.html; + location = /500.html { root /usr/share/nginx/subdomain/$subdomain; add_header Cache-Control "no-cache" always; } @@ -276,8 +270,8 @@ data: # redirect server error pages to the static page /50x.html # - error_page 500 502 503 504 /50x.html; - location = /50x.html { + error_page 500 502 503 504 /500.html; + location = /500.html { root /usr/share/nginx/subdomain/www; } diff --git a/build/qa/web-default-conf-cm.yaml b/build/qa/web-default-conf-cm.yaml index 873be7d0..dbc399e7 100644 --- a/build/qa/web-default-conf-cm.yaml +++ b/build/qa/web-default-conf-cm.yaml @@ -87,12 +87,6 @@ data: #Cache everything by default set $no_cache 0; - error_page 404 /404.html; - location = /404.html { - root /usr/share/nginx/subdomain/$subdomain; - add_header Cache-Control "no-cache" always; - } - #Don't cache POST requests if ($request_method = POST) { @@ -141,8 +135,8 @@ data: # redirect server error pages to the static page /50x.html # - error_page 500 502 503 504 /50x.html; - location = /50x.html { + error_page 500 502 503 504 /500.html; + location = /500.html { root /usr/share/nginx/subdomain/$subdomain; add_header Cache-Control "no-cache" always; } @@ -264,8 +258,8 @@ data: # redirect server error pages to the static page /50x.html # - error_page 500 502 503 504 /50x.html; - location = /50x.html { + error_page 500 502 503 504 /500.html; + location = /500.html { root /usr/share/nginx/subdomain/www; } diff --git a/build/stage/web-default-conf-cm.yaml b/build/stage/web-default-conf-cm.yaml index 38f93c60..f292a611 100644 --- a/build/stage/web-default-conf-cm.yaml +++ b/build/stage/web-default-conf-cm.yaml @@ -86,12 +86,6 @@ data: #Cache everything by default set $no_cache 0; - - error_page 404 /404.html; - location = /404.html { - root /usr/share/nginx/subdomain/$subdomain; - add_header Cache-Control "no-cache" always; - } #Don't cache POST requests if ($request_method = POST) @@ -141,8 +135,8 @@ data: # redirect server error pages to the static page /50x.html # - error_page 500 502 503 504 /50x.html; - location = /50x.html { + error_page 500 502 503 504 /500.html; + location = /500.html { root /usr/share/nginx/subdomain/$subdomain; add_header Cache-Control "no-cache" always; } @@ -263,8 +257,8 @@ data: # redirect server error pages to the static page /50x.html # - error_page 500 502 503 504 /50x.html; - location = /50x.html { + error_page 500 502 503 504 /500.html; + location = /500.html { root /usr/share/nginx/subdomain/www; } diff --git a/wp/403.html b/wp/403.html deleted file mode 100644 index 471bb295..00000000 --- a/wp/403.html +++ /dev/null @@ -1 +0,0 @@ -No Access !! diff --git a/wp/404.html b/wp/404.html deleted file mode 100644 index f242d3a4..00000000 --- a/wp/404.html +++ /dev/null @@ -1,642 +0,0 @@ - - - - - - -Page not found | Medical Alert - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
- - - - -
-
- - -
- - -

Questions? Call Now: 800-800-2537

-
-
- - -
- - -
- - - - -
-
- - - -
- - -
- - -
-
-
-
-
- -
-
-

Oops! That page can’t be found.

-
- -
-

It looks like nothing was found at this location. Try one of the links below or call us at 1-800-800-2537.

-

Medical Alert Home Page

-

How a Medical Alert System Works

-

Order a Medical Alert System

- - - -
-
- -
-
-
-
-
-
- - - - -
-
- - -
- - -

Products

-
-
-
- - -
- - -

Support

-
-
-
- - -
- - -

About Us

-
-
-
- - -
- - -
- - - - -
-
- - -
- - -

*Disclaimer: Promotional pricing is only available for new customers. Customers will be charged the regular monthly fee after the promotional period ends. The promotional period is defined as the first billing cycle after the initial payment. Additional fees may apply for added features. Prices may vary outside the U.S. Free shipping offer available only on semi-annual and annual plans. Free lockbox offer available only on annual plans. Protection plan covers a one (1) time replacement of your main system and up to two (2) buttons due to loss or damage during any 12-month period. Fall Detection does not detect 100% of all falls. Users should always push their button when they need help. Pendant coverage is subject to device location, environment, equipment and facility conditions. Help buttons are waterproof up to one meter of water for 30 minutes. Mobile system speaker units are water-resistant. Refer to instructions for use for more details.

-
-
- - -
- - -
- - - - -
-
- - -
    - - -
    • -
-
- - -
- - - - -medical-alert-wt-300 - - -
-
- - -
- - -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - \ No newline at end of file diff --git a/wp/500.html b/wp/500.html new file mode 100644 index 00000000..36dfc1a7 --- /dev/null +++ b/wp/500.html @@ -0,0 +1,857 @@ + + + + + + + + + Unable to Process Request + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+

Questions? Call Now: + 800-800-2537 + +

+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+
+
+
+
+
+

Unable to Process Request

+

Sorry, we've encountered an unexpected error while processing your request.

+
+
+ +
+
+

This may be a temporary issue caused by high traffic, maintenance, or a technical challenge on our end.

+
+ Home +

If you continue to experience this issue or have any questions, please call us at 800-800-2537.

+
+ +
+ +
+ +
+ +
+ + +
+ +
+ +
+ +
+ +
+
+ +
+
+
+
+
+
+
+

Products

+ +
+
+ +
+ +
+
+
+

Support

+ +
+
+ +
+ +
+
+
+

About Us

+ +
+
+ +
+ +
+ +
+ +
+
+
+
+
+

*Disclaimer: Promotional pricing is only available for new customers. Customers will be charged the regular monthly fee after the promotional period ends. The promotional period is defined as the first billing cycle after the initial payment. Additional fees may apply for added features. Prices may vary outside the U.S. Free shipping offer available only on semi-annual and annual plans. Free lockbox offer available only on annual plans. Protection plan covers a one (1) time replacement of your main system and up to two (2) buttons due to loss or damage during any 12-month period. Fall Detection does not detect 100% of all falls. Users should always push their button when they need help. Pendant coverage is subject to device location, environment, equipment and facility conditions. Help buttons are waterproof up to one meter of water for 30 minutes. Mobile system speaker units are water-resistant. Refer to instructions for use for more details.

+
+
+ +
+ +
+ +
+ +
+
+
+
    + +
  • + + +
    • +
  • + + +
    • +
+ +
+ +
+
+ + + + + medical-alert-wt-300 + + + +
+
+ +
+ +
+ + + +
+ +
+ +
+ + + + + + \ No newline at end of file diff --git a/wp/wp-content/themes/child-theme/404.php b/wp/wp-content/themes/child-theme/404.php new file mode 100644 index 00000000..f9aa1af6 --- /dev/null +++ b/wp/wp-content/themes/child-theme/404.php @@ -0,0 +1,53 @@ + + +
+
+
+
+
+
+
+

Page Not Found

+

Sorry, the page you are looking for cannot be found.

+
+
+
+

The link you followed may be broken or the page may have been removed.

+

Need further assistance? Call us at

+ Home +
+
+
+
+
+
+
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/wp/wp-content/themes/thbusiness/404.php b/wp/wp-content/themes/thbusiness/404.php deleted file mode 100644 index 3c12f03e..00000000 --- a/wp/wp-content/themes/thbusiness/404.php +++ /dev/null @@ -1,32 +0,0 @@ - -
-
-
- -
-
-

Oops! That page can’t be found.

-
- -
-

It looks like nothing was found at this location. Try one of the links below or call us at 1-800-800-2537.

-

Medical Alert Home Page

-

How a Medical Alert System Works

-

Order a Medical Alert System

- - - -
-
- -
-
-
-