Added short style. Fixing minor bugs.

common/lib/xmodule/xmodule/css/poll/display.scss

@@ -17,6 +17,7 @@ section.poll_question {
     margin-top: 0;
     margin-bottom: 15px;
     color: #fe57a1;
+    font-size: 1.9em;
 
     &.problem-header {
       section.staff {
@@ -40,10 +41,21 @@ section.poll_question {
   .poll_answer {
     margin-bottom: 20px;
 
+    &.short {
+        clear: both;
+    }
+
     .question {
       height: auto;
       clear: both;
-      min-height: 60px;
+      min-height: 30px;
+
+      &.short {
+        clear: none;
+        width: 30%;
+        display: inline;
+        float: left;
+      }
 
       .button {
         -webkit-appearance: none;
@@ -102,8 +114,8 @@ section.poll_question {
         vertical-align: top;
         white-space: pre-line;
 
-        width: 60px;
-        height: 60px;
+        width: 25px;
+        height: 25px;
 
         word-spacing: 0px;
         writing-mode: lr-tb;
@@ -126,10 +138,14 @@ section.poll_question {
         float: left;
         width: 80%;
         text-align: left;
-        min-height: 60px;
+        min-height: 30px;
         margin-left: 20px;
         height: auto;
         margin-bottom: 20px;
+
+        &.short {
+          width: 100px;
+        }
       }
     }
 
@@ -138,18 +154,35 @@ section.poll_question {
       margin-top: 20px;
       clear: both;
 
+      &.short {
+        margin-top: 0;
+        clear: none;
+        display: inline;
+        float: right;
+        width: 70%;
+      }
+
       .bar {
-        width: 85%;
+        width: 75%;
         height: 28px;
         border: 1px solid black;
         display: inline;
         float: left;
         margin-right: 10px;
 
+        &.short {
+          height: 20px;
+          margin-top: 3px;
+        }
+
         .percent {
           background-color: gray;
-          width: 300px;
+          width: 0px;
           height: 28px;
+
+          &.short {
+            height: 20px;
+          }
         }
       }
 
@@ -159,14 +192,15 @@ section.poll_question {
         float: right;
         height: 28px;
         text-align: right;
+
+        &.short {
+          width: 120px;
+          height: auto;
+        }
       }
     }
   }
 
-  .poll_answer {
-
-  }
-
   .poll_answer.answered {
     -webkit-box-shadow: rgb(97, 184, 225) 0px 1px 0px 0px inset;
     background-color: rgb(29, 157, 217);

common/lib/xmodule/xmodule/js/src/conditional/display.coffee

@@ -13,13 +13,19 @@ class @Conditional
       @passed = null
 
     @url = @el.data('url')
-    @render()
+    @render(element)
 
-  render: () ->
+  render: (element) ->
       $.postWithPrefix "#{@url}/conditional_get", (response) =>
         if (((response.passed is true) && (@passed is false)) || (@passed is null))
           @el.data 'passed', response.passed
 
           @el.html ''
           @el.append(i) for i in response.html
+
+          if @el.html().length < 5
+            $(element).hide()
+          else
+            $(element).show()
+
           XModule.loadModules @el

common/lib/xmodule/xmodule/js/src/poll/poll_main.js

@@ -114,6 +114,13 @@ PollMain.prototype = {
     this.questionAnswered = false;
 
     this.answersObj = {};
+    this.shortVersion = true;
+
+    $.each(this.jsonConfig.answers, function (index, value) {
+        if (value.length >= 18) {
+            _this.shortVersion = false;
+        }
+    });
 
     $.each(this.jsonConfig.answers, function (index, value) {
         var answer;
@@ -146,6 +153,14 @@ PollMain.prototype = {
 
         answer.textEl.html(value);
 
+        if (_this.shortVersion === true) {
+            $.each(answer, function (index, value) {
+                if (value instanceof jQuery) {
+                    value.addClass('short');
+                }
+            });
+        }
+
         answer.el.appendTo(_this.questionEl);
 
         answer.buttonEl.on('click', function () {
@@ -156,20 +171,6 @@ PollMain.prototype = {
             answer.buttonEl.addClass('answered');
             _this.questionAnswered = true;
         }
-
-        /*
-        answerEl = $('<li class="poll_answer">' + value + '</li>');
-        answerEl.on('click', function () {
-            _this.submitAnswer(index, answerEl);
-        });
-
-        if (index === _this.jsonConfig.poll_answer) {
-            answerEl.addClass('answered');
-            _this.questionAnswered = true;
-        }
-
-        answerEl.appendTo(_this.questionEl);
-        */
     });
 
     this.graphAnswerEl = $('<div class="graph_answer"></div>');