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

UI changes.

Browse Source
This commit is contained in:
Valera Rozuvan
2013-02-25 12:33:49 +02:00
parent d9ad4b5724
commit 653154f11e
3 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/lib/xmodule/xmodule/css/poll/display.scss
View File

@@ -214,13 +214,8 @@ section.poll_question {
text-shadow: rgb(7, 103, 148) 0px 1px 0px;
}
.graph_answer {
display: none;
.button.reset-button {
clear: both;
width: 400px;
height: 400px;
margin-top: 30px;
margin-left: auto;
margin-right: auto;
float: right;
}
}

16
common/lib/xmodule/xmodule/js/src/conditional/display.coffee
View File

@@ -1,16 +1,20 @@
class @Conditional
constructor: (element, callerElId) ->
constructor: (element, callerElId, reset) ->
@el = $(element).find('.conditional-wrapper')
@callerElId = callerElId
if @el.data('passed') is true
return
else if @el.data('passed') is false
@passed = false
else
if reset is true
@el.data('passed', null)
@passed = null
else
if @el.data('passed') is true
return
else if @el.data('passed') is false
@passed = false
else
@passed = null
if callerElId isnt undefined and @passed isnt null
dependencies = @el.data('depends')

20
common/lib/xmodule/xmodule/js/src/poll/poll_main.js
View File

@@ -42,8 +42,6 @@ PollMain.prototype = {
_this = this;
console.log('submiting answer');
answerObj.buttonEl.addClass('answered');
// Send the data to the server as an AJAX request. Attach a callback that will
@@ -51,11 +49,11 @@ PollMain.prototype = {
$.postWithPrefix(
_this.ajax_url + '/' + answer, {},
function (response) {
console.log('success! response = ');
console.log(response);
_this.showAnswerGraph(response.poll_answers, response.total);
_this.resetButton.show();
// Initialize Conditional constructors.
if (_this.wrapperSectionEl !== null) {
$(_this.wrapperSectionEl).find('.xmodule_ConditionalModule').each(function (index, value) {
new window.Conditional(value, _this.id.replace(/^poll_/, ''));
@@ -73,28 +71,22 @@ PollMain.prototype = {
_this = this;
console.log('submiting rset');
// Send the data to the server as an AJAX request. Attach a callback that will
// be fired on server's response.
$.postWithPrefix(
this.ajax_url + '/' + 'reset_poll',
{},
function (response) {
console.log('success! response = ');
console.log(response);
_this.questionAnswered = false;
_this.questionEl.find('.button.answered').removeClass('answered');
_this.questionEl.find('.stats').hide();
_this.resetButton.hide();
// Initialize Conditional constructors. We will specify the third parameter as 'true'
// notifying the constructor that this is a reset operation.
if (_this.wrapperSectionEl !== null) {
$(_this.wrapperSectionEl).find('.xmodule_ConditionalModule').each(function (index, value) {
new window.Conditional(value, _this.id.replace(/^poll_/, ''));
new window.Conditional(value, _this.id.replace(/^poll_/, ''), true);
});
}
}