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
0ddc3a65
Commit
0ddc3a65
authored
Feb 21, 2014
by
cahrens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes to support Bulk e-mail usage.
parent
2ae2ec94
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
common/lib/xmodule/xmodule/js/src/html/edit.coffee
+3
-0
lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
+2
-2
No files found.
common/lib/xmodule/xmodule/js/src/html/edit.coffee
View file @
0ddc3a65
...
...
@@ -19,6 +19,9 @@ class @HTMLEditingDescriptor
# This is a workaround for the fact that tinyMCE's baseURL property is not getting correctly set on AWS
# instances (like sandbox). It is not necessary to explicitly set baseURL when running locally.
tinyMCE
.
baseURL
=
"
#{
baseUrl
}
/js/vendor/tiny_mce"
# This is necessary for the LMS bulk e-mail acceptance test. In that particular scenario,
# tinyMCE incorrectly decides that the suffix should be "", which means it fails to load files.
tinyMCE
.
suffix
=
".min"
@
tiny_mce_textarea
=
$
(
".tiny-mce"
,
@
element
).
tinymce
({
script_url
:
"
#{
baseUrl
}
/js/vendor/tiny_mce/tiny_mce.min.js"
,
theme
:
"modern"
,
...
...
lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
View file @
0ddc3a65
...
...
@@ -37,8 +37,8 @@
<link
rel=
"stylesheet"
href=
"${static.url('css/vendor/slickgrid/smoothness/jquery-ui-1.8.16.custom.css')}"
>
<link
rel=
"stylesheet"
href=
"${static.url('css/vendor/slickgrid/slick.grid.css')}"
>
<script
type=
"text/javascript"
src=
"${static.url('js/vendor/codemirror-compressed.js')}"
></script>
<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>
<script
type=
"text/javascript"
src=
"${static.url('js/vendor/tiny_mce/tiny
mce.min
.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/vendor/tiny_mce/jquery.tinymce.
min.
js')}"
></script>
<
%
static:js
group=
'module-descriptor-js'
/>
<
%
static:js
group=
'instructor_dash'
/>
</
%
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