Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates

common/lib/xmodule/xmodule/gst_module.py

@@ -24,11 +24,10 @@ class GraphicalSliderToolModule(XModule):
     '''
 
     js = {
+      'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee')],
       'js': [
         # 3rd party libraries used by graphic slider tool.
         # TODO - where to store them - outside xmodule?
-        resource_string(__name__, 'js/src/graphical_slider_tool/jstat-1.0.0.min.js'),
-
         resource_string(__name__, 'js/src/graphical_slider_tool/gst_main.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/state.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/logme.js'),
@@ -38,8 +37,8 @@ class GraphicalSliderToolModule(XModule):
         resource_string(__name__, 'js/src/graphical_slider_tool/graph.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/el_output.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/g_label_el_output.js'),
-
         resource_string(__name__, 'js/src/graphical_slider_tool/gst.js')
+
       ]
     }
     js_module_name = "GraphicalSliderTool"

common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js

@@ -401,7 +401,7 @@ define('Graph', ['logme'], function (logme) {
                     return false;
                 }
             } else {
-                logme('MESSAGE: "xticks" were not specified. Using defaults.');
+                // logme('MESSAGE: "xticks" were not specified. Using defaults.');
 
                 return false;
             }
@@ -416,7 +416,7 @@ define('Graph', ['logme'], function (logme) {
                     return false;
                 }
             } else {
-                logme('MESSAGE: "yticks" were not specified. Using defaults.');
+                // logme('MESSAGE: "yticks" were not specified. Using defaults.');
 
                 return false;
             }

common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js

@@ -14,7 +14,9 @@ window.GraphicalSliderTool = function (el) {
         // with a unique DOM ID), we will iterate over all children, and for
         // each match, we will call GstMain module.
         $(el).children('.graphical_slider_tool').each(function (index, value) {
-            GstMain($(value).attr('id'));
+            JavascriptLoader.executeModuleScripts($(value), function(){
+                GstMain($(value).attr('id'));
+            });
         });
     });
 };

common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js

@@ -19,7 +19,7 @@ define(
         if ($('#' + gstId).attr('data-processed') !== 'processed') {
             $('#' + gstId).attr('data-processed', 'processed');
         } else {
-            logme('MESSAGE: Already processed GST with ID ' + gstId + '. Skipping.');
+            // logme('MESSAGE: Already processed GST with ID ' + gstId + '. Skipping.');
 
             return;
         }

common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js

@@ -20,9 +20,9 @@ define('Sliders', ['logme'], function (logme) {
             } else if (sliderDiv.length > 1) {
                 logme('ERROR: Found more than one slider for the parameter "' + paramName + '".');
                 logme('sliderDiv.length = ', sliderDiv.length);
-            } else {
-                logme('MESSAGE: Did not find a slider for the parameter "' + paramName + '".');
-            }
+            } // else {
+            //     logme('MESSAGE: Did not find a slider for the parameter "' + paramName + '".');
+            // }
         }
 
         function createSlider(sliderDiv, paramName) {

common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js

@@ -24,7 +24,7 @@ define('State', ['logme'], function (logme) {
         dynamicElByElId = {};
 
         stateInst += 1;
-        logme('MESSAGE: Creating state instance # ' + stateInst + '.');
+        // logme('MESSAGE: Creating state instance # ' + stateInst + '.');
 
         // Initially, there are no parameters to track. So, we will instantiate
         // an empty object.

lms/static/sass/multicourse/_about_pages.scss

@@ -194,30 +194,9 @@
         margin-bottom: 40px;
 
         h3 {
-          background: url('/static/images/bullet-closed.png') no-repeat left 0.25em;
           font-family: $sans-serif;
           font-weight: 700;
-          margin-bottom: 10px;
-          padding-left: 20px;
-          cursor: pointer;
-        }
-
-        .answer {
-          display: none;
-          color: #3c3c3c;
-          padding-left: 16px;
-          font-family: $serif;
-          li {
-            line-height: 1.6em;
-          }
-        }
-
-        // opened states
-        &.opened {
-
-          h3 {
-            background: url('/static/images/bullet-open.png') no-repeat left 0.25em;
-          }
+          margin-bottom: 15px;
         }
       }
     }

lms/static/sass/multicourse/_help.scss

 .static-container.help {
+
   section.questions {
-    float: left;
-    width: flex-grid(9);
-    margin-right: flex-gutter();
+    @include clearfix;
 
-    article {
-      margin-bottom: 40px;
+    nav.categories {
+      border: 1px solid rgb(220,220,220);
+      @include box-sizing(border-box);
+      float: left;
+      margin-left: flex-gutter();
+      padding: 20px;
+      width: flex-grid(3);
 
-      h2 {
-        border-bottom: 1px solid rgb(220,220,220);
-        margin-bottom: 40px;
-        padding-bottom: 20px;
+      a {
+        display: block;
+        letter-spacing: 1px;
+        margin: 0px -20px;
+        padding: 12px 0px 12px 20px;
+        text-align: left;
+
+        &:hover {
+          background: rgb(245,245,245);
+          text-decoration: none;
+        }
       }
     }
-  }
 
-  section.emails {
-    border: 1px solid rgb(220,220,220);
-    @include box-sizing(border-box);
-    float: left;
-    padding: 20px;
-    width: flex-grid(3);
+    .responses {
+      float: left;
+      width: flex-grid(9);
 
-    ul {
-      margin-left: 0;
-      padding-left: 0;
-      list-style: none;
+      .category {
+        padding-top: 40px;
 
-      li {
-        margin-bottom: 1em;
+        &:first-child {
+          padding-top: 0px;
+        }
+
+        > h2 {
+          border-bottom: 1px solid rgb(220,220,220);
+          margin-bottom: 40px;
+          padding-bottom: 20px;
+        }
+      }
+
+      .response {
+        margin-bottom: 40px;
+
+        h3 {
+          background: url('/static/images/bullet-closed.png') no-repeat left 0.25em;
+          font-family: $sans-serif;
+          font-weight: 700;
+          margin-bottom: 10px;
+          padding-left: 20px;
+          cursor: pointer;
+        }
+
+        .answer {
+          display: none;
+          color: #3c3c3c;
+          padding-left: 16px;
+          font-family: $serif;
+          li {
+            line-height: 1.6em;
+          }
+        }
+
+        // opened states
+        &.opened {
+
+          h3 {
+            background: url('/static/images/bullet-open.png') no-repeat left 0.25em;
+          }
+        }
       }
     }
   }
 }
-

lms/templates/index.html

@@ -164,7 +164,7 @@
 
 <section id="video-modal" class="modal home-page-video-modal video-modal">
   <div class="inner-wrapper">
-    <iframe width="640" height="360" src="http://www.youtube.com/embed/IlNU60ZKj3I?showinfo=0" frameborder="0" allowfullscreen></iframe>
+    <iframe width="640" height="360" src="http://www.youtube.com/embed/XNaiOGxWeto?showinfo=0" frameborder="0" allowfullscreen></iframe>
   </div>
 </section>