Merge branch 'spreadsheet'

Author: Brad Miller

.jshintrc

@@ -0,0 +1,4 @@
+{
+    "esversion": 6
+
+}

runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/globaltoc.html

@@ -4,6 +4,7 @@
   <a href="{{ pathto(master_doc) }}"
      class="dropdown-toggle"
      data-toggle="dropdown" aria-label="{{master_doc}}">{{ theme_navbar_site_name }} <b class="caret"></b></a>
-  <ul class="dropdown-menu globaltoc"
-    >{{ toctree(maxdepth=theme_globaltoc_depth|toint, collapse=False, includehidden=theme_globaltoc_includehidden|tobool) }}</ul>
+  <ul class="dropdown-menu globaltoc">
+      {{ toctree(maxdepth=theme_globaltoc_depth|toint, collapse=False, includehidden=theme_globaltoc_includehidden|tobool) }}
+  </ul>
 </li>

runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html

@@ -197,7 +197,7 @@
       <ul class="nav navbar-nav">
         <li class="divider-vertical"></li>
         {% block sidebartoc %}
-          {% include "globaltoc.html" %}
+          {% include "subchaptoc.html" %}
           <li class="divider-vertical"></li>
         {% endblock %}
         <!-- {% block sidebarrel %}

runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/subchaptoc.html

@@ -0,0 +1,14 @@
+<script>
+</script>
+<li class="dropdown globaltoc-container">
+  <a href="{{ pathto(master_doc) }}"
+     class="dropdown-toggle"
+     data-toggle="dropdown" aria-label="{{master_doc}}">This Chapter<b class="caret"></b></a>
+  <ul class="dropdown-menu globaltoc">
+      {% raw %}
+      {{ for row in subchapter_list: }}
+        <li class=toctree-l1><a class="reference internal" href="{{= row['subchap_uri']}}">{{= row['title']}}</a></li>
+      {{ pass }}
+      {% endraw %}
+  </ul>
+</li>

runestone/dragndrop/css/dragndrop.css

@@ -1,4 +1,4 @@
-.draggable {
+.rsdraggable {
     margin-left: 2%;
     margin-top: 5px;
     display:inline;

runestone/dragndrop/js/dragndrop.js

@@ -87,11 +87,11 @@ DragNDrop.prototype.createNewElements = function () {
     this.containerDiv.appendChild(this.dragDropWrapDiv);
 
     this.draggableDiv = document.createElement("div");
-    $(this.draggableDiv).addClass("draggable dragzone");
+    $(this.draggableDiv).addClass("rsdraggable dragzone");
     this.addDragDivListeners();
 
     this.dropZoneDiv = document.createElement("div");
-    $(this.dropZoneDiv).addClass("draggable");
+    $(this.dropZoneDiv).addClass("rsdraggable");
     this.dragDropWrapDiv.appendChild(this.draggableDiv);
     this.dragDropWrapDiv.appendChild(this.dropZoneDiv);
 

runestone/spreadsheet/__init__.py

@@ -0,0 +1 @@
+from .spreadsheet import *