Skip to content

Package the instructor dash javascript separately #1549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sarina merged 1 commit into from
Oct 31, 2013
Merged

Package the instructor dash javascript separately #1549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions lms/envs/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

# We intentionally define lots of variables that aren't used, and
# want to import all variables from base settings files
# pylint: disable=W0401, W0611, W0614
# pylint: disable=W0401, W0611, W0614, C0103

import sys
import os
Expand Down Expand Up @@ -174,7 +174,7 @@
'ENABLE_CHAT': False,

# Allow users to enroll with methods other than just honor code certificates
'MULTIPLE_ENROLLMENT_ROLES' : False,
'MULTIPLE_ENROLLMENT_ROLES': False,

# Toggle the availability of the shopping cart page
'ENABLE_SHOPPING_CART': False,
Expand Down Expand Up @@ -222,10 +222,11 @@

system_node_path = os.environ.get("NODE_PATH", REPO_ROOT / 'node_modules')

node_paths = [COMMON_ROOT / "static/js/vendor",
COMMON_ROOT / "static/coffee/src",
system_node_path
]
node_paths = [
COMMON_ROOT / "static/js/vendor",
COMMON_ROOT / "static/coffee/src",
system_node_path,
]
NODE_PATH = ':'.join(node_paths)


Expand Down Expand Up @@ -648,10 +649,11 @@
'js/vendor/annotator.tags.min.js'
]

discussion_js = sorted(rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/discussion/**/*.js'))
discussion_js = sorted(rooted_glob(COMMON_ROOT / 'static', 'coffee/src/discussion/**/*.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'))
notes_js = sorted(rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/notes/**/*.coffee'))
notes_js = ['coffee/src/notes.js']
instructor_dash_js = sorted(rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/instructor_dashboard/**/*.js'))

PIPELINE_CSS = {
'style-vendor': {
Expand Down Expand Up @@ -710,7 +712,7 @@
'source_filenames': sorted(
set(rooted_glob(COMMON_ROOT / 'static', 'coffee/src/**/*.js') +
rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/**/*.js')) -
set(courseware_js + discussion_js + staff_grading_js + open_ended_js + notes_js)
set(courseware_js + discussion_js + staff_grading_js + open_ended_js + notes_js + instructor_dash_js)
) + [
'js/form.ext.js',
'js/my_courses_dropdown.js',
Expand Down Expand Up @@ -764,6 +766,11 @@
'output_filename': 'js/notes.js',
'test_order': 7
},
'instructor_dash': {
'source_filenames': instructor_dash_js,
'output_filename': 'js/instructor_dash.js',
'test_order': 9,
},
}

PIPELINE_DISABLE_WRAPPER = True
Expand Down Expand Up @@ -990,7 +997,7 @@
'PRIVACY': 'privacy_edx',

# Verified Certificates
'WHAT_IS_VERIFIED_CERT' : 'verified-certificate',
'WHAT_IS_VERIFIED_CERT': 'verified-certificate',
}


Expand Down Expand Up @@ -1023,7 +1030,7 @@ def enable_theme(theme_name):

################# Student Verification #################
VERIFY_STUDENT = {
"DAYS_GOOD_FOR" : 365, # How many days is a verficiation good for?
"DAYS_GOOD_FOR": 365, # How many days is a verficiation good for?
}

######################## CAS authentication ###########################
Expand Down
1 change: 1 addition & 0 deletions lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<script type="text/javascript" src="${static.url('js/vendor/tiny_mce/tiny_mce.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/tiny_mce/jquery.tinymce.js')}"></script>
<%static:js group='module-descriptor-js'/>
<%static:js group='instructor_dash'/>
</%block>

## NOTE that instructor is set as the active page so that the instructor button lights up, even though this is the instructor_2 page.
Expand Down