Enable ajax-bootstrap-select.

Requires some work as is currently not overly happy
This commit is contained in:
Tom Price
2016-08-09 15:46:08 +01:00
parent b194feb36b
commit d051f230dc
6 changed files with 18 additions and 17 deletions

View File

@@ -5,21 +5,8 @@
{% block title %}{% if object.pk %}Event {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %} {% block title %}{% if object.pk %}Event {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}
{{ object.pk }}{% endif %}{% else %}New Event{% endif %}{% endblock %} {{ 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 %} {% 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/interaction.js" %}"></script>
<script src="{% static "js/modal.js" %}"></script>
<script src="{% static "js/tooltip.js" %}"></script>
<script src="{% static "js/autocompleter.js" %}"></script> <script src="{% static "js/autocompleter.js" %}"></script>

View File

@@ -1,5 +1,7 @@
@import "bootstrap-variables"; @import "bootstrap-variables";
@import "bootstrap"; @import "bootstrap";
@import "bootstrap-select";
//@import "jq-ui-bootstrap/_jq-ui-bootstrap-variable-adapter"; //@import "jq-ui-bootstrap/_jq-ui-bootstrap-variable-adapter";
//@import "jq-ui-bootstrap/_base"; //@import "jq-ui-bootstrap/_base";
//@import "jq-ui-bootstrap/_autocomplete"; //@import "jq-ui-bootstrap/_autocomplete";

View File

@@ -5,6 +5,8 @@
"ember-cli-shims": "0.1.1", "ember-cli-shims": "0.1.1",
"ember-qunit-notifications": "0.1.0", "ember-qunit-notifications": "0.1.0",
"js-cookie": "^2.1.2", "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"
} }
} }

Binary file not shown.

View File

@@ -5,6 +5,12 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app');
module.exports = function (defaults) { module.exports = function (defaults) {
var app = new EmberApp(defaults, { var app = new EmberApp(defaults, {
// Add options here // Add options here
sassOptions: {
includePaths: [
'bower_components/bootstrap-select/sass',
],
},
}); });
// Use `app.import` to add additional libraries to the generated // 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 // please specify an object with the list of modules as keys
// along with the exports of each module as its value. // 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(); return app.toTree();
}; };

View File

@@ -18,6 +18,7 @@
type='text/css'> 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" %}"> <link rel="stylesheet" type="text/css" href="{% static "assets/pyrigs.css" %}">
{% block css %} {% block css %}
{% endblock %} {% endblock %}
@@ -161,8 +162,8 @@
<div class="modal fade" id="modal" role="dialog" tabindex=-1></div> <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/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 src="https://cdn.ravenjs.com/1.3.0/jquery,native/raven.min.js"></script>
<script>Raven.config('{% sentry_public_dsn %}').install()</script> <script>Raven.config('{% sentry_public_dsn %}').install()</script>