Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
fb4cab43
Commit
fb4cab43
authored
Apr 30, 2014
by
Frances Botsford
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for Studio 404 and 500 page layouts
STUD-864
parent
2d7d3bf2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
21 deletions
+29
-21
cms/static/sass/elements/_header.scss
+2
-1
cms/static/sass/views/_account.scss
+3
-1
cms/templates/404.html
+9
-6
cms/templates/500.html
+15
-13
No files found.
cms/static/sass/elements/_header.scss
View file @
fb4cab43
...
@@ -280,7 +280,8 @@
...
@@ -280,7 +280,8 @@
// ====================
// ====================
// CASE: user not signed in
// CASE: user not signed in
.not-signedin
{
.not-signedin
,
.view-util
{
.wrapper-header
{
.wrapper-header
{
...
...
cms/static/sass/views/_account.scss
View file @
fb4cab43
// studio - views - sign up/in
// studio - views - sign up/in
// ====================
// ====================
.view-signup
,
.view-signin
{
.view-signup
,
.view-signin
,
.view-util
{
.wrapper-content
{
.wrapper-content
{
margin
:
(
$baseline
*
1
.5
)
0
0
0
;
margin
:
(
$baseline
*
1
.5
)
0
0
0
;
...
...
cms/templates/404.html
View file @
fb4cab43
<
%!
from
django
.
utils
.
translation
import
ugettext
as
_
%
>
<
%!
from
django
.
utils
.
translation
import
ugettext
as
_
%
>
<
%
inherit
file=
"base.html"
/>
<
%
inherit
file=
"base.html"
/>
<
%
block
name=
"title"
>
${_("Page Not Found")}
</
%
block>
<
%
block
name=
"title"
>
${_("Page Not Found")}
</
%
block>
<
%
block
name=
"bodyclass"
>
view-util util-404
</
%
block>
<
%
block
name=
"content"
>
<
%
block
name=
"content"
>
<div
class=
"wrapper-content wrapper"
>
<div
class=
"wrapper-content wrapper"
>
<section
class=
"content"
>
<section
class=
"content"
>
<header>
<h1>
${_("Page not found")}
</h1>
<h1
class=
"title title-1"
>
${_("Page not found")}
</h1>
<p>
${_('The page that you were looking for was not found.')}
</header>
<article
class=
"content-primary"
role=
"main"
>
<p>
${_('The page that you were looking for was not found.')}
${_('Go back to the {homepage} or let us know about any pages that may have been moved at {email}.').format(
${_('Go back to the {homepage} or let us know about any pages that may have been moved at {email}.').format(
homepage='
<a
href=
"/"
>
homepage
</a>
',
homepage='
<a
href=
"/"
>
homepage
</a>
',
email=u'
<a
href=
"mailto:{address}"
>
{address}
</a>
'.format(
email=u'
<a
href=
"mailto:{address}"
>
{address}
</a>
'.format(
address=settings.TECH_SUPPORT_EMAIL,
address=settings.TECH_SUPPORT_EMAIL,
))}
))}
</p>
</p>
</article>
</section>
</section>
</div>
</div>
</
%
block>
</
%
block>
cms/templates/500.html
View file @
fb4cab43
<
%!
from
django
.
utils
.
translation
import
ugettext
as
_
%
>
<
%!
from
django
.
utils
.
translation
import
ugettext
as
_
%
>
<
%
inherit
file=
"base.html"
/>
<
%
inherit
file=
"base.html"
/>
<
%
block
name=
"title"
>
${_("Studio Server Error")}
</
%
block>
<
%
block
name=
"title"
>
${_("Studio Server Error")}
</
%
block>
<
%
block
name=
"bodyclass"
>
view-util util-500
</
%
block>
<
%
block
name=
"content"
>
<
%
block
name=
"content"
>
<div
class=
"wrapper-content wrapper"
>
<div
class=
"wrapper-content wrapper"
>
<section
class=
"content"
>
<section
class=
"content"
>
<h1>
${_("The
<em>
Studio
</em>
servers encountered an error")}
</h1>
<header>
<p>
<h1
class=
"title title-1"
>
${_("The
<em>
Studio
</em>
servers encountered an error")}
</h1>
${_("An error occurred in Studio and the page could not be loaded. Please try again in a few moments.")}
</header>
${_("We've logged the error and our staff is currently working to resolve this error as soon as possible.")}
<article
class=
"content-primary"
role=
"main"
>
${_('If the problem persists, please email us at {email_link}.').format(
<p>
email_link=u'
<a
href=
"mailto:{email_address}"
>
{email_address}
</a>
'.format(
${_("An error occurred in Studio and the page could not be loaded. Please try again in a few moments.")}
email_address=settings.TECH_SUPPORT_EMAIL,
${_("We've logged the error and our staff is currently working to resolve this error as soon as possible.")}
)
${_('If the problem persists, please email us at {email_link}.').format(
)}
email_link=u'
<a
href=
"mailto:{email_address}"
>
{email_address}
</a>
'.format(
</p>
email_address=settings.TECH_SUPPORT_EMAIL,
)
)}
</p>
</article>
</section>
</section>
</div>
</div>
</
%
block>
</
%
block>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment