From d051f230dc3f641beca7c17ae64b7cc86a2c0ccc Mon Sep 17 00:00:00 2001
From: Tom Price <tom@codedinternet.com>
Date: Tue, 9 Aug 2016 15:46:08 +0100
Subject: [PATCH] Enable ajax-bootstrap-select.

Requires some work as is currently not overly happy
---
 RIGS/templates/RIGS/event_form.html |  17 ++---------------
 app/styles/app.scss                 |   2 ++
 bower.json                          |   4 +++-
 db.sqlite3                          | Bin 577536 -> 577536 bytes
 ember-cli-build.js                  |   9 +++++++++
 templates/base.html                 |   3 ++-
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html
index b2b4dcd7..cbcaf83f 100644
--- a/RIGS/templates/RIGS/event_form.html
+++ b/RIGS/templates/RIGS/event_form.html
@@ -5,21 +5,8 @@
 {% block title %}{% if object.pk %}Event {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}
     {{ object.pk }}{% endif %}{% else %}New Event{% endif %}{% endblock %}
 
-{% block css %}
-    <link rel="stylesheet" href="{% static "css/bootstrap-select.min.css" %}"/>
-    <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
-{% endblock %}
-
-{% block preload_js %}
-    <script src="{% static "js/bootstrap-select.js" %}"></script>
-    <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
-{% endblock %}
-
 {% block js %}
-    <script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
     <script src="{% static "js/interaction.js" %}"></script>
-    <script src="{% static "js/modal.js" %}"></script>
-    <script src="{% static "js/tooltip.js" %}"></script>
 
     <script src="{% static "js/autocompleter.js" %}"></script>
 
@@ -76,7 +63,7 @@
                 var input = document.createElement('input');
                 input.setAttribute('type','date');
                 var notADateValue = 'not-a-date';
-                input.setAttribute('value', notADateValue); 
+                input.setAttribute('value', notADateValue);
                 return !(input.value === notADateValue);
             }
             if(supportsDate()){
@@ -360,7 +347,7 @@
                             {% render_field form.status class+="form-control" %}
                         </div>
                     </div>
-                    
+
                     <div class="form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}">
                         <div class="form-group" data-toggle="tooltip" title="The Member in Charge of this event">
                             <label for="{{ form.mic.id_for_label }}"
diff --git a/app/styles/app.scss b/app/styles/app.scss
index bb880e6e..3fe6ed40 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -1,5 +1,7 @@
 @import "bootstrap-variables";
 @import "bootstrap";
+
+@import "bootstrap-select";
 //@import "jq-ui-bootstrap/_jq-ui-bootstrap-variable-adapter";
 //@import "jq-ui-bootstrap/_base";
 //@import "jq-ui-bootstrap/_autocomplete";
diff --git a/bower.json b/bower.json
index 1999d2bb..ef99d43f 100644
--- a/bower.json
+++ b/bower.json
@@ -5,6 +5,8 @@
     "ember-cli-shims": "0.1.1",
     "ember-qunit-notifications": "0.1.0",
     "js-cookie": "^2.1.2",
-    "bootstrap-sass": "^3.3.7"
+    "bootstrap-sass": "^3.3.7",
+    "bootstrap-select": "^1.10.0",
+    "ajax-bootstrap-select": "^1.3.1"
   }
 }
diff --git a/db.sqlite3 b/db.sqlite3
index 0cc3b08f4b9830a5961be847408dbd9b214a20f9..7bb70cc1083d689a3e9db5ccbd1ccf190bafef5a 100644
GIT binary patch
delta 574
zcmZozpxm%Pd4e=!_Cy(H#_Yy~tqF`v_<5Ka*%_D)F}X6bGkQ-JRQayaWX;Oz+rsLY
zRA^|FT~%0IY+hiRWtmZ0mTsAvQ(l>qo?2v9VUl68{gn_S6Jx!Fu92~Vp^24|p_PGw
zo~40>v4v?hGplbStD|9xaZavLN_kRhSz?O0X{mXBa-u<Qa;1Smd1`)EZgx~wvT>A4
zWTl^rQ)ZNlTZUgqvVp%#a#dtVP*!A>SFT@(r$LlUV1-|nr-`4tSGHf3Yq_sWfq7b>
zt*w!Pp_#6Mg{~CHc4I3;b1MU5JyR1?6LXU$YbLM<rtel~Q~<eBLXa<)ftlHZfq4?M
z2lIC3?b`)Z7%iCVRhWGl3Hg$h`3{3>YLY=lYDG~-dO?Okv1PGYl3BS$mPv&{NwGn4
zR#kQ`3&<owzGVg}D#|lSD#$Z6FwQJbnSNZI(Uygoc`?Iun-z>on-x@|m?y{o;0i_!
zQVVk<BV$8WIc7&jn5QvA977s4NSNCnYBK^c6A**gEI`Z(#B4y!zWt##huK0A3ta<C
XL_}Ixnp+whO-`(E-kx`sV-gbp`>mxB

delta 184
zcmZozpxm%Pd4e=!%0wAw#+1f{tqF`v_&FGv4lyttVrJVcsIrZTqsf|y)whM!ar$m`
zMuqLKgcv0R`R*_<GH+*K-p+i7fq}t!yMPL#1@mNw#R`+XPx(*ZuFmMo!N~lOf%zfx
zVW1h?nJ35p;F<nbn~|5*#M0c*u>GMnBM>tIF*6Xe05K~NvjH*t_J`UWW(!5kbq$Rb
ejEt=e46IBH^eoMd%}k6YCssIb&pXR8i3tEDYB?VO

diff --git a/ember-cli-build.js b/ember-cli-build.js
index 58775e26..ad785019 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -5,6 +5,12 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app');
 module.exports = function (defaults) {
   var app = new EmberApp(defaults, {
     // Add options here
+
+    sassOptions: {
+      includePaths: [
+        'bower_components/bootstrap-select/sass',
+      ],
+    },
   });
 
   // Use `app.import` to add additional libraries to the generated
@@ -20,5 +26,8 @@ module.exports = function (defaults) {
   // please specify an object with the list of modules as keys
   // along with the exports of each module as its value.
 
+  app.import('bower_components/bootstrap-select/dist/js/bootstrap-select.js');
+  app.import('bower_components/ajax-bootstrap-select/dist/js/ajax-bootstrap-select.js');
+
   return app.toTree();
 };
diff --git a/templates/base.html b/templates/base.html
index d4ed9504..18a45ccf 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -18,6 +18,7 @@
           type='text/css'>
 
 
+    <link rel="stylesheet" type="text/css" href="{% static "assets/vendor.css" %}">
     <link rel="stylesheet" type="text/css" href="{% static "assets/pyrigs.css" %}">
     {% block css %}
     {% endblock %}
@@ -161,8 +162,8 @@
 
 <div class="modal fade" id="modal" role="dialog" tabindex=-1></div>
 
-<script src="{% static "assets/pyrigs.js" %}"></script>
 <script src="{% static "assets/vendor.js" %}"></script>
+<script src="{% static "assets/pyrigs.js" %}"></script>
 <script src="https://cdn.ravenjs.com/1.3.0/jquery,native/raven.min.js"></script>
 <script>Raven.config('{% sentry_public_dsn %}').install()</script>