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
4bb79a43
Commit
4bb79a43
authored
Oct 19, 2012
by
Bridger Maxwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More template cleanup.
parent
84fb6459
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
8 additions
and
8 deletions
+8
-8
common/djangoapps/external_auth/views.py
+1
-1
common/djangoapps/student/views.py
+2
-2
lms/djangoapps/courseware/views.py
+1
-1
lms/lib/dogfood/views.py
+3
-3
lms/templates/courseware/notifications.html
+0
-0
lms/templates/dogfood/dogfood.html
+0
-0
lms/templates/dogfood/quickedit.html
+0
-0
lms/templates/extauth/gitupdate.html
+0
-0
lms/templates/extauth/xrds.xml
+0
-0
lms/templates/portal/course_about.html
+1
-1
lms/templates/portal/feed.rss
+0
-0
lms/templates/portal/press.json
+0
-0
No files found.
common/djangoapps/external_auth/views.py
View file @
4bb79a43
...
@@ -547,7 +547,7 @@ def provider_xrds(request):
...
@@ -547,7 +547,7 @@ def provider_xrds(request):
XRDS for endpoint discovery
XRDS for endpoint discovery
"""
"""
response
=
render_to_response
(
'xrds.xml'
,
response
=
render_to_response
(
'
extauth/
xrds.xml'
,
{
'url'
:
get_xrds_url
(
'login'
,
request
)},
{
'url'
:
get_xrds_url
(
'login'
,
request
)},
mimetype
=
'text/xml'
)
mimetype
=
'text/xml'
)
...
...
common/djangoapps/student/views.py
View file @
4bb79a43
...
@@ -68,7 +68,7 @@ def index(request, extra_context={}, user=None):
...
@@ -68,7 +68,7 @@ def index(request, extra_context={}, user=None):
if
hasattr
(
settings
,
'RSS_URL'
):
if
hasattr
(
settings
,
'RSS_URL'
):
feed_data
=
urllib
.
urlopen
(
settings
.
RSS_URL
)
.
read
()
feed_data
=
urllib
.
urlopen
(
settings
.
RSS_URL
)
.
read
()
else
:
else
:
feed_data
=
render_to_string
(
"feed.rss"
,
None
)
feed_data
=
render_to_string
(
"
portal/
feed.rss"
,
None
)
cache
.
set
(
"students_index_rss_feed_data"
,
feed_data
,
settings
.
RSS_TIMEOUT
)
cache
.
set
(
"students_index_rss_feed_data"
,
feed_data
,
settings
.
RSS_TIMEOUT
)
feed
=
feedparser
.
parse
(
feed_data
)
feed
=
feedparser
.
parse
(
feed_data
)
...
@@ -101,7 +101,7 @@ def press(request):
...
@@ -101,7 +101,7 @@ def press(request):
content
=
urllib
.
urlopen
(
settings
.
PRESS_URL
)
.
read
()
content
=
urllib
.
urlopen
(
settings
.
PRESS_URL
)
.
read
()
json_articles
=
json
.
loads
(
content
)
json_articles
=
json
.
loads
(
content
)
else
:
else
:
content
=
open
(
settings
.
PROJECT_ROOT
/
"templates"
/
"press.json"
)
.
read
()
content
=
open
(
settings
.
PROJECT_ROOT
/
"templates"
/
"p
ortal/p
ress.json"
)
.
read
()
json_articles
=
json
.
loads
(
content
)
json_articles
=
json
.
loads
(
content
)
cache
.
set
(
"student_press_json_articles"
,
json_articles
)
cache
.
set
(
"student_press_json_articles"
,
json_articles
)
articles
=
[
Article
(
**
article
)
for
article
in
json_articles
]
articles
=
[
Article
(
**
article
)
for
article
in
json_articles
]
...
...
lms/djangoapps/courseware/views.py
View file @
4bb79a43
...
@@ -446,7 +446,7 @@ def render_notifications(request, course, notifications):
...
@@ -446,7 +446,7 @@ def render_notifications(request, course, notifications):
'get_discussion_title'
:
partial
(
get_discussion_title
,
request
=
request
,
course
=
course
),
'get_discussion_title'
:
partial
(
get_discussion_title
,
request
=
request
,
course
=
course
),
'course'
:
course
,
'course'
:
course
,
}
}
return
render_to_string
(
'notifications.html'
,
context
)
return
render_to_string
(
'
courseware/
notifications.html'
,
context
)
@login_required
@login_required
def
news
(
request
,
course_id
):
def
news
(
request
,
course_id
):
...
...
lms/lib/dogfood/views.py
View file @
4bb79a43
...
@@ -142,10 +142,10 @@ def df_capa_problem(request, id=None):
...
@@ -142,10 +142,10 @@ def df_capa_problem(request, id=None):
request
.
session
[
'dogfood_id'
]
=
id
request
.
session
[
'dogfood_id'
]
=
id
# hand over to quickedit to do the rest
# hand over to quickedit to do the rest
return
quickedit
(
request
,
id
=
id
,
qetemplate
=
'dogfood.html'
,
coursename
=
coursename
)
return
quickedit
(
request
,
id
=
id
,
qetemplate
=
'dogfood
/dogfood
.html'
,
coursename
=
coursename
)
def
quickedit
(
request
,
id
=
None
,
qetemplate
=
'quickedit.html'
,
coursename
=
None
):
def
quickedit
(
request
,
id
=
None
,
qetemplate
=
'
dogfood/
quickedit.html'
,
coursename
=
None
):
'''
'''
quick-edit capa problem.
quick-edit capa problem.
...
@@ -321,5 +321,5 @@ def quickedit_git_reload(request):
...
@@ -321,5 +321,5 @@ def quickedit_git_reload(request):
'csrf'
:
csrf
(
request
)[
'csrf_token'
],
'csrf'
:
csrf
(
request
)[
'csrf_token'
],
}
}
result
=
render_to_response
(
"gitupdate.html"
,
context
)
result
=
render_to_response
(
"
dogfood/
gitupdate.html"
,
context
)
return
result
return
result
lms/templates/notifications.html
→
lms/templates/
courseware/
notifications.html
View file @
4bb79a43
File moved
lms/templates/dogfood.html
→
lms/templates/dogfood
/dogfood
.html
View file @
4bb79a43
File moved
lms/templates/quickedit.html
→
lms/templates/
dogfood/
quickedit.html
View file @
4bb79a43
File moved
lms/templates/gitupdate.html
→
lms/templates/
extauth/
gitupdate.html
View file @
4bb79a43
File moved
lms/templates/xrds.xml
→
lms/templates/
extauth/
xrds.xml
View file @
4bb79a43
File moved
lms/templates/portal/course_about.html
View file @
4bb79a43
...
@@ -190,4 +190,4 @@
...
@@ -190,4 +190,4 @@
%endif
%endif
<
%
include
file=
"portal/video_modal.html"
/>
<
%
include
file=
"
/
portal/video_modal.html"
/>
lms/templates/feed.rss
→
lms/templates/
portal/
feed.rss
View file @
4bb79a43
File moved
lms/templates/press.json
→
lms/templates/p
ortal/p
ress.json
View file @
4bb79a43
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