From d66cfcfe46ccd3ed01439fa368c8d283662d5216 Mon Sep 17 00:00:00 2001
From: Ahtisham Shahid
Date: Thu, 28 May 2020 13:26:38 +0500
Subject: [PATCH] updated cms pages
---
cms/templates/404.html | 5 +----
cms/templates/500.html | 4 ----
cms/templates/error.html | 15 +++------------
3 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/cms/templates/404.html b/cms/templates/404.html
index e1ad0ac38b..582c6f66eb 100644
--- a/cms/templates/404.html
+++ b/cms/templates/404.html
@@ -17,11 +17,8 @@ from openedx.core.djangolib.markup import HTML, Text
${_('The page that you were looking for was not found.')}
- ${Text(_('Go back to the {homepage} or let us know about any pages that may have been moved at {email}.')).format(
+ ${Text(_('Go back to the {homepage}.')).format(
homepage=HTML('homepage'),
- email=HTML('{address}').format(
- address=Text(settings.TECH_SUPPORT_EMAIL)
- )
)}
diff --git a/cms/templates/500.html b/cms/templates/500.html
index bdebc79c13..ea99d6d036 100644
--- a/cms/templates/500.html
+++ b/cms/templates/500.html
@@ -29,10 +29,6 @@ ${Text(_("{studio_name} Server Error")).format(
studio_name=Text(settings.STUDIO_SHORT_NAME),
)}
${_("We've logged the error and our staff is currently working to resolve this error as soon as possible.")}
- ${Text(_(u'If the problem persists, please email us at {email_link}.')).format(
- email_link=HTML(u'{email_address}').format(
- email_address=Text(settings.TECH_SUPPORT_EMAIL),
- )
)}
diff --git a/cms/templates/error.html b/cms/templates/error.html
index 25aed65f88..30ec62df8f 100644
--- a/cms/templates/error.html
+++ b/cms/templates/error.html
@@ -14,26 +14,17 @@ from django.conf import settings
% endif
%block>
-<%!
-help_link_start = ''.format(email=settings.TECH_SUPPORT_EMAIL)
-help_link_end = ''
-%>
-
<%block name="content">
% if error == '404':
${_("The Page You Requested Page Cannot be Found")}
- ${Text(_("We're sorry. We couldn't find the {studio_name} page you're looking for. You may want to return to the {studio_name} Dashboard and try again. If you are still having problems accessing things, please feel free to {link_start}contact {studio_name} support{link_end} for further help.")).format(
- studio_name=settings.STUDIO_SHORT_NAME,
- link_start=HTML(help_link_start),
- link_end=HTML(help_link_end),
+
${Text(_("We're sorry. We couldn't find the {studio_name} page you're looking for. You may want to return to the {studio_name} Dashboard and try again.")).format(
+ studio_name=settings.STUDIO_SHORT_NAME
)}
% elif error == '500':
${_("The Server Encountered an Error")}
- ${Text(_("We're sorry. There was a problem with the server while trying to process your last request. You may want to return to the {studio_name} Dashboard or try this request again. If you are still having problems accessing things, please feel free to {link_start}contact {studio_name} support{link_end} for further help.")).format(
+
${Text(_("We're sorry. There was a problem with the server while trying to process your last request. You may want to return to the {studio_name} Dashboard or try this request again.")).format(
studio_name=settings.STUDIO_SHORT_NAME,
- link_start=HTML(help_link_start),
- link_end=HTML(help_link_end),
)}
% endif
${_("Back to dashboard")}