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
d35c2367
Commit
d35c2367
authored
Oct 19, 2012
by
Bridger Maxwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More cleanup of templates directory.
parent
34c9dd93
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
7 additions
and
26 deletions
+7
-26
common/djangoapps/student/views.py
+2
-2
common/templates/module-error.html
+0
-0
common/templates/problem.html
+0
-0
lms/djangoapps/staticbook/views.py
+1
-1
lms/templates/courseware/staticbook.html
+3
-2
lms/templates/emails_change_successful.html
+0
-3
lms/templates/homework.html
+0
-17
lms/templates/portal/course_filter.html
+0
-0
lms/templates/portal/courses.html
+1
-1
lms/templates/portal/email_change_successful.html
+0
-0
lms/templates/portal/email_exists.html
+0
-0
No files found.
common/djangoapps/student/views.py
View file @
d35c2367
...
...
@@ -642,7 +642,7 @@ def confirm_email_change(request, key):
'new_email'
:
pec
.
new_email
}
if
len
(
User
.
objects
.
filter
(
email
=
pec
.
new_email
))
!=
0
:
return
render_to_response
(
"email_exists.html"
,
d
)
return
render_to_response
(
"
portal/
email_exists.html"
,
d
)
subject
=
render_to_string
(
'emails/email_change_subject.txt'
,
d
)
subject
=
''
.
join
(
subject
.
splitlines
())
...
...
@@ -662,7 +662,7 @@ def confirm_email_change(request, key):
# And send it to the new email...
user
.
email_user
(
subject
,
message
,
settings
.
DEFAULT_FROM_EMAIL
)
return
render_to_response
(
"email_change_successful.html"
,
d
)
return
render_to_response
(
"
portal/
email_change_successful.html"
,
d
)
@ensure_csrf_cookie
...
...
lms
/templates/module-error.html
→
common
/templates/module-error.html
View file @
d35c2367
File moved
lms
/templates/problem.html
→
common
/templates/problem.html
View file @
d35c2367
File moved
lms/djangoapps/staticbook/views.py
View file @
d35c2367
...
...
@@ -18,7 +18,7 @@ def index(request, course_id, book_index, page=None):
if
page
is
None
:
page
=
textbook
.
start_page
return
render_to_response
(
'staticbook.html'
,
return
render_to_response
(
'
courseware/
staticbook.html'
,
{
'book_index'
:
book_index
,
'page'
:
int
(
page
),
'course'
:
course
,
'book_url'
:
textbook
.
book_url
,
'table_of_contents'
:
table_of_contents
,
...
...
lms/templates/staticbook.html
→
lms/templates/
courseware/
staticbook.html
View file @
d35c2367
<
%
inherit
file=
"main.html"
/>
<
%
namespace
name=
'static'
file=
'static_content.html'
/>
## mako
<
%
inherit
file=
"../main.html"
/>
<
%
namespace
name=
'static'
file=
'../static_content.html'
/>
<
%
block
name=
"title"
><title>
${course.number} Textbook
</title></
%
block>
<
%
block
name=
"headextra"
>
...
...
lms/templates/emails_change_successful.html
deleted
100644 → 0
View file @
34c9dd93
<h1>
E-mail change successful!
</h1>
<p>
You should see your new name in your profile.
lms/templates/homework.html
deleted
100644 → 0
View file @
34c9dd93
<h1>
${ homework['name']} Test
</h1>
<ol>
% for problem in homework['problems']:
<li>
<h2>
${ problem['name'] }
</h2>
${ problem['html'] }
<section>
<input
type=
"hidden"
name=
"problem_id"
value=
"${ problem['name'] }"
>
<input
type=
"submit"
value=
"Check"
>
</section>
</li>
% endfor
</ol>
lms/templates/course_filter.html
→
lms/templates/
portal/
course_filter.html
View file @
d35c2367
File moved
lms/templates/portal/courses.html
View file @
d35c2367
...
...
@@ -19,7 +19,7 @@
<section
class=
"container"
>
## I'm removing this for now since we aren't using it for the fall.
##
<
%
include
file=
"course_filter.html"
/>
##
<
%
include
file=
"
/portal/
course_filter.html"
/>
<section
class=
"courses"
>
<section
class=
'university-column'
>
%for course in universities['MITx']:
...
...
lms/templates/email_change_successful.html
→
lms/templates/
portal/
email_change_successful.html
View file @
d35c2367
File moved
lms/templates/email_exists.html
→
lms/templates/
portal/
email_exists.html
View file @
d35c2367
File moved
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