Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ux/marco/studio-componentsettings

Browse Source
This commit is contained in:
marco
2013-05-01 17:21:16 -04:00
parent 30240ff01a a537bd7f05
commit e697e495ca
38 changed files with 825 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/templates/base.html
View File

@@ -30,7 +30,7 @@
<body class="<%block name='bodyclass'></%block> hide-wip">
<%include file="courseware_vendor_js.html"/>
<script type="text/javascript" src="${static.url('jsi18n/')}"></script>
<script type="text/javascript" src="jsi18n/"></script>
<script type="text/javascript" src="${static.url('js/vendor/json2.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/underscore-min.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/backbone-min.js')}"></script>

2
cms/templates/settings.html
View File

@@ -179,7 +179,7 @@ from contentstore import utils
<li class="field text" id="field-course-overview">
<label for="course-overview">Course Overview</label>
<textarea class="tinymce text-editor" id="course-overview"></textarea>
<span class="tip tip-stacked">Introductions, prerequisites, FAQs that are used on <a class="link-courseURL" rel="external" href="${utils.get_lms_link_for_about_page(course_location)}">your course summary page</a></span>
<span class="tip tip-stacked">Introductions, prerequisites, FAQs that are used on <a class="link-courseURL" rel="external" href="${utils.get_lms_link_for_about_page(course_location)}">your course summary page</a> (formatted in HTML)</span>
</li>
<li class="field video" id="field-course-introduction-video">