Merge pull request binford2k#366 from marrero984/fix_response_count_d…

…isplay repositioned to left of question in notes display
dgolman · Dec 15, 2015 · 44f490b · 44f490b
2 parents be08502 + f6b1c10
commit 44f490b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/public/css/presenter.css b/public/css/presenter.css
@@ -341,16 +341,19 @@ div.zoomed {
     list-style-type: disc;
   }
 
-  #notes div.rendered.form span.count {
-    display: inline;
-    position: absolute;
-    top: 3px;
-    right: 4px;
-    z-index: 10;
-    background-color: #ddd;
-    border: 1px solid #333;
-    border-radius: 0 0.15em 0 0;
-    box-shadow: 2px 2px 2px #888;
+  #notes .element {
+    display: inline-block;
+    width: 90%;
+  }
+
+  #notes .count {
+    display: inline-block;
+    background-color: #27ae60;
+    color: #ffffff;
+    padding: 0 8px;
+    font-size: 2.5em;
+    vertical-align: top;
+    border-radius: .2em;
   }
 
   #bottom #notes div.personal {

diff --git a/public/css/showoff.css b/public/css/showoff.css
@@ -524,7 +524,7 @@ code.executing:hover {
   padding-left: 40px;
 }
 .element label {
-  margin-right: 0.5em;
+  margin-left: 0.5em;
 }
 
 .element textarea {
@@ -580,7 +580,7 @@ code.executing:hover {
   border-left: 4px solid black;
   opacity: 1.0;
 }
-.rendered .count {
+.count {
   display: none;
 }
 

diff --git a/public/js/showoff.js b/public/js/showoff.js
@@ -506,12 +506,12 @@ function renderForm(form) {
   var action = form.attr("action");
   $.getJSON(action, function( data ) {
     //console.log(data);
-    form.children('div.form.element').each(function() {
+    form.children('.element').each(function() {
       var key = $(this).attr('data-name');
 
       // add a counter label if we haven't already
-      if( $(this).has('span.count').length == 0 ) {
-        $(this).prepend('<span class="count"></span>');
+      if( $(this).next('.count').length === 0 ) {
+        $(this).after($('<h1>').addClass('count'));
       }
 
       $(this).find('ul > li > *').each(function() {
@@ -557,7 +557,7 @@ function renderForm(form) {
           default:
             // select doesn't have a type attribute... yay html
             // poke inside to get options, then render each as a span and replace the select
-            parent = $(this).parent();
+            var parent = $(this).parent();
 
             $(this).children('option').each(function() {
               var text    = $(this).text();
@@ -595,7 +595,7 @@ function renderForm(form) {
         });
 
         // insert the total into the counter label
-        $(this).find('span.count').each(function() {
+        $(this).next('.count').each(function() {
           $(this).text(total);
         });