Merge branch 'master' into ui/tooltips

2018-08-13 15:05:08 -04:00
parent 86660d4c62 fd13c981dd
commit 143c58addc
57 changed files with 1021 additions and 208 deletions
--- a/templates/base.html
+++ b/templates/base.html
@@ -36,6 +36,11 @@

    {% include 'footer.html' %}
    {% block modal %}{% endblock %}
+
+    {% if g.modal %}
+      <div data-modal="{{ g.modal }}" id="modalOpen">
+      </div>
+    {% endif %}
  </div>

  {% assets "js_all" %}