From 9b33aaf27cd8f73402ee9967c6b0fd76a90f8ebe Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Wed, 21 Aug 2013 22:35:32 -0700 Subject: Adding images, creating circle questions and misc. fixes. --- web/images/2-a1-hover.jpg | Bin 0 -> 32906 bytes web/images/2-a1.jpg | Bin 0 -> 25513 bytes web/images/2-a2-hover.jpg | Bin 0 -> 28357 bytes web/images/2-a2.jpg | Bin 0 -> 21029 bytes web/images/2-a3-hover.jpg | Bin 0 -> 32237 bytes web/images/2-a3.jpg | Bin 0 -> 25627 bytes web/images/2-a4-hover.jpg | Bin 0 -> 8944 bytes web/images/2-a4.jpg | Bin 0 -> 7068 bytes web/images/2-a5-hover.jpg | Bin 0 -> 30555 bytes web/images/2-a5.jpg | Bin 0 -> 22376 bytes web/images/2-a6-hover.jpg | Bin 0 -> 30024 bytes web/images/2-a6.jpg | Bin 0 -> 21951 bytes web/images/8-a1-hover.jpg | Bin 35607 -> 35555 bytes web/images/8-a1.jpg | Bin 28817 -> 28795 bytes web/images/8-a2-hover.jpg | Bin 36319 -> 36234 bytes web/images/8-a2.jpg | Bin 30145 -> 30094 bytes web/images/8-a3-hover.jpg | Bin 30577 -> 30761 bytes web/images/8-a3.jpg | Bin 22977 -> 23219 bytes web/scripts/growth.js | 28 ++++++++++++++-------------- web/style.css | 13 +++++++++++++ 20 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 web/images/2-a1-hover.jpg create mode 100644 web/images/2-a1.jpg create mode 100644 web/images/2-a2-hover.jpg create mode 100644 web/images/2-a2.jpg create mode 100644 web/images/2-a3-hover.jpg create mode 100644 web/images/2-a3.jpg create mode 100644 web/images/2-a4-hover.jpg create mode 100644 web/images/2-a4.jpg create mode 100644 web/images/2-a5-hover.jpg create mode 100644 web/images/2-a5.jpg create mode 100644 web/images/2-a6-hover.jpg create mode 100644 web/images/2-a6.jpg (limited to 'web') diff --git a/web/images/2-a1-hover.jpg b/web/images/2-a1-hover.jpg new file mode 100644 index 0000000..8101265 Binary files /dev/null and b/web/images/2-a1-hover.jpg differ diff --git a/web/images/2-a1.jpg b/web/images/2-a1.jpg new file mode 100644 index 0000000..d87ea14 Binary files /dev/null and b/web/images/2-a1.jpg differ diff --git a/web/images/2-a2-hover.jpg b/web/images/2-a2-hover.jpg new file mode 100644 index 0000000..40c1bd7 Binary files /dev/null and b/web/images/2-a2-hover.jpg differ diff --git a/web/images/2-a2.jpg b/web/images/2-a2.jpg new file mode 100644 index 0000000..e03669c Binary files /dev/null and b/web/images/2-a2.jpg differ diff --git a/web/images/2-a3-hover.jpg b/web/images/2-a3-hover.jpg new file mode 100644 index 0000000..3e1ba81 Binary files /dev/null and b/web/images/2-a3-hover.jpg differ diff --git a/web/images/2-a3.jpg b/web/images/2-a3.jpg new file mode 100644 index 0000000..fb7098a Binary files /dev/null and b/web/images/2-a3.jpg differ diff --git a/web/images/2-a4-hover.jpg b/web/images/2-a4-hover.jpg new file mode 100644 index 0000000..6afd429 Binary files /dev/null and b/web/images/2-a4-hover.jpg differ diff --git a/web/images/2-a4.jpg b/web/images/2-a4.jpg new file mode 100644 index 0000000..7280d49 Binary files /dev/null and b/web/images/2-a4.jpg differ diff --git a/web/images/2-a5-hover.jpg b/web/images/2-a5-hover.jpg new file mode 100644 index 0000000..8cd1f9d Binary files /dev/null and b/web/images/2-a5-hover.jpg differ diff --git a/web/images/2-a5.jpg b/web/images/2-a5.jpg new file mode 100644 index 0000000..465c199 Binary files /dev/null and b/web/images/2-a5.jpg differ diff --git a/web/images/2-a6-hover.jpg b/web/images/2-a6-hover.jpg new file mode 100644 index 0000000..1fe87bd Binary files /dev/null and b/web/images/2-a6-hover.jpg differ diff --git a/web/images/2-a6.jpg b/web/images/2-a6.jpg new file mode 100644 index 0000000..df26868 Binary files /dev/null and b/web/images/2-a6.jpg differ diff --git a/web/images/8-a1-hover.jpg b/web/images/8-a1-hover.jpg index 8aa82f1..cfa7077 100644 Binary files a/web/images/8-a1-hover.jpg and b/web/images/8-a1-hover.jpg differ diff --git a/web/images/8-a1.jpg b/web/images/8-a1.jpg index bdf77aa..e249a3c 100644 Binary files a/web/images/8-a1.jpg and b/web/images/8-a1.jpg differ diff --git a/web/images/8-a2-hover.jpg b/web/images/8-a2-hover.jpg index e7d298a..77af9cc 100644 Binary files a/web/images/8-a2-hover.jpg and b/web/images/8-a2-hover.jpg differ diff --git a/web/images/8-a2.jpg b/web/images/8-a2.jpg index af6f4c4..287353d 100644 Binary files a/web/images/8-a2.jpg and b/web/images/8-a2.jpg differ diff --git a/web/images/8-a3-hover.jpg b/web/images/8-a3-hover.jpg index bf3abed..6d3b50c 100644 Binary files a/web/images/8-a3-hover.jpg and b/web/images/8-a3-hover.jpg differ diff --git a/web/images/8-a3.jpg b/web/images/8-a3.jpg index c67dd57..eab7d7a 100644 Binary files a/web/images/8-a3.jpg and b/web/images/8-a3.jpg differ diff --git a/web/scripts/growth.js b/web/scripts/growth.js index 5bc30d4..9aae3aa 100644 --- a/web/scripts/growth.js +++ b/web/scripts/growth.js @@ -1,10 +1,10 @@ $(document).ready(function() { $('.slider').draggable({ - axis:"x", - containment:"parent", + axis:"x", + containment:"parent", cursor:"pointer", - stop: function (event, ui) { + stop: function (event, ui) { var range = $(ui.helper).parent().width() - 46; var value = (ui.position.left + range / 2) / range; $("#answerField").val(value); @@ -12,9 +12,9 @@ $(document).ready(function() }); $('.quad .selector').draggable({ - containment:"parent", + containment:"parent", cursor:"pointer", - stop: function (event, ui) { + stop: function (event, ui) { updateQuadAnswer(ui.position.left, ui.position.top); }, drag: function (event, ui) { @@ -35,7 +35,7 @@ $(document).ready(function() updateQuadAnswer(e.offsetX - 10, e.offsetY - 10); } }); - + var previousAnswer = $("#answerField").val(); if (!isNaN(previousAnswer)) { var range = $('.sliderQuestion .sliderbar').width() - 46; @@ -101,20 +101,20 @@ function selectAnswer(element) function previousQuestion() { $("#direction").val("previous"); - sendAnswer(); + sendAnswer(false); } function nextQuestion() { $("#direction").val("next"); - sendAnswer(); + sendAnswer(true); } -function sendAnswer() +function sendAnswer(required) { var selectedAnswer = $("#answerField").val(); - - if (selectedAnswer == '') { + + if (required && selectedAnswer == '') { notice('Please select an answer before moving to the next question'); return; } @@ -149,7 +149,7 @@ function playVideo(videoId) notice("We could not find a video format that will work with your browser. Please try another browser or contact us."); }).error(function(jqXHR, error) { - notice('Could not load video due to ' + error + '. If the problem persists, please contact us.'); + notice('Could not load video due to ' + error + '. If the problem persists, please contact us.'); }); } @@ -175,14 +175,14 @@ function reportVideoComplete(data) $('#chapterprogress .progresslabel').html(percent); closeVideo(); - + $.ajax({ type: "POST", url: location.href + "/videos/" + videoId + ".json", dataType: "json", data: {'completed':'true'} }).error(function(jqXHR, error) { - notice('Could not record video completiton due to ' + error + '. If the problem persists, please contact us.'); + notice('Could not record video completiton due to ' + error + '. If the problem persists, please contact us.'); }); if (completed == total) { diff --git a/web/style.css b/web/style.css index 026ca7c..09cb5be 100644 --- a/web/style.css +++ b/web/style.css @@ -419,6 +419,19 @@ footer a:hover { text-align: left; } +.quadQuestion .above span, .quadQuestion .below span { + display: inline-block; + width: 40%; +} + +.quadQuestion .above span { + vertical-align: bottom; +} + +.quadQuestion .below span { + vertical-align: top; +} + .quad { background: url('/images/quad.png') center center no-repeat; width: 273px; -- cgit v1.2.3