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
dbe74ea3
Commit
dbe74ea3
authored
Aug 07, 2015
by
Christina Roberts
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9221 from edx/christina/less-assets
Christina/less assets
parents
32b0dc19
fd31c684
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
38 additions
and
35 deletions
+38
-35
lms/djangoapps/branding/__init__.py
+4
-9
lms/djangoapps/student_account/views.py
+1
-0
lms/djangoapps/student_profile/views.py
+2
-1
lms/djangoapps/teams/views.py
+2
-1
lms/envs/common.py
+27
-16
lms/templates/discussion/_js_head_dependencies.html
+2
-8
No files found.
lms/djangoapps/branding/__init__.py
View file @
dbe74ea3
...
@@ -4,6 +4,7 @@ from django.conf import settings
...
@@ -4,6 +4,7 @@ from django.conf import settings
from
opaque_keys.edx.locations
import
SlashSeparatedCourseKey
from
opaque_keys.edx.locations
import
SlashSeparatedCourseKey
from
microsite_configuration
import
microsite
from
microsite_configuration
import
microsite
from
staticfiles.storage
import
staticfiles_storage
def
get_visible_courses
():
def
get_visible_courses
():
...
@@ -65,14 +66,8 @@ def get_logo_url():
...
@@ -65,14 +66,8 @@ def get_logo_url():
university
=
microsite
.
get_value
(
'university'
)
university
=
microsite
.
get_value
(
'university'
)
if
university
is
None
and
settings
.
FEATURES
.
get
(
'IS_EDX_DOMAIN'
,
False
):
if
university
is
None
and
settings
.
FEATURES
.
get
(
'IS_EDX_DOMAIN'
,
False
):
return
'{static_url}images/edx-theme/edx-logo-77x36.png'
.
format
(
return
staticfiles_storage
.
url
(
'images/edx-theme/edx-logo-77x36.png'
)
static_url
=
settings
.
STATIC_URL
)
elif
university
:
elif
university
:
return
'{static_url}images/{uni}-on-edx-logo.png'
.
format
(
return
staticfiles_storage
.
url
(
'images/{uni}-on-edx-logo.png'
.
format
(
uni
=
university
))
static_url
=
settings
.
STATIC_URL
,
uni
=
university
)
else
:
else
:
return
'{static_url}images/default-theme/logo.png'
.
format
(
return
staticfiles_storage
.
url
(
'images/default-theme/logo.png'
)
static_url
=
settings
.
STATIC_URL
)
lms/djangoapps/student_account/views.py
View file @
dbe74ea3
...
@@ -381,6 +381,7 @@ def account_settings_context(request):
...
@@ -381,6 +381,7 @@ def account_settings_context(request):
'platform_name'
:
settings
.
PLATFORM_NAME
,
'platform_name'
:
settings
.
PLATFORM_NAME
,
'user_accounts_api_url'
:
reverse
(
"accounts_api"
,
kwargs
=
{
'username'
:
user
.
username
}),
'user_accounts_api_url'
:
reverse
(
"accounts_api"
,
kwargs
=
{
'username'
:
user
.
username
}),
'user_preferences_api_url'
:
reverse
(
'preferences_api'
,
kwargs
=
{
'username'
:
user
.
username
}),
'user_preferences_api_url'
:
reverse
(
'preferences_api'
,
kwargs
=
{
'username'
:
user
.
username
}),
'disable_courseware_js'
:
True
,
}
}
if
third_party_auth
.
is_enabled
():
if
third_party_auth
.
is_enabled
():
...
...
lms/djangoapps/student_profile/views.py
View file @
dbe74ea3
...
@@ -92,6 +92,7 @@ def learner_profile_context(logged_in_user, profile_username, user_is_staff, bui
...
@@ -92,6 +92,7 @@ def learner_profile_context(logged_in_user, profile_username, user_is_staff, bui
'country_options'
:
list
(
countries
),
'country_options'
:
list
(
countries
),
'language_options'
:
settings
.
ALL_LANGUAGES
,
'language_options'
:
settings
.
ALL_LANGUAGES
,
'platform_name'
:
microsite
.
get_value
(
'platform_name'
,
settings
.
PLATFORM_NAME
),
'platform_name'
:
microsite
.
get_value
(
'platform_name'
,
settings
.
PLATFORM_NAME
),
}
},
'disable_courseware_js'
:
True
,
}
}
return
context
return
context
lms/djangoapps/teams/views.py
View file @
dbe74ea3
...
@@ -102,7 +102,8 @@ class TeamsDashboardView(View):
...
@@ -102,7 +102,8 @@ class TeamsDashboardView(View):
"languages"
:
settings
.
ALL_LANGUAGES
,
"languages"
:
settings
.
ALL_LANGUAGES
,
"countries"
:
list
(
countries
),
"countries"
:
list
(
countries
),
"username"
:
user
.
username
,
"username"
:
user
.
username
,
"privileged"
:
has_discussion_privileges
(
user
,
course_key
)
"privileged"
:
has_discussion_privileges
(
user
,
course_key
),
"disable_courseware_js"
:
True
,
}
}
return
render_to_response
(
"teams/teams.html"
,
context
)
return
render_to_response
(
"teams/teams.html"
,
context
)
...
...
lms/envs/common.py
View file @
dbe74ea3
...
@@ -1248,12 +1248,34 @@ main_vendor_js = base_vendor_js + [
...
@@ -1248,12 +1248,34 @@ main_vendor_js = base_vendor_js + [
base_application_js
=
[
base_application_js
=
[
'js/src/utility.js'
,
'js/src/utility.js'
,
'js/src/logger.js'
,
'js/src/logger.js'
,
'js/my_courses_dropdown.js'
,
'js/src/string_utils.js'
,
'js/form.ext.js'
,
'js/src/ie_shim.js'
,
'js/src/accessibility_tools.js'
,
]
]
dashboard_js
=
(
dashboard_js
=
(
sorted
(
rooted_glob
(
PROJECT_ROOT
/
'static'
,
'js/dashboard/**/*.js'
))
sorted
(
rooted_glob
(
PROJECT_ROOT
/
'static'
,
'js/dashboard/**/*.js'
))
)
)
discussion_js
=
sorted
(
rooted_glob
(
COMMON_ROOT
/
'static'
,
'coffee/src/discussion/**/*.js'
))
discussion_js
=
(
rooted_glob
(
PROJECT_ROOT
/
'static'
,
'coffee/src/customwmd.js'
)
+
rooted_glob
(
PROJECT_ROOT
/
'static'
,
'coffee/src/mathjax_accessible.js'
)
+
rooted_glob
(
PROJECT_ROOT
/
'static'
,
'coffee/src/mathjax_delay_renderer.js'
)
+
sorted
(
rooted_glob
(
COMMON_ROOT
/
'static'
,
'coffee/src/discussion/**/*.js'
))
)
discussion_vendor_js
=
[
'js/Markdown.Converter.js'
,
'js/Markdown.Sanitizer.js'
,
'js/Markdown.Editor.js'
,
'js/vendor/jquery.timeago.js'
,
'js/src/jquery.timeago.locale.js'
,
'js/vendor/jquery.truncate.js'
,
'js/jquery.ajaxfileupload.js'
,
'js/split.js'
]
staff_grading_js
=
sorted
(
rooted_glob
(
PROJECT_ROOT
/
'static'
,
'coffee/src/staff_grading/**/*.js'
))
staff_grading_js
=
sorted
(
rooted_glob
(
PROJECT_ROOT
/
'static'
,
'coffee/src/staff_grading/**/*.js'
))
open_ended_js
=
sorted
(
rooted_glob
(
PROJECT_ROOT
/
'static'
,
'coffee/src/open_ended/**/*.js'
))
open_ended_js
=
sorted
(
rooted_glob
(
PROJECT_ROOT
/
'static'
,
'coffee/src/open_ended/**/*.js'
))
notes_js
=
sorted
(
rooted_glob
(
PROJECT_ROOT
/
'static'
,
'coffee/src/notes/**/*.js'
))
notes_js
=
sorted
(
rooted_glob
(
PROJECT_ROOT
/
'static'
,
'coffee/src/notes/**/*.js'
))
...
@@ -1267,14 +1289,9 @@ instructor_dash_js = (
...
@@ -1267,14 +1289,9 @@ instructor_dash_js = (
# JavaScript modules.
# JavaScript modules.
student_account_js
=
[
student_account_js
=
[
'js/utils/edx.utils.validate.js'
,
'js/utils/edx.utils.validate.js'
,
'js/form.ext.js'
,
'js/my_courses_dropdown.js'
,
'js/toggle_login_modal.js'
,
'js/toggle_login_modal.js'
,
'js/sticky_filter.js'
,
'js/sticky_filter.js'
,
'js/query-params.js'
,
'js/query-params.js'
,
'js/src/accessibility_tools.js'
,
'js/src/ie_shim.js'
,
'js/src/string_utils.js'
,
'js/student_account/models/LoginModel.js'
,
'js/student_account/models/LoginModel.js'
,
'js/student_account/models/RegisterModel.js'
,
'js/student_account/models/RegisterModel.js'
,
'js/student_account/models/PasswordResetModel.js'
,
'js/student_account/models/PasswordResetModel.js'
,
...
@@ -1289,14 +1306,9 @@ student_account_js = [
...
@@ -1289,14 +1306,9 @@ student_account_js = [
]
]
verify_student_js
=
[
verify_student_js
=
[
'js/form.ext.js'
,
'js/my_courses_dropdown.js'
,
'js/toggle_login_modal.js'
,
'js/toggle_login_modal.js'
,
'js/sticky_filter.js'
,
'js/sticky_filter.js'
,
'js/query-params.js'
,
'js/query-params.js'
,
'js/src/accessibility_tools.js'
,
'js/src/ie_shim.js'
,
'js/src/string_utils.js'
,
'js/verify_student/models/verification_model.js'
,
'js/verify_student/models/verification_model.js'
,
'js/verify_student/views/error_view.js'
,
'js/verify_student/views/error_view.js'
,
'js/verify_student/views/image_input_view.js'
,
'js/verify_student/views/image_input_view.js'
,
...
@@ -1487,14 +1499,9 @@ PIPELINE_JS = {
...
@@ -1487,14 +1499,9 @@ PIPELINE_JS = {
# Application will contain all paths not in courseware_only_js
# Application will contain all paths not in courseware_only_js
'source_filenames'
:
[
'js/xblock/core.js'
]
+
sorted
(
common_js
)
+
sorted
(
project_js
)
+
base_application_js
+
[
'source_filenames'
:
[
'js/xblock/core.js'
]
+
sorted
(
common_js
)
+
sorted
(
project_js
)
+
base_application_js
+
[
'js/form.ext.js'
,
'js/my_courses_dropdown.js'
,
'js/toggle_login_modal.js'
,
'js/toggle_login_modal.js'
,
'js/sticky_filter.js'
,
'js/sticky_filter.js'
,
'js/query-params.js'
,
'js/query-params.js'
,
'js/src/accessibility_tools.js'
,
'js/src/ie_shim.js'
,
'js/src/string_utils.js'
,
],
],
'output_filename'
:
'js/lms-application.js'
,
'output_filename'
:
'js/lms-application.js'
,
},
},
...
@@ -1522,6 +1529,10 @@ PIPELINE_JS = {
...
@@ -1522,6 +1529,10 @@ PIPELINE_JS = {
'source_filenames'
:
discussion_js
,
'source_filenames'
:
discussion_js
,
'output_filename'
:
'js/discussion.js'
,
'output_filename'
:
'js/discussion.js'
,
},
},
'discussion_vendor'
:
{
'source_filenames'
:
discussion_vendor_js
,
'output_filename'
:
'js/discussion_vendor.js'
,
},
'staff_grading'
:
{
'staff_grading'
:
{
'source_filenames'
:
staff_grading_js
,
'source_filenames'
:
staff_grading_js
,
'output_filename'
:
'js/staff_grading.js'
,
'output_filename'
:
'js/staff_grading.js'
,
...
...
lms/templates/discussion/_js_head_dependencies.html
View file @
dbe74ea3
<
%
namespace
name=
'static'
file=
'../static_content.html'
/>
<
%
namespace
name=
'static'
file=
'../static_content.html'
/>
<script
type=
"text/javascript"
src=
"${static.url('js/split.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/vendor/jquery.truncate.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/jquery.ajaxfileupload.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/Markdown.Converter.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/Markdown.Sanitizer.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/Markdown.Editor.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/jquery.autocomplete.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/jquery.autocomplete.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/vendor/jquery.timeago.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/src/jquery.timeago.locale.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/src/tooltip_manager.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/src/tooltip_manager.js')}"
></script>
<
%
static:js
group=
'discussion_vendor'
/>
<link
href=
"${static.url('css/vendor/jquery.autocomplete.css')}"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"${static.url('css/vendor/jquery.autocomplete.css')}"
rel=
"stylesheet"
type=
"text/css"
>
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