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

Merge branch 'release'

Browse Source
This commit is contained in:
Brian Wilson
2014-05-13 11:11:22 -04:00
parent 209c0d703f d6a74a644d
commit dcf27a9b74
8 changed files with 18 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cms/static/sass/elements/_modal-window.scss
View File

@@ -179,10 +179,6 @@
height: 365px;
}
&.modal-type-problem .CodeMirror {
height: 435px;
}
.wrapper-comp-settings {
.list-input {

2
common/lib/xmodule/xmodule/js/spec/combinedopenended/display_spec.coffee
View File

@@ -81,7 +81,7 @@ describe 'CombinedOpenEnded', ->
expect(window.setTimeout).toHaveBeenCalledWith(@combined.poll, 10000)
expect(window.queuePollerID).toBe(5)
it 'polling stops properly', =>
xit 'polling stops properly', =>
fakeResponseDone = state: "done"
spyOn($, 'postWithPrefix').andCallFake (url, callback) -> callback(fakeResponseDone)
@combined.poll()

2
common/lib/xmodule/xmodule/js/src/problem/edit.coffee
View File

@@ -109,7 +109,7 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
$(".CodeMirror").css({"overflow": "visible"})
$(".modal-content").css({"overflow-y": "visible", "overflow-x": "visible"})
else
$(".CodeMirror").removeAttr("style")
$(".CodeMirror").css({"overflow": "none"})
$(".modal-content").removeAttr("style")
###

26
common/lib/xmodule/xmodule/templates/html/grade_me.yaml
View File

@@ -1,26 +0,0 @@
---
metadata:
display_name: (Grade Me!) Button
data: |
<p>By clicking the button below, you assert that you have completed the course in its entirety.</p>
<input type=button value="Yes, I Agree." id="User_Verify_Button" style="margin-bottom: 20px;" />
<p class="verify-button-success-text" style="font-weight: bold; color: #008200;"></p>
<script type="text/javascript">
var success_message = "Your grading and certification request has been received, <br />if you have passed, your certificate should be available in the next 20 minutes.";
document.getElementById('User_Verify_Button').addEventListener("click",
function(event) {
(function(event) {
var linkcontents = $('a.user-link').contents();
$.ajax({
type: 'POST',
url: '/request_certificate',
data: {'course_id': $$course_id},
success: function(data) {
$('.verify-button-success-text').html(success_message);
}
});
}).call(document.getElementById('User_Verify_Button'), event);
});
</script>

2
lms/envs/common.py
View File

@@ -445,7 +445,7 @@ if FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
})
######################## GOOGLE ANALYTICS ###########################
GOOGLE_ANALYTICS_ACCOUNT = 'GOOGLE_ANALYTICS_ACCOUNT_DUMMY'
GOOGLE_ANALYTICS_ACCOUNT = None
GOOGLE_ANALYTICS_LINKEDIN = 'GOOGLE_ANALYTICS_LINKEDIN_DUMMY'
######################## subdomain specific settings ###########################

5
lms/templates/dashboard/_dashboard_certificate_information.html
View File

@@ -24,11 +24,8 @@ else:
%>
<div class="message message-status ${status_css_class} is-shown">
% if cert_status['status'] == 'processing' and not course.may_certify():
% if cert_status['status'] == 'processing':
<p class="message-copy">${_("Final course details are being wrapped up at this time. Your final standing will be available shortly.")}</p>
% elif course.may_certify() and cert_status['status'] == 'processing':
<!-- Certification is allowed but no cert requested, or cert unearned -->
<!-- <p class="message-copy">${_("Your final standing is unrequested or unavailable at this time.")}</p> -->
% elif cert_status['status'] in ('generating', 'ready', 'notpassing', 'restricted'):
<p class="message-copy">${_("Your final grade:")}
<span class="grade-value">${"{0:.0f}%".format(float(cert_status['grade'])*100)}</span>.

4
lms/templates/dashboard/_dashboard_course_listing.html
View File

@@ -52,7 +52,7 @@
<span class="sts-enrollment-value">${_("Honor Code")}</span>
</span>
% elif enrollment.mode == "audit":
<span class="sts-enrollment" title="${_("You're auditing this course")}>
<span class="sts-enrollment" title="${_("You're auditing this course")}">
<span class="label">${_("Enrolled as: ")}</span>
<span class="sts-enrollment-value">${_("Auditing")}</span>
</span>
@@ -82,7 +82,7 @@
</h3>
</hgroup>
% if course.may_certify() and cert_status and not enrollment.mode == 'audit':
% if course.may_certify() and cert_status:
<%include file='_dashboard_certificate_information.html' args='cert_status=cert_status,course=course, enrollment=enrollment'/>
% endif

22
lms/templates/google_analytics.html
View File

@@ -1,11 +1,13 @@
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '${settings.GOOGLE_ANALYTICS_ACCOUNT}']);
_gaq.push(['_trackPageview']);
% if settings.GOOGLE_ANALYTICS_ACCOUNT:
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '${settings.GOOGLE_ANALYTICS_ACCOUNT}']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
% endif