diff --git a/ckanext/odsh/public/bootstrap-multiselect.css b/ckanext/odsh/fanstatic/bootstrap-multiselect.css
similarity index 100%
rename from ckanext/odsh/public/bootstrap-multiselect.css
rename to ckanext/odsh/fanstatic/bootstrap-multiselect.css
diff --git a/ckanext/odsh/public/odsh.css b/ckanext/odsh/fanstatic/odsh.css
similarity index 100%
rename from ckanext/odsh/public/odsh.css
rename to ckanext/odsh/fanstatic/odsh.css
diff --git a/ckanext/odsh/public/odsh_header.css b/ckanext/odsh/fanstatic/odsh_header.css
similarity index 100%
rename from ckanext/odsh/public/odsh_header.css
rename to ckanext/odsh/fanstatic/odsh_header.css
diff --git a/ckanext/odsh/fanstatic/webassets.yaml b/ckanext/odsh/fanstatic/webassets.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ee9e9e70e13f2e91170786eb3973dc95d50f2ebb
--- /dev/null
+++ b/ckanext/odsh/fanstatic/webassets.yaml
@@ -0,0 +1,108 @@
+odsh_base_script: # name of the asset
+ filters: rjsmin # preprocessor for files. Optional
+ output: ckanext-odsh/odsh_base.js # actual path, where the generated file will be stored
+ contents: # list of files that are included in the asset
+ - autocomplete.js
+ - odsh.js
+
+odsh_base_style: # name of asset
+ output: ckanext-odsh/odsh_base.css # actual path, where generated file will be stored
+ contents: # list of files that are included into asset
+ - odsh.css
+ - odsh_header.css
+ - bootstrap-multiselect.css
+
+tpsh_toggle_menu: # name of the asset
+ filters: rjsmin # preprocessor for files. Optional
+ output: ckanext-odsh/tpsh_toggle_menu.js # actual path, where the generated file will be stored
+ contents: # list of files that are included in the asset
+ - tpsh_toggle_menu.js
+
+# odsh_dataset_map_script: # name of the asset
+# filters: rjsmin # preprocessor for files. Optional
+# output: ckanext-odsh/odsh_dataset_map.js # actual path, where the generated file will be stored
+# contents: # list of files that are included in the asset
+# - vendor/leaflet.js
+# - vendor/proj4-compressed.js
+# - vendor/proj4leaflet.js
+# - common_map.js
+# - odsh_dataset_map.js
+
+# odsh_dataset_map_style: # name of asset
+# output: ckanext-odsh/odsh_dataset_map.css # actual path, where generated file will be stored
+# contents: # list of files that are included into asset
+# - leaflet.css
+# - dataset_map.css
+
+# odsh_spatial_query_script: # name of the asset
+# filters: rjsmin # preprocessor for files. Optional
+# output: ckanext-odsh/odsh_spatial_query.js # actual path, where the generated file will be stored
+# contents: # list of files that are included in the asset
+# - vendor/leaflet.js
+# - vendor/proj4-compressed.js
+# - vendor/proj4leaflet.js
+# - vendor/vendor/leaflet.draw.js
+# - common_map.js
+# - odsh_spatial_query.js
+
+# odsh_spatial_query_style: # name of asset
+# output: ckanext-odsh/odsh_spatial_query.css # actual path, where generated file will be stored
+# contents: # list of files that are included into asset
+# - leaflet.css
+# - leaflet.draw.css
+# - spatial_query.css
+
+# autocomplete_script: # name of the asset
+# filters: rjsmin # preprocessor for files. Optional
+# output: ckanext-odsh/autocomplete.js # actual path, where the generated file will be stored
+# contents: # list of files that are included in the asset
+# - vendor/jquery-ui-autocomplete/jquery-ui.js
+# - autocomplete.js
+
+# autocomplete_style: # name of asset
+# output: ckanext-odsh/autocomplete.css # actual path, where generated file will be stored
+# contents: # list of files that are included into asset
+# - vendor/jquery-ui-autocomplete/jquery-ui.css
+# - vendor/jquery-ui-autocomplete/jquery-ui.structure.css
+# - vendor/jquery-ui-autocomplete/jquery-ui.theme.css
+# - autocomplete.css
+
+# odsh_all_script: # name of the asset
+# filters: rjsmin # preprocessor for files. Optional
+# output: ckanext-odsh/odsh_all.js # actual path, where the generated file will be stored
+# contents: # list of files that are included in the asset
+# - autocomplete.js
+# - bootstrap-datepicker.js
+# - bootstrap-multiselect.js
+# - common_map.js
+# - moment.js
+# - odsh_dataset_map.js
+# - odsh_datepicker.js
+# - odsh_form.js
+# - odsh_guessformat.js
+# - odsh_image-upload.js
+# - odsh.js
+# - odsh_map.js
+# - odsh_popover.js
+# - odsh_populate_tags.js
+# - odsh_spatial_query.js
+# - tpsh_toggle_menu.js
+# - tpsh_validate_password.js
+# - vendor/jquery-ui-autocomplete/jquery-ui.js
+# - vendor/leaflet.draw.js
+# - vendor/leaflet.js
+# - vendor/proj4-compressed.js
+# - vendor/proj4leaflet.js
+
+# odsh_all_style: # name of asset
+# output: ckanext-odsh/odsh_all.css # actual path, where generated file will be stored
+# contents: # list of files that are included into asset
+# - autocomplete.css
+# - dataset_map.css
+# - datepicker.css
+# - leaflet.css
+# - leaflet.draw.css
+# - spatial_query.css
+# - vendor/jquery-ui-autocomplete/jquery-ui.css
+# - vendor/jquery-ui-autocomplete/jquery-ui.structure.css
+# - vendor/jquery-ui-autocomplete/jquery-ui.theme.css
diff --git a/ckanext/odsh/public/bootstrap-multiselect.js b/ckanext/odsh/public/bootstrap-multiselect.js
deleted file mode 100644
index 10ece14647d0b3d8a4618eabfd2a50611985d356..0000000000000000000000000000000000000000
--- a/ckanext/odsh/public/bootstrap-multiselect.js
+++ /dev/null
@@ -1,2053 +0,0 @@
-/**
- * Bootstrap Multiselect (http://davidstutz.de/bootstrap-multiselect/)
- *
- * Apache License, Version 2.0:
- * Copyright (c) 2012 - 2018 David Stutz
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a
- * copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * BSD 3-Clause License:
- * Copyright (c) 2012 - 2018 David Stutz
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * - Neither the name of David Stutz nor the names of its contributors may be
- * used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-(function (root, factory)
-{
- // check to see if 'knockout' AMD module is specified if using requirejs
- if (typeof define === 'function' && define.amd &&
- typeof require === 'function' && typeof require.specified === 'function' && require.specified('knockout'))
- {
-
- // AMD. Register as an anonymous module.
- define(['jquery', 'knockout'], factory);
- } else
- {
- // Browser globals
- factory(root.jQuery, root.ko);
- }
-})(this, function ($, ko)
-{
- "use strict";// jshint ;_;
-
- if (typeof ko !== 'undefined' && ko.bindingHandlers && !ko.bindingHandlers.multiselect)
- {
- ko.bindingHandlers.multiselect = {
- after: ['options', 'value', 'selectedOptions', 'enable', 'disable'],
-
- init: function (element, valueAccessor, allBindings, viewModel, bindingContext)
- {
- var $element = $(element);
- var config = ko.toJS(valueAccessor());
-
- $element.multiselect(config);
-
- if (allBindings.has('options'))
- {
- var options = allBindings.get('options');
- if (ko.isObservable(options))
- {
- ko.computed({
- read: function ()
- {
- options();
- setTimeout(function ()
- {
- var ms = $element.data('multiselect');
- if (ms)
- ms.updateOriginalOptions();//Not sure how beneficial this is.
- $element.multiselect('rebuild');
- }, 1);
- },
- disposeWhenNodeIsRemoved: element
- });
- }
- }
-
- //value and selectedOptions are two-way, so these will be triggered even by our own actions.
- //It needs some way to tell if they are triggered because of us or because of outside change.
- //It doesn't loop but it's a waste of processing.
- if (allBindings.has('value'))
- {
- var value = allBindings.get('value');
- if (ko.isObservable(value))
- {
- ko.computed({
- read: function ()
- {
- value();
- setTimeout(function ()
- {
- $element.multiselect('refresh');
- }, 1);
- },
- disposeWhenNodeIsRemoved: element
- }).extend({ rateLimit: 100, notifyWhenChangesStop: true });
- }
- }
-
- //Switched from arrayChange subscription to general subscription using 'refresh'.
- //Not sure performance is any better using 'select' and 'deselect'.
- if (allBindings.has('selectedOptions'))
- {
- var selectedOptions = allBindings.get('selectedOptions');
- if (ko.isObservable(selectedOptions))
- {
- ko.computed({
- read: function ()
- {
- selectedOptions();
- setTimeout(function ()
- {
- $element.multiselect('refresh');
- }, 1);
- },
- disposeWhenNodeIsRemoved: element
- }).extend({ rateLimit: 100, notifyWhenChangesStop: true });
- }
- }
-
- var setEnabled = function (enable)
- {
- setTimeout(function ()
- {
- if (enable)
- $element.multiselect('enable');
- else
- $element.multiselect('disable');
- });
- };
-
- if (allBindings.has('enable'))
- {
- var enable = allBindings.get('enable');
- if (ko.isObservable(enable))
- {
- ko.computed({
- read: function ()
- {
- setEnabled(enable());
- },
- disposeWhenNodeIsRemoved: element
- }).extend({ rateLimit: 100, notifyWhenChangesStop: true });
- } else
- {
- setEnabled(enable);
- }
- }
-
- if (allBindings.has('disable'))
- {
- var disable = allBindings.get('disable');
- if (ko.isObservable(disable))
- {
- ko.computed({
- read: function ()
- {
- setEnabled(!disable());
- },
- disposeWhenNodeIsRemoved: element
- }).extend({ rateLimit: 100, notifyWhenChangesStop: true });
- } else
- {
- setEnabled(!disable);
- }
- }
-
- ko.utils.domNodeDisposal.addDisposeCallback(element, function ()
- {
- $element.multiselect('destroy');
- });
- },
-
- update: function (element, valueAccessor, allBindings, viewModel, bindingContext)
- {
- var $element = $(element);
- var config = ko.toJS(valueAccessor());
-
- $element.multiselect('setOptions', config);
- $element.multiselect('rebuild');
- }
- };
- }
-
- function forEach(array, callback)
- {
- for (var index = 0; index < array.length; ++index)
- {
- callback(array[index], index);
- }
- }
-
- /**
- * Constructor to create a new multiselect using the given select.
- *
- * @param {jQuery} select
- * @param {Object} options
- * @returns {Multiselect}
- */
- function Multiselect(select, options)
- {
-
- this.$select = $(select);
- this.options = this.mergeOptions($.extend({}, options, this.$select.data()));
-
- // Placeholder via data attributes
- if (this.$select.attr("data-placeholder"))
- {
- this.options.nonSelectedText = this.$select.data("placeholder");
- }
-
- // Initialization.
- // We have to clone to create a new reference.
- this.originalOptions = this.$select.clone()[0].options;
- this.query = '';
- this.searchTimeout = null;
- this.lastToggledInput = null;
-
- this.options.multiple = this.$select.attr('multiple') === "multiple";
- this.options.onChange = $.proxy(this.options.onChange, this);
- this.options.onSelectAll = $.proxy(this.options.onSelectAll, this);
- this.options.onDeselectAll = $.proxy(this.options.onDeselectAll, this);
- this.options.onDropdownShow = $.proxy(this.options.onDropdownShow, this);
- this.options.onDropdownHide = $.proxy(this.options.onDropdownHide, this);
- this.options.onDropdownShown = $.proxy(this.options.onDropdownShown, this);
- this.options.onDropdownHidden = $.proxy(this.options.onDropdownHidden, this);
- this.options.onInitialized = $.proxy(this.options.onInitialized, this);
- this.options.onFiltering = $.proxy(this.options.onFiltering, this);
-
- // Build select all if enabled.
- this.buildContainer();
- this.buildButton();
- this.buildDropdown();
- this.buildReset();
- this.buildSelectAll();
- this.buildDropdownOptions();
- this.buildFilter();
-
- this.updateButtonText();
- this.updateSelectAll(true);
-
- if (this.options.enableClickableOptGroups && this.options.multiple)
- {
- this.updateOptGroups();
- }
-
- this.options.wasDisabled = this.$select.prop('disabled');
- if (this.options.disableIfEmpty && $('option', this.$select).length <= 0)
- {
- this.disable();
- }
-
- this.$select.wrap('<span class="multiselect-native-select" />').after(this.$container);
- this.options.onInitialized(this.$select, this.$container);
- }
-
- Multiselect.prototype = {
-
- defaults: {
- /**
- * Default text function will either print 'None selected' in case no
- * option is selected or a list of the selected options up to a length
- * of 3 selected options.
- *
- * @param {jQuery} options
- * @param {jQuery} select
- * @returns {String}
- */
- buttonText: function (options, select)
- {
- if (this.disabledText.length > 0
- && (select.prop('disabled') || (options.length == 0 && this.disableIfEmpty)))
- {
-
- return this.disabledText;
- }
- else if (options.length === 0)
- {
- return this.nonSelectedText;
- }
- else if (this.allSelectedText
- && options.length === $('option', $(select)).length
- && $('option', $(select)).length !== 1
- && this.multiple)
- {
-
- if (this.selectAllNumber)
- {
- return this.allSelectedText + ' (' + options.length + ')';
- }
- else
- {
- return this.allSelectedText;
- }
- }
- else if (this.numberDisplayed != 0 && options.length > this.numberDisplayed)
- {
- return options.length + ' ' + this.nSelectedText;
- }
- else
- {
- var selected = '';
- var delimiter = this.delimiterText;
-
- options.each(function ()
- {
- var label = ($(this).attr('label') !== undefined) ? $(this).attr('label') : $(this).text();
- selected += label + delimiter;
- });
-
- return selected.substr(0, selected.length - this.delimiterText.length);
- }
- },
- /**
- * Updates the title of the button similar to the buttonText function.
- *
- * @param {jQuery} options
- * @param {jQuery} select
- * @returns {@exp;selected@call;substr}
- */
- buttonTitle: function (options, select)
- {
- if (options.length === 0)
- {
- return this.nonSelectedText;
- }
- else
- {
- var selected = '';
- var delimiter = this.delimiterText;
-
- options.each(function ()
- {
- var label = ($(this).attr('label') !== undefined) ? $(this).attr('label') : $(this).text();
- selected += label + delimiter;
- });
- return selected.substr(0, selected.length - this.delimiterText.length);
- }
- },
- checkboxName: function (option)
- {
- return false; // no checkbox name
- },
- /**
- * Create a label.
- *
- * @param {jQuery} element
- * @returns {String}
- */
- optionLabel: function (element)
- {
- return $(element).attr('label') || $(element).text();
- },
- /**
- * Create a class.
- *
- * @param {jQuery} element
- * @returns {String}
- */
- optionClass: function (element)
- {
- return $(element).attr('class') || '';
- },
- /**
- * Triggered on change of the multiselect.
- *
- * Not triggered when selecting/deselecting options manually.
- *
- * @param {jQuery} option
- * @param {Boolean} checked
- */
- onChange: function (option, checked)
- {
-
- },
- /**
- * Triggered when the dropdown is shown.
- *
- * @param {jQuery} event
- */
- onDropdownShow: function (event)
- {
-
- },
- /**
- * Triggered when the dropdown is hidden.
- *
- * @param {jQuery} event
- */
- onDropdownHide: function (event)
- {
-
- },
- /**
- * Triggered after the dropdown is shown.
- *
- * @param {jQuery} event
- */
- onDropdownShown: function (event)
- {
-
- },
- /**
- * Triggered after the dropdown is hidden.
- *
- * @param {jQuery} event
- */
- onDropdownHidden: function (event)
- {
-
- },
- /**
- * Triggered on select all.
- */
- onSelectAll: function ()
- {
-
- },
- /**
- * Triggered on deselect all.
- */
- onDeselectAll: function ()
- {
-
- },
- /**
- * Triggered after initializing.
- *
- * @param {jQuery} $select
- * @param {jQuery} $container
- */
- onInitialized: function ($select, $container)
- {
-
- },
- /**
- * Triggered on filtering.
- *
- * @param {jQuery} $filter
- */
- onFiltering: function ($filter)
- {
-
- },
- enableHTML: false,
- buttonClass: 'btn btn-default',
- inheritClass: false,
- buttonWidth: 'auto',
- buttonContainer: '<div class="btn-group" />',
- dropRight: false,
- dropUp: false,
- selectedClass: 'active',
- // Maximum height of the dropdown menu.
- // If maximum height is exceeded a scrollbar will be displayed.
- maxHeight: false,
- includeSelectAllOption: false,
- includeSelectAllIfMoreThan: 0,
- selectAllText: ' Select all',
- selectAllValue: 'multiselect-all',
- selectAllName: false,
- selectAllNumber: true,
- selectAllJustVisible: true,
- enableFiltering: false,
- enableCaseInsensitiveFiltering: false,
- enableFullValueFiltering: false,
- enableClickableOptGroups: false,
- enableCollapsibleOptGroups: false,
- collapseOptGroupsByDefault: false,
- filterPlaceholder: 'Search',
- // possible options: 'text', 'value', 'both'
- filterBehavior: 'text',
- includeFilterClearBtn: true,
- preventInputChangeEvent: false,
- nonSelectedText: 'None selected',
- nSelectedText: 'selected',
- allSelectedText: 'All selected',
- numberDisplayed: 3,
- disableIfEmpty: false,
- disabledText: '',
- delimiterText: ', ',
- includeResetOption: false,
- includeResetDivider: false,
- resetText: 'Reset',
- templates: {
- button: '<button type="button" class="multiselect dropdown-toggle" data-toggle="dropdown"><span class="multiselect-selected-text"></span> <b class="caret"></b></button>',
- ul: '<ul class="multiselect-container dropdown-menu"></ul>',
- filter: '<li class="multiselect-item multiselect-filter"><div class="input-group"><span class="input-group-addon"><i class="glyphicon glyphicon-search"></i></span><input class="form-control multiselect-search" type="text" /></div></li>',
- filterClearBtn: '<span class="input-group-btn"><button class="btn btn-default multiselect-clear-filter" type="button"><i class="glyphicon glyphicon-remove-circle"></i></button></span>',
- li: '<li><a tabindex="0"><label></label></a></li>',
- divider: '<li class="multiselect-item divider"></li>',
- liGroup: '<li class="multiselect-item multiselect-group"><label></label></li>',
- resetButton: '<li class="multiselect-reset text-center"><div class="input-group"><a class="btn btn-default btn-block"></a></div></li>'
- }
- },
-
- constructor: Multiselect,
-
- /**
- * Builds the container of the multiselect.
- */
- buildContainer: function ()
- {
- this.$container = $(this.options.buttonContainer);
- this.$container.on('show.bs.dropdown', this.options.onDropdownShow);
- this.$container.on('hide.bs.dropdown', this.options.onDropdownHide);
- this.$container.on('shown.bs.dropdown', this.options.onDropdownShown);
- this.$container.on('hidden.bs.dropdown', this.options.onDropdownHidden);
- },
-
- /**
- * Builds the button of the multiselect.
- */
- buildButton: function ()
- {
- this.$button = $(this.options.templates.button).addClass(this.options.buttonClass);
- if (this.$select.attr('class') && this.options.inheritClass)
- {
- this.$button.addClass(this.$select.attr('class'));
- }
- // Adopt active state.
- if (this.$select.prop('disabled'))
- {
- this.disable();
- }
- else
- {
- this.enable();
- }
-
- // Manually add button width if set.
- if (this.options.buttonWidth && this.options.buttonWidth !== 'auto')
- {
- this.$button.css({
- 'width': '100%', //this.options.buttonWidth,
- 'overflow': 'hidden',
- 'text-overflow': 'ellipsis'
- });
- this.$container.css({
- 'width': this.options.buttonWidth
- });
- }
-
- // Keep the tab index from the select.
- var tabindex = this.$select.attr('tabindex');
- if (tabindex)
- {
- this.$button.attr('tabindex', tabindex);
- }
-
- this.$container.prepend(this.$button);
- },
-
- /**
- * Builds the ul representing the dropdown menu.
- */
- buildDropdown: function ()
- {
-
- // Build ul.
- this.$ul = $(this.options.templates.ul);
-
- if (this.options.dropRight)
- {
- this.$ul.addClass('pull-right');
- }
-
- // Set max height of dropdown menu to activate auto scrollbar.
- if (this.options.maxHeight)
- {
- // TODO: Add a class for this option to move the css declarations.
- this.$ul.css({
- 'max-height': this.options.maxHeight + 'px',
- 'overflow-y': 'auto',
- 'overflow-x': 'hidden'
- });
- }
-
- if (this.options.dropUp)
- {
-
- var height = Math.min(this.options.maxHeight, $('option[data-role!="divider"]', this.$select).length * 26 + $('option[data-role="divider"]', this.$select).length * 19 + (this.options.includeSelectAllOption ? 26 : 0) + (this.options.enableFiltering || this.options.enableCaseInsensitiveFiltering ? 44 : 0));
- var moveCalc = height + 34;
-
- this.$ul.css({
- 'max-height': height + 'px',
- 'overflow-y': 'auto',
- 'overflow-x': 'hidden',
- 'margin-top': "-" + moveCalc + 'px'
- });
- }
-
- this.$container.append(this.$ul);
- },
-
- /**
- * Build the dropdown options and binds all necessary events.
- *
- * Uses createDivider and createOptionValue to create the necessary options.
- */
- buildDropdownOptions: function ()
- {
-
- this.$select.children().each($.proxy(function (index, element)
- {
-
- var $element = $(element);
- // Support optgroups and options without a group simultaneously.
- var tag = $element.prop('tagName')
- .toLowerCase();
-
- if ($element.prop('value') === this.options.selectAllValue)
- {
- return;
- }
-
- if (tag === 'optgroup')
- {
- this.createOptgroup(element);
- }
- else if (tag === 'option')
- {
-
- if ($element.data('role') === 'divider')
- {
- this.createDivider();
- }
- else
- {
- this.createOptionValue(element);
- }
-
- }
-
- // Other illegal tags will be ignored.
- }, this));
-
- // Bind the change event on the dropdown elements.
- $(this.$ul).off('change', 'li:not(.multiselect-group) input[type="checkbox"], li:not(.multiselect-group) input[type="radio"]');
- $(this.$ul).on('change', 'li:not(.multiselect-group) input[type="checkbox"], li:not(.multiselect-group) input[type="radio"]', $.proxy(function (event)
- {
- var $target = $(event.target);
-
- var checked = $target.prop('checked') || false;
- var isSelectAllOption = $target.val() === this.options.selectAllValue;
-
- // Apply or unapply the configured selected class.
- if (this.options.selectedClass)
- {
- if (checked)
- {
- $target.closest('li')
- .addClass(this.options.selectedClass);
- }
- else
- {
- $target.closest('li')
- .removeClass(this.options.selectedClass);
- }
- }
-
- // Get the corresponding option.
- var value = $target.val();
- var $option = this.getOptionByValue(value);
-
- var $optionsNotThis = $('option', this.$select).not($option);
- var $checkboxesNotThis = $('input', this.$container).not($target);
-
- if (isSelectAllOption)
- {
-
- if (checked)
- {
- this.selectAll(this.options.selectAllJustVisible, true);
- }
- else
- {
- this.deselectAll(this.options.selectAllJustVisible, true);
- }
- }
- else
- {
- if (checked)
- {
- $option.prop('selected', true);
-
- if (this.options.multiple)
- {
- // Simply select additional option.
- $option.prop('selected', true);
- }
- else
- {
- // Unselect all other options and corresponding checkboxes.
- if (this.options.selectedClass)
- {
- $($checkboxesNotThis).closest('li').removeClass(this.options.selectedClass);
- }
-
- $($checkboxesNotThis).prop('checked', false);
- $optionsNotThis.prop('selected', false);
-
- // It's a single selection, so close.
- this.$button.click();
- }
-
- if (this.options.selectedClass === "active")
- {
- $optionsNotThis.closest("a").css("outline", "");
- }
- }
- else
- {
- // Unselect option.
- $option.prop('selected', false);
- }
-
- // To prevent select all from firing onChange: #575
- this.options.onChange($option, checked);
-
- // Do not update select all or optgroups on select all change!
- this.updateSelectAll();
-
- if (this.options.enableClickableOptGroups && this.options.multiple)
- {
- this.updateOptGroups();
- }
- }
-
- this.$select.change();
- this.updateButtonText();
-
- if (this.options.preventInputChangeEvent)
- {
- return false;
- }
- }, this));
-
- $('li a', this.$ul).on('mousedown', function (e)
- {
- if (e.shiftKey)
- {
- // Prevent selecting text by Shift+click
- return false;
- }
- });
-
- $(this.$ul).on('touchstart click', 'li a', $.proxy(function (event)
- {
- event.stopPropagation();
-
- var $target = $(event.target);
-
- if (event.shiftKey && this.options.multiple)
- {
- if ($target.is("label"))
- { // Handles checkbox selection manually (see https://github.com/davidstutz/bootstrap-multiselect/issues/431)
- event.preventDefault();
- $target = $target.find("input");
- $target.prop("checked", !$target.prop("checked"));
- }
- var checked = $target.prop('checked') || false;
-
- if (this.lastToggledInput !== null && this.lastToggledInput !== $target)
- { // Make sure we actually have a range
- var from = this.$ul.find("li:visible").index($target.parents("li"));
- var to = this.$ul.find("li:visible").index(this.lastToggledInput.parents("li"));
-
- if (from > to)
- { // Swap the indices
- var tmp = to;
- to = from;
- from = tmp;
- }
-
- // Make sure we grab all elements since slice excludes the last index
- ++to;
-
- // Change the checkboxes and underlying options
- var range = this.$ul.find("li").not(".multiselect-filter-hidden").slice(from, to).find("input");
-
- range.prop('checked', checked);
-
- if (this.options.selectedClass)
- {
- range.closest('li')
- .toggleClass(this.options.selectedClass, checked);
- }
-
- for (var i = 0, j = range.length; i < j; i++)
- {
- var $checkbox = $(range[i]);
-
- var $option = this.getOptionByValue($checkbox.val());
-
- $option.prop('selected', checked);
- }
- }
-
- // Trigger the select "change" event
- $target.trigger("change");
- }
-
- // Remembers last clicked option
- if ($target.is("input") && !$target.closest("li").is(".multiselect-item"))
- {
- this.lastToggledInput = $target;
- }
-
- $target.blur();
- }, this));
-
- // Keyboard support.
- this.$container.off('keydown.multiselect').on('keydown.multiselect', $.proxy(function (event)
- {
- if ($('input[type="text"]', this.$container).is(':focus'))
- {
- return;
- }
-
- if (event.keyCode === 9 && this.$container.hasClass('open'))
- {
- this.$button.click();
- }
- else
- {
- var $items = $(this.$container).find("li:not(.divider):not(.disabled) a").filter(":visible");
-
- if (!$items.length)
- {
- return;
- }
-
- var index = $items.index($items.filter(':focus'));
-
- // Navigation up.
- if (event.keyCode === 38 && index > 0)
- {
- index--;
- }
- // Navigate down.
- else if (event.keyCode === 40 && index < $items.length - 1)
- {
- index++;
- }
- else if (!~index)
- {
- index = 0;
- }
-
- var $current = $items.eq(index);
- $current.focus();
-
- if (event.keyCode === 32 || event.keyCode === 13)
- {
- var $checkbox = $current.find('input');
-
- $checkbox.prop("checked", !$checkbox.prop("checked"));
- $checkbox.change();
- }
-
- event.stopPropagation();
- event.preventDefault();
- }
- }, this));
-
- if (this.options.enableClickableOptGroups && this.options.multiple)
- {
- $("li.multiselect-group input", this.$ul).on("change", $.proxy(function (event)
- {
- event.stopPropagation();
-
- var $target = $(event.target);
- var checked = $target.prop('checked') || false;
-
- var $li = $(event.target).closest('li');
- var $group = $li.nextUntil("li.multiselect-group")
- .not('.multiselect-filter-hidden')
- .not('.disabled');
-
- var $inputs = $group.find("input");
-
- var values = [];
- var $options = [];
-
- if (this.options.selectedClass)
- {
- if (checked)
- {
- $li.addClass(this.options.selectedClass);
- }
- else
- {
- $li.removeClass(this.options.selectedClass);
- }
- }
-
- $.each($inputs, $.proxy(function (index, input)
- {
- var value = $(input).val();
- var $option = this.getOptionByValue(value);
-
- if (checked)
- {
- $(input).prop('checked', true);
- $(input).closest('li')
- .addClass(this.options.selectedClass);
-
- $option.prop('selected', true);
- }
- else
- {
- $(input).prop('checked', false);
- $(input).closest('li')
- .removeClass(this.options.selectedClass);
-
- $option.prop('selected', false);
- }
-
- $options.push(this.getOptionByValue(value));
- }, this))
-
- // Cannot use select or deselect here because it would call updateOptGroups again.
-
- this.options.onChange($options, checked);
-
- this.$select.change();
- this.updateButtonText();
- this.updateSelectAll();
- }, this));
- }
-
- if (this.options.enableCollapsibleOptGroups && this.options.multiple)
- {
- $("li.multiselect-group .caret-container", this.$ul).on("click", $.proxy(function (event)
- {
- var $li = $(event.target).closest('li');
- var $inputs = $li.nextUntil("li.multiselect-group")
- .not('.multiselect-filter-hidden');
-
- var visible = true;
- $inputs.each(function ()
- {
- visible = visible && !$(this).hasClass('multiselect-collapsible-hidden');
- });
-
- if (visible)
- {
- $inputs.hide()
- .addClass('multiselect-collapsible-hidden');
- }
- else
- {
- $inputs.show()
- .removeClass('multiselect-collapsible-hidden');
- }
- }, this));
-
- $("li.multiselect-all", this.$ul).css('background', '#f3f3f3').css('border-bottom', '1px solid #eaeaea');
- $("li.multiselect-all > a > label.checkbox", this.$ul).css('padding', '3px 20px 3px 35px');
- $("li.multiselect-group > a > input", this.$ul).css('margin', '4px 0px 5px -20px');
- }
- },
-
- /**
- * Create an option using the given select option.
- *
- * @param {jQuery} element
- */
- createOptionValue: function (element)
- {
- var $element = $(element);
- if ($element.is(':selected'))
- {
- $element.prop('selected', true);
- }
-
- // Support the label attribute on options.
- var label = this.options.optionLabel(element);
- var classes = this.options.optionClass(element);
- var value = $element.val();
- var inputType = this.options.multiple ? "checkbox" : "radio";
-
- var $li = $(this.options.templates.li);
- var $label = $('label', $li);
- $label.addClass(inputType);
- $label.attr("title", label);
- $li.addClass(classes);
-
- // Hide all children items when collapseOptGroupsByDefault is true
- if (this.options.collapseOptGroupsByDefault && $(element).parent().prop("tagName").toLowerCase() === "optgroup")
- {
- $li.addClass("multiselect-collapsible-hidden");
- $li.hide();
- }
-
- if (this.options.enableHTML)
- {
- $label.html(" " + label);
- }
- else
- {
- $label.text(" " + label);
- }
-
- var $checkbox = $('<input/>').attr('type', inputType);
-
- var name = this.options.checkboxName($element);
- if (name)
- {
- $checkbox.attr('name', name);
- }
-
- $label.prepend($checkbox);
-
- var selected = $element.prop('selected') || false;
- $checkbox.val(value);
-
- if (value === this.options.selectAllValue)
- {
- $li.addClass("multiselect-item multiselect-all");
- $checkbox.parent().parent()
- .addClass('multiselect-all');
- }
-
- $label.attr('title', $element.attr('title'));
-
- this.$ul.append($li);
-
- if ($element.is(':disabled'))
- {
- $checkbox.attr('disabled', 'disabled')
- .prop('disabled', true)
- .closest('a')
- .attr("tabindex", "-1")
- .closest('li')
- .addClass('disabled');
- }
-
- $checkbox.prop('checked', selected);
-
- if (selected && this.options.selectedClass)
- {
- $checkbox.closest('li')
- .addClass(this.options.selectedClass);
- }
- },
-
- /**
- * Creates a divider using the given select option.
- *
- * @param {jQuery} element
- */
- createDivider: function (element)
- {
- var $divider = $(this.options.templates.divider);
- this.$ul.append($divider);
- },
-
- /**
- * Creates an optgroup.
- *
- * @param {jQuery} group
- */
- createOptgroup: function (group)
- {
- var label = $(group).attr("label");
- var value = $(group).attr("value");
- var $li = $('<li class="multiselect-item multiselect-group"><a href="javascript:void(0);"><label><b></b></label></a></li>');
-
- var classes = this.options.optionClass(group);
- $li.addClass(classes);
-
- if (this.options.enableHTML)
- {
- $('label b', $li).html(" " + label);
- }
- else
- {
- $('label b', $li).text(" " + label);
- }
-
- if (this.options.enableCollapsibleOptGroups && this.options.multiple)
- {
- $('a', $li).append('<span class="caret-container"><b class="caret"></b></span>');
- }
-
- if (this.options.enableClickableOptGroups && this.options.multiple)
- {
- $('a label', $li).prepend('<input type="checkbox" value="' + value + '"/>');
- }
-
- if ($(group).is(':disabled'))
- {
- $li.addClass('disabled');
- }
-
- this.$ul.append($li);
-
- $("option", group).each($.proxy(function ($, group)
- {
- this.createOptionValue(group);
- }, this))
- },
-
- /**
- * Build the reset.
- *
- */
- buildReset: function ()
- {
- if (this.options.includeResetOption)
- {
-
- // Check whether to add a divider after the reset.
- if (this.options.includeResetDivider)
- {
- this.$ul.prepend($(this.options.templates.divider));
- }
-
- var $resetButton = $(this.options.templates.resetButton);
-
- if (this.options.enableHTML)
- {
- $('a', $resetButton).html(this.options.resetText);
- }
- else
- {
- $('a', $resetButton).text(this.options.resetText);
- }
-
- $('a', $resetButton).click($.proxy(function ()
- {
- this.clearSelection();
- }, this));
-
- this.$ul.prepend($resetButton);
- }
- },
-
- /**
- * Build the select all.
- *
- * Checks if a select all has already been created.
- */
- buildSelectAll: function ()
- {
- if (typeof this.options.selectAllValue === 'number')
- {
- this.options.selectAllValue = this.options.selectAllValue.toString();
- }
-
- var alreadyHasSelectAll = this.hasSelectAll();
-
- if (!alreadyHasSelectAll && this.options.includeSelectAllOption && this.options.multiple
- && $('option', this.$select).length > this.options.includeSelectAllIfMoreThan)
- {
-
- // Check whether to add a divider after the select all.
- if (this.options.includeSelectAllDivider)
- {
- this.$ul.prepend($(this.options.templates.divider));
- }
-
- var $li = $(this.options.templates.li);
- $('label', $li).addClass("checkbox");
-
- if (this.options.enableHTML)
- {
- $('label', $li).html(" " + this.options.selectAllText);
- }
- else
- {
- $('label', $li).text(" " + this.options.selectAllText);
- }
-
- if (this.options.selectAllName)
- {
- $('label', $li).prepend('<input type="checkbox" name="' + this.options.selectAllName + '" />');
- }
- else
- {
- $('label', $li).prepend('<input type="checkbox" />');
- }
-
- var $checkbox = $('input', $li);
- $checkbox.val(this.options.selectAllValue);
-
- $li.addClass("multiselect-item multiselect-all");
- $checkbox.parent().parent()
- .addClass('multiselect-all');
-
- this.$ul.prepend($li);
-
- $checkbox.prop('checked', false);
- }
- },
-
- /**
- * Builds the filter.
- */
- buildFilter: function ()
- {
-
- // Build filter if filtering OR case insensitive filtering is enabled and the number of options exceeds (or equals) enableFilterLength.
- if (this.options.enableFiltering || this.options.enableCaseInsensitiveFiltering)
- {
- var enableFilterLength = Math.max(this.options.enableFiltering, this.options.enableCaseInsensitiveFiltering);
-
- if (this.$select.find('option').length >= enableFilterLength)
- {
-
- this.$filter = $(this.options.templates.filter);
- $('input', this.$filter).attr('placeholder', this.options.filterPlaceholder);
-
- // Adds optional filter clear button
- if (this.options.includeFilterClearBtn)
- {
- var clearBtn = $(this.options.templates.filterClearBtn);
- clearBtn.on('click', $.proxy(function (event)
- {
- clearTimeout(this.searchTimeout);
-
- this.query = '';
- this.$filter.find('.multiselect-search').val('');
- $('li', this.$ul).show().removeClass('multiselect-filter-hidden');
-
- this.updateSelectAll();
-
- if (this.options.enableClickableOptGroups && this.options.multiple)
- {
- this.updateOptGroups();
- }
-
- }, this));
- this.$filter.find('.input-group').append(clearBtn);
- }
-
- this.$ul.prepend(this.$filter);
-
- this.$filter.val(this.query).on('click', function (event)
- {
- event.stopPropagation();
- }).on('input keydown', $.proxy(function (event)
- {
- // Cancel enter key default behaviour
- if (event.which === 13)
- {
- event.preventDefault();
- }
-
- // This is useful to catch "keydown" events after the browser has updated the control.
- clearTimeout(this.searchTimeout);
-
- this.searchTimeout = this.asyncFunction($.proxy(function ()
- {
-
- if (this.query !== event.target.value)
- {
- this.query = event.target.value;
-
- var currentGroup, currentGroupVisible;
- $.each($('li', this.$ul), $.proxy(function (index, element)
- {
- var value = $('input', element).length > 0 ? $('input', element).val() : "";
- var text = $('label', element).text();
-
- var filterCandidate = '';
- if ((this.options.filterBehavior === 'text'))
- {
- filterCandidate = text;
- }
- else if ((this.options.filterBehavior === 'value'))
- {
- filterCandidate = value;
- }
- else if (this.options.filterBehavior === 'both')
- {
- filterCandidate = text + '\n' + value;
- }
-
- if (value !== this.options.selectAllValue && text)
- {
-
- // By default lets assume that element is not
- // interesting for this search.
- var showElement = false;
-
- if (this.options.enableCaseInsensitiveFiltering)
- {
- filterCandidate = filterCandidate.toLowerCase();
- this.query = this.query.toLowerCase();
- }
-
- if (this.options.enableFullValueFiltering && this.options.filterBehavior !== 'both')
- {
- var valueToMatch = filterCandidate.trim().substring(0, this.query.length);
- if (this.query.indexOf(valueToMatch) > -1)
- {
- showElement = true;
- }
- }
- else if (filterCandidate.indexOf(this.query) > -1)
- {
- showElement = true;
- }
-
- // Toggle current element (group or group item) according to showElement boolean.
- if (!showElement)
- {
- $(element).css('display', 'none');
- $(element).addClass('multiselect-filter-hidden');
- }
- if (showElement)
- {
- $(element).css('display', 'block');
- $(element).removeClass('multiselect-filter-hidden');
- }
-
- // Differentiate groups and group items.
- if ($(element).hasClass('multiselect-group'))
- {
- // Remember group status.
- currentGroup = element;
- currentGroupVisible = showElement;
- }
- else
- {
- // Show group name when at least one of its items is visible.
- if (showElement)
- {
- $(currentGroup).show()
- .removeClass('multiselect-filter-hidden');
- }
-
- // Show all group items when group name satisfies filter.
- if (!showElement && currentGroupVisible)
- {
- $(element).show()
- .removeClass('multiselect-filter-hidden');
- }
- }
- }
- }, this));
- }
-
- this.updateSelectAll();
-
- if (this.options.enableClickableOptGroups && this.options.multiple)
- {
- this.updateOptGroups();
- }
-
- this.options.onFiltering(event.target);
-
- }, this), 300, this);
- }, this));
- }
- }
- },
-
- /**
- * Unbinds the whole plugin.
- */
- destroy: function ()
- {
- this.$container.remove();
- this.$select.show();
-
- // reset original state
- this.$select.prop('disabled', this.options.wasDisabled);
-
- this.$select.data('multiselect', null);
- },
-
- /**
- * Refreshs the multiselect based on the selected options of the select.
- */
- refresh: function ()
- {
- var inputs = {};
- $('li input', this.$ul).each(function ()
- {
- inputs[$(this).val()] = $(this);
- });
-
- $('option', this.$select).each($.proxy(function (index, element)
- {
- var $elem = $(element);
- var $input = inputs[$(element).val()];
-
- if ($elem.is(':selected'))
- {
- $input.prop('checked', true);
-
- if (this.options.selectedClass)
- {
- $input.closest('li')
- .addClass(this.options.selectedClass);
- }
- }
- else
- {
- $input.prop('checked', false);
-
- if (this.options.selectedClass)
- {
- $input.closest('li')
- .removeClass(this.options.selectedClass);
- }
- }
-
- if ($elem.is(":disabled"))
- {
- $input.attr('disabled', 'disabled')
- .prop('disabled', true)
- .closest('li')
- .addClass('disabled');
- }
- else
- {
- $input.prop('disabled', false)
- .closest('li')
- .removeClass('disabled');
- }
- }, this));
-
- this.updateButtonText();
- this.updateSelectAll();
-
- if (this.options.enableClickableOptGroups && this.options.multiple)
- {
- this.updateOptGroups();
- }
- },
-
- /**
- * Select all options of the given values.
- *
- * If triggerOnChange is set to true, the on change event is triggered if
- * and only if one value is passed.
- *
- * @param {Array} selectValues
- * @param {Boolean} triggerOnChange
- */
- select: function (selectValues, triggerOnChange)
- {
- if (!$.isArray(selectValues))
- {
- selectValues = [selectValues];
- }
-
- for (var i = 0; i < selectValues.length; i++)
- {
- var value = selectValues[i];
-
- if (value === null || value === undefined)
- {
- continue;
- }
-
- var $option = this.getOptionByValue(value);
- var $checkbox = this.getInputByValue(value);
-
- if ($option === undefined || $checkbox === undefined)
- {
- continue;
- }
-
- if (!this.options.multiple)
- {
- this.deselectAll(false);
- }
-
- if (this.options.selectedClass)
- {
- $checkbox.closest('li')
- .addClass(this.options.selectedClass);
- }
-
- $checkbox.prop('checked', true);
- $option.prop('selected', true);
-
- if (triggerOnChange)
- {
- this.options.onChange($option, true);
- }
- }
-
- this.updateButtonText();
- this.updateSelectAll();
-
- if (this.options.enableClickableOptGroups && this.options.multiple)
- {
- this.updateOptGroups();
- }
- },
-
- /**
- * Clears all selected items.
- */
- clearSelection: function ()
- {
- this.deselectAll(false);
- this.updateButtonText();
- this.updateSelectAll();
-
- if (this.options.enableClickableOptGroups && this.options.multiple)
- {
- this.updateOptGroups();
- }
- },
-
- /**
- * Deselects all options of the given values.
- *
- * If triggerOnChange is set to true, the on change event is triggered, if
- * and only if one value is passed.
- *
- * @param {Array} deselectValues
- * @param {Boolean} triggerOnChange
- */
- deselect: function (deselectValues, triggerOnChange)
- {
- if (!$.isArray(deselectValues))
- {
- deselectValues = [deselectValues];
- }
-
- for (var i = 0; i < deselectValues.length; i++)
- {
- var value = deselectValues[i];
-
- if (value === null || value === undefined)
- {
- continue;
- }
-
- var $option = this.getOptionByValue(value);
- var $checkbox = this.getInputByValue(value);
-
- if ($option === undefined || $checkbox === undefined)
- {
- continue;
- }
-
- if (this.options.selectedClass)
- {
- $checkbox.closest('li')
- .removeClass(this.options.selectedClass);
- }
-
- $checkbox.prop('checked', false);
- $option.prop('selected', false);
-
- if (triggerOnChange)
- {
- this.options.onChange($option, false);
- }
- }
-
- this.updateButtonText();
- this.updateSelectAll();
-
- if (this.options.enableClickableOptGroups && this.options.multiple)
- {
- this.updateOptGroups();
- }
- },
-
- /**
- * Selects all enabled & visible options.
- *
- * If justVisible is true or not specified, only visible options are selected.
- *
- * @param {Boolean} justVisible
- * @param {Boolean} triggerOnSelectAll
- */
- selectAll: function (justVisible, triggerOnSelectAll)
- {
-
- var justVisible = typeof justVisible === 'undefined' ? true : justVisible;
- var allLis = $("li:not(.divider):not(.disabled):not(.multiselect-group)", this.$ul);
- var visibleLis = $("li:not(.divider):not(.disabled):not(.multiselect-group):not(.multiselect-filter-hidden):not(.multiselect-collapisble-hidden)", this.$ul).filter(':visible');
-
- if (justVisible)
- {
- $('input:enabled', visibleLis).prop('checked', true);
- visibleLis.addClass(this.options.selectedClass);
-
- $('input:enabled', visibleLis).each($.proxy(function (index, element)
- {
- var value = $(element).val();
- var option = this.getOptionByValue(value);
- $(option).prop('selected', true);
- }, this));
- }
- else
- {
- $('input:enabled', allLis).prop('checked', true);
- allLis.addClass(this.options.selectedClass);
-
- $('input:enabled', allLis).each($.proxy(function (index, element)
- {
- var value = $(element).val();
- var option = this.getOptionByValue(value);
- $(option).prop('selected', true);
- }, this));
- }
-
- $('li input[value="' + this.options.selectAllValue + '"]', this.$ul).prop('checked', true);
-
- if (this.options.enableClickableOptGroups && this.options.multiple)
- {
- this.updateOptGroups();
- }
-
- if (triggerOnSelectAll)
- {
- this.options.onSelectAll();
- }
- },
-
- /**
- * Deselects all options.
- *
- * If justVisible is true or not specified, only visible options are deselected.
- *
- * @param {Boolean} justVisible
- */
- deselectAll: function (justVisible, triggerOnDeselectAll)
- {
-
- var justVisible = typeof justVisible === 'undefined' ? true : justVisible;
- var allLis = $("li:not(.divider):not(.disabled):not(.multiselect-group)", this.$ul);
- var visibleLis = $("li:not(.divider):not(.disabled):not(.multiselect-group):not(.multiselect-filter-hidden):not(.multiselect-collapisble-hidden)", this.$ul).filter(':visible');
-
- if (justVisible)
- {
- $('input[type="checkbox"]:enabled', visibleLis).prop('checked', false);
- visibleLis.removeClass(this.options.selectedClass);
-
- $('input[type="checkbox"]:enabled', visibleLis).each($.proxy(function (index, element)
- {
- var value = $(element).val();
- var option = this.getOptionByValue(value);
- $(option).prop('selected', false);
- }, this));
- }
- else
- {
- $('input[type="checkbox"]:enabled', allLis).prop('checked', false);
- allLis.removeClass(this.options.selectedClass);
-
- $('input[type="checkbox"]:enabled', allLis).each($.proxy(function (index, element)
- {
- var value = $(element).val();
- var option = this.getOptionByValue(value);
- $(option).prop('selected', false);
- }, this));
- }
-
- $('li input[value="' + this.options.selectAllValue + '"]', this.$ul).prop('checked', false);
-
- if (this.options.enableClickableOptGroups && this.options.multiple)
- {
- this.updateOptGroups();
- }
-
- if (triggerOnDeselectAll)
- {
- this.options.onDeselectAll();
- }
- },
-
- /**
- * Rebuild the plugin.
- *
- * Rebuilds the dropdown, the filter and the select all option.
- */
- rebuild: function ()
- {
- this.$ul.html('');
-
- // Important to distinguish between radios and checkboxes.
- this.options.multiple = this.$select.attr('multiple') === "multiple";
-
- this.buildSelectAll();
- this.buildDropdownOptions();
- this.buildFilter();
-
- this.updateButtonText();
- this.updateSelectAll(true);
-
- if (this.options.enableClickableOptGroups && this.options.multiple)
- {
- this.updateOptGroups();
- }
-
- if (this.options.disableIfEmpty && $('option', this.$select).length <= 0)
- {
- this.disable();
- }
- else
- {
- this.enable();
- }
-
- if (this.options.dropRight)
- {
- this.$ul.addClass('pull-right');
- }
- },
-
- /**
- * The provided data will be used to build the dropdown.
- */
- dataprovider: function (dataprovider)
- {
-
- var groupCounter = 0;
- var $select = this.$select.empty();
-
- $.each(dataprovider, function (index, option)
- {
- var $tag;
-
- if ($.isArray(option.children))
- { // create optiongroup tag
- groupCounter++;
-
- $tag = $('<optgroup/>').attr({
- label: option.label || 'Group ' + groupCounter,
- disabled: !!option.disabled,
- value: option.value
- });
-
- forEach(option.children, function (subOption)
- { // add children option tags
- var attributes = {
- value: subOption.value,
- label: subOption.label || subOption.value,
- title: subOption.title,
- selected: !!subOption.selected,
- disabled: !!subOption.disabled
- };
-
- //Loop through attributes object and add key-value for each attribute
- for (var key in subOption.attributes)
- {
- attributes['data-' + key] = subOption.attributes[key];
- }
- //Append original attributes + new data attributes to option
- $tag.append($('<option/>').attr(attributes));
- });
- }
- else
- {
-
- var attributes = {
- 'value': option.value,
- 'label': option.label || option.value,
- 'title': option.title,
- 'class': option['class'],
- 'selected': !!option['selected'],
- 'disabled': !!option['disabled']
- };
- //Loop through attributes object and add key-value for each attribute
- for (var key in option.attributes)
- {
- attributes['data-' + key] = option.attributes[key];
- }
- //Append original attributes + new data attributes to option
- $tag = $('<option/>').attr(attributes);
-
- $tag.text(option.label || option.value);
- }
-
- $select.append($tag);
- });
-
- this.rebuild();
- },
-
- /**
- * Enable the multiselect.
- */
- enable: function ()
- {
- this.$select.prop('disabled', false);
- this.$button.prop('disabled', false)
- .removeClass('disabled');
- },
-
- /**
- * Disable the multiselect.
- */
- disable: function ()
- {
- this.$select.prop('disabled', true);
- this.$button.prop('disabled', true)
- .addClass('disabled');
- },
-
- /**
- * Set the options.
- *
- * @param {Array} options
- */
- setOptions: function (options)
- {
- this.options = this.mergeOptions(options);
- },
-
- /**
- * Merges the given options with the default options.
- *
- * @param {Array} options
- * @returns {Array}
- */
- mergeOptions: function (options)
- {
- return $.extend(true, {}, this.defaults, this.options, options);
- },
-
- /**
- * Checks whether a select all checkbox is present.
- *
- * @returns {Boolean}
- */
- hasSelectAll: function ()
- {
- return $('li.multiselect-all', this.$ul).length > 0;
- },
-
- /**
- * Update opt groups.
- */
- updateOptGroups: function ()
- {
- var $groups = $('li.multiselect-group', this.$ul)
- var selectedClass = this.options.selectedClass;
-
- $groups.each(function ()
- {
- var $options = $(this).nextUntil('li.multiselect-group')
- .not('.multiselect-filter-hidden')
- .not('.disabled');
-
- var checked = true;
- $options.each(function ()
- {
- var $input = $('input', this);
-
- if (!$input.prop('checked'))
- {
- checked = false;
- }
- });
-
- if (selectedClass)
- {
- if (checked)
- {
- $(this).addClass(selectedClass);
- }
- else
- {
- $(this).removeClass(selectedClass);
- }
- }
-
- $('input', this).prop('checked', checked);
- });
- },
-
- /**
- * Updates the select all checkbox based on the currently displayed and selected checkboxes.
- */
- updateSelectAll: function (notTriggerOnSelectAll)
- {
- if (this.hasSelectAll())
- {
- var allBoxes = $("li:not(.multiselect-item):not(.multiselect-filter-hidden):not(.multiselect-group):not(.disabled) input:enabled", this.$ul);
- var allBoxesLength = allBoxes.length;
- var checkedBoxesLength = allBoxes.filter(":checked").length;
- var selectAllLi = $("li.multiselect-all", this.$ul);
- var selectAllInput = selectAllLi.find("input");
-
- if (checkedBoxesLength > 0 && checkedBoxesLength === allBoxesLength)
- {
- selectAllInput.prop("checked", true);
- selectAllLi.addClass(this.options.selectedClass);
- }
- else
- {
- selectAllInput.prop("checked", false);
- selectAllLi.removeClass(this.options.selectedClass);
- }
- }
- },
-
- /**
- * Update the button text and its title based on the currently selected options.
- */
- updateButtonText: function ()
- {
- var options = this.getSelected();
-
- // First update the displayed button text.
- if (this.options.enableHTML)
- {
- $('.multiselect .multiselect-selected-text', this.$container).html(this.options.buttonText(options, this.$select));
- }
- else
- {
- $('.multiselect .multiselect-selected-text', this.$container).text(this.options.buttonText(options, this.$select));
- }
-
- // Now update the title attribute of the button.
- $('.multiselect', this.$container).attr('title', this.options.buttonTitle(options, this.$select));
- },
-
- /**
- * Get all selected options.
- *
- * @returns {jQUery}
- */
- getSelected: function ()
- {
- return $('option', this.$select).filter(":selected");
- },
-
- /**
- * Gets a select option by its value.
- *
- * @param {String} value
- * @returns {jQuery}
- */
- getOptionByValue: function (value)
- {
-
- var options = $('option', this.$select);
- var valueToCompare = value.toString();
-
- for (var i = 0; i < options.length; i = i + 1)
- {
- var option = options[i];
- if (option.value === valueToCompare)
- {
- return $(option);
- }
- }
- },
-
- /**
- * Get the input (radio/checkbox) by its value.
- *
- * @param {String} value
- * @returns {jQuery}
- */
- getInputByValue: function (value)
- {
-
- var checkboxes = $('li input:not(.multiselect-search)', this.$ul);
- var valueToCompare = value.toString();
-
- for (var i = 0; i < checkboxes.length; i = i + 1)
- {
- var checkbox = checkboxes[i];
- if (checkbox.value === valueToCompare)
- {
- return $(checkbox);
- }
- }
- },
-
- /**
- * Used for knockout integration.
- */
- updateOriginalOptions: function ()
- {
- this.originalOptions = this.$select.clone()[0].options;
- },
-
- asyncFunction: function (callback, timeout, self)
- {
- var args = Array.prototype.slice.call(arguments, 3);
- return setTimeout(function ()
- {
- callback.apply(self || window, args);
- }, timeout);
- },
-
- setAllSelectedText: function (allSelectedText)
- {
- this.options.allSelectedText = allSelectedText;
- this.updateButtonText();
- }
- };
-
- $.fn.multiselect = function (option, parameter, extraOptions)
- {
- return this.each(function ()
- {
- var data = $(this).data('multiselect');
- var options = typeof option === 'object' && option;
-
- // Initialize the multiselect.
- if (!data)
- {
- data = new Multiselect(this, options);
- $(this).data('multiselect', data);
- }
-
- // Call multiselect method.
- if (typeof option === 'string')
- {
- data[option](parameter, extraOptions);
-
- if (option === 'destroy')
- {
- $(this).data('multiselect', false);
- }
- }
- });
- };
-
- $.fn.multiselect.Constructor = Multiselect;
-
- $(function ()
- {
- $("select[data-role=multiselect]").multiselect();
- });
-
-});
\ No newline at end of file
diff --git a/ckanext/odsh/templates/base.html b/ckanext/odsh/templates/base.html
index 94f9a9b5cb67eeec080f47bbb0e2e000e29d3d79..00ff4088891cb6472d65ce4f83a1c0b359b75ad5 100644
--- a/ckanext/odsh/templates/base.html
+++ b/ckanext/odsh/templates/base.html
@@ -1,11 +1,13 @@
{% ckan_extends %}
+{% block scripts %}
+ {{ super() }}
+ {% asset 'ckanext-odsh/odsh_base_script' %}
+{% endblock scripts %}
{% block styles %}
-{{ super() }}
-<link rel="stylesheet" href="/odsh.css?refresh={{ range(1,10000) | random }}" />
-<link rel="stylesheet" href="/odsh_header.css?refresh={{ range(1,10000) | random }}" />
-<link rel="stylesheet" href="/bootstrap-multiselect.css" />
-{% endblock %}
+ {{ super() }}
+ {% asset 'ckanext-odsh/odsh_base_style' %}
+{% endblock styles %}
{% block head_extras %}
{{ super() }}
diff --git a/ckanext/odsh/templates/header.html b/ckanext/odsh/templates/header.html
index d03b6ba154da646631e9f9a5039d5ee3776cc1c8..2a2d0137e797c06035f52fd0f64aca02ec86d3bf 100644
--- a/ckanext/odsh/templates/header.html
+++ b/ckanext/odsh/templates/header.html
@@ -1,4 +1,9 @@
+{% block scripts %}
+ {{ super() }}
+ {% asset 'ckanext-odsh/tpsh_toggle_menu' %}
+{% endblock scripts %}
+
{% block header_wrapper %}
{% block header_account %}
<header class="navbar navbar-static-top masthead">
@@ -54,6 +59,7 @@
<a href="/harvest">Harvester</a>
</li>
<li class='{{clazz}}'>
+ {% link_for _('Upload'), controller='dataset', action='new', group=c.group_dict.id, class_='text' %}
</li>
{% endif %}
{% if c.userobj %}