Adding images, creating circle questions and misc. fixes.

20 files changed, 27 insertions, 14 deletions

diff --git a/web/images/2-a1-hover.jpg b/web/images/2-a1-hover.jpg
new file mode 100644
index 0000000..8101265
--- /dev/null
+++ b/web/images/2-a1-hover.jpg
diff --git a/web/images/2-a1.jpg b/web/images/2-a1.jpg
new file mode 100644
index 0000000..d87ea14
--- /dev/null
+++ b/web/images/2-a1.jpg
diff --git a/web/images/2-a2-hover.jpg b/web/images/2-a2-hover.jpg
new file mode 100644
index 0000000..40c1bd7
--- /dev/null
+++ b/web/images/2-a2-hover.jpg
diff --git a/web/images/2-a2.jpg b/web/images/2-a2.jpg
new file mode 100644
index 0000000..e03669c
--- /dev/null
+++ b/web/images/2-a2.jpg
diff --git a/web/images/2-a3-hover.jpg b/web/images/2-a3-hover.jpg
new file mode 100644
index 0000000..3e1ba81
--- /dev/null
+++ b/web/images/2-a3-hover.jpg
diff --git a/web/images/2-a3.jpg b/web/images/2-a3.jpg
new file mode 100644
index 0000000..fb7098a
--- /dev/null
+++ b/web/images/2-a3.jpg
diff --git a/web/images/2-a4-hover.jpg b/web/images/2-a4-hover.jpg
new file mode 100644
index 0000000..6afd429
--- /dev/null
+++ b/web/images/2-a4-hover.jpg
diff --git a/web/images/2-a4.jpg b/web/images/2-a4.jpg
new file mode 100644
index 0000000..7280d49
--- /dev/null
+++ b/web/images/2-a4.jpg
diff --git a/web/images/2-a5-hover.jpg b/web/images/2-a5-hover.jpg
new file mode 100644
index 0000000..8cd1f9d
--- /dev/null
+++ b/web/images/2-a5-hover.jpg
diff --git a/web/images/2-a5.jpg b/web/images/2-a5.jpg
new file mode 100644
index 0000000..465c199
--- /dev/null
+++ b/web/images/2-a5.jpg
diff --git a/web/images/2-a6-hover.jpg b/web/images/2-a6-hover.jpg
new file mode 100644
index 0000000..1fe87bd
--- /dev/null
+++ b/web/images/2-a6-hover.jpg
diff --git a/web/images/2-a6.jpg b/web/images/2-a6.jpg
new file mode 100644
index 0000000..df26868
--- /dev/null
+++ b/web/images/2-a6.jpg
diff --git a/web/images/8-a1-hover.jpg b/web/images/8-a1-hover.jpg
index 8aa82f1..cfa7077 100644
--- a/web/images/8-a1-hover.jpg
+++ b/web/images/8-a1-hover.jpg
diff --git a/web/images/8-a1.jpg b/web/images/8-a1.jpg
index bdf77aa..e249a3c 100644
--- a/web/images/8-a1.jpg
+++ b/web/images/8-a1.jpg
diff --git a/web/images/8-a2-hover.jpg b/web/images/8-a2-hover.jpg
index e7d298a..77af9cc 100644
--- a/web/images/8-a2-hover.jpg
+++ b/web/images/8-a2-hover.jpg
diff --git a/web/images/8-a2.jpg b/web/images/8-a2.jpg
index af6f4c4..287353d 100644
--- a/web/images/8-a2.jpg
+++ b/web/images/8-a2.jpg
diff --git a/web/images/8-a3-hover.jpg b/web/images/8-a3-hover.jpg
index bf3abed..6d3b50c 100644
--- a/web/images/8-a3-hover.jpg
+++ b/web/images/8-a3-hover.jpg
diff --git a/web/images/8-a3.jpg b/web/images/8-a3.jpg
index c67dd57..eab7d7a 100644
--- a/web/images/8-a3.jpg
+++ b/web/images/8-a3.jpg
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;