diff --git a/templates/admin/default/assets/js/bootstrap-select/bootstrap-select.js b/templates/admin/default/assets/js/bootstrap-select/bootstrap-select.js
new file mode 100644
index 000000000..dcfd633a0
--- /dev/null
+++ b/templates/admin/default/assets/js/bootstrap-select/bootstrap-select.js
@@ -0,0 +1,709 @@
+/*!
+ * bootstrap-select v1.3.1
+ * http://silviomoreto.github.io/bootstrap-select/
+ *
+ * Copyright 2013 bootstrap-select
+ * Licensed under the MIT license
+ */
+
+!function($) {
+
+ "use strict";
+
+ $.expr[":"].icontains = $.expr.createPseudo(function(arg) {
+ return function( elem ) {
+ return $(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0;
+ };
+ });
+
+ var Selectpicker = function(element, options, e) {
+ if (e) {
+ e.stopPropagation();
+ e.preventDefault();
+ }
+ this.$element = $(element);
+ this.$newElement = null;
+ this.$button = null;
+ this.$menu = null;
+
+ //Merge defaults, options and data-attributes to make our options
+ this.options = $.extend({}, $.fn.selectpicker.defaults, this.$element.data(), typeof options == 'object' && options);
+
+ //If we have no title yet, check the attribute 'title' (this is missed by jq as its not a data-attribute
+ if (this.options.title == null) {
+ this.options.title = this.$element.attr('title');
+ }
+
+ //Expose public methods
+ this.val = Selectpicker.prototype.val;
+ this.render = Selectpicker.prototype.render;
+ this.refresh = Selectpicker.prototype.refresh;
+ this.setStyle = Selectpicker.prototype.setStyle;
+ this.selectAll = Selectpicker.prototype.selectAll;
+ this.deselectAll = Selectpicker.prototype.deselectAll;
+ this.init();
+ };
+
+ Selectpicker.prototype = {
+
+ constructor: Selectpicker,
+
+ init: function(e) {
+ this.$element.hide();
+ this.multiple = this.$element.prop('multiple');
+ var id = this.$element.attr('id');
+ this.$newElement = this.createView();
+ this.$element.after(this.$newElement);
+ this.$menu = this.$newElement.find('> .dropdown-menu');
+ this.$button = this.$newElement.find('> button');
+ this.$searchbox = this.$newElement.find('input');
+
+ if (id !== undefined) {
+ var that = this;
+ this.$button.attr('data-id', id);
+ $('label[for="' + id + '"]').click(function(e) {
+ e.preventDefault();
+ that.$button.focus();
+ });
+ }
+
+ this.checkDisabled();
+ this.checkTabIndex();
+ this.clickListener();
+ this.liveSearchListener();
+ this.render();
+ this.liHeight();
+ this.setStyle();
+ this.setWidth();
+ if (this.options.container) {
+ this.selectPosition();
+ }
+ this.$menu.data('this', this);
+ this.$newElement.data('this', this);
+ },
+
+ createDropdown: function() {
+ //If we are multiple, then add the show-tick class by default
+ var multiple = this.multiple ? ' show-tick' : '';
+ var header = this.options.header ? '
' + this.options.header + '
' : '';
+ var searchbox = this.options.liveSearch ? '' : '';
+ var drop =
+ "" +
+ "
" +
+ "" +
+ "
";
+
+ return $(drop);
+ },
+
+ createView: function() {
+ var $drop = this.createDropdown();
+ var $li = this.createLi();
+ $drop.find('ul').append($li);
+ return $drop;
+ },
+
+ reloadLi: function() {
+ //Remove all children.
+ this.destroyLi();
+ //Re build
+ var $li = this.createLi();
+ this.$menu.find('ul').append( $li );
+ },
+
+ destroyLi: function() {
+ this.$menu.find('li').remove();
+ },
+
+ createLi: function() {
+ var that = this,
+ _liA = [],
+ _liHtml = '';
+
+ this.$element.find('option').each(function(index) {
+ var $this = $(this);
+
+ //Get the class and text for the option
+ var optionClass = $this.attr("class") || '';
+ var inline = $this.attr("style") || '';
+ var text = $this.data('content') ? $this.data('content') : $this.html();
+ var subtext = $this.data('subtext') !== undefined ? '' + $this.data('subtext') + '' : '';
+ var icon = $this.data('icon') !== undefined ? ' ' : '';
+ if (icon !== '' && ($this.is(':disabled') || $this.parent().is(':disabled'))) {
+ icon = ''+icon+'';
+ }
+
+ if (!$this.data('content')) {
+ //Prepend any icon and append any subtext to the main text.
+ text = icon + '' + text + subtext + '';
+ }
+
+ if (that.options.hideDisabled && ($this.is(':disabled') || $this.parent().is(':disabled'))) {
+ _liA.push('');
+ } else if ($this.parent().is('optgroup') && $this.data('divider') != true) {
+ if ($this.index() == 0) {
+ //Get the opt group label
+ var label = $this.parent().attr('label');
+ var labelSubtext = $this.parent().data('subtext') !== undefined ? ''+$this.parent().data('subtext')+'' : '';
+ var labelIcon = $this.parent().data('icon') ? ' ' : '';
+ label = labelIcon + '' + label + labelSubtext + '';
+
+ if ($this[0].index != 0) {
+ _liA.push(
+ ''+
+ ''+label+''+
+ that.createA(text, "opt " + optionClass, inline )
+ );
+ } else {
+ _liA.push(
+ ''+label+''+
+ that.createA(text, "opt " + optionClass, inline ));
+ }
+ } else {
+ _liA.push(that.createA(text, "opt " + optionClass, inline ));
+ }
+ } else if ($this.data('divider') == true) {
+ _liA.push('');
+ } else if ($(this).data('hidden') == true) {
+ _liA.push('');
+ } else {
+ _liA.push(that.createA(text, optionClass, inline ));
+ }
+ });
+
+ $.each(_liA, function(i, item) {
+ _liHtml += "" + item + "";
+ });
+
+ //If we are not multiple, and we dont have a selected item, and we dont have a title, select the first element so something is set in the button
+ if (!this.multiple && this.$element.find('option:selected').length==0 && !this.options.title) {
+ this.$element.find('option').eq(0).prop('selected', true).attr('selected', 'selected');
+ }
+
+ return $(_liHtml);
+ },
+
+ createA: function(text, classes, inline) {
+ return '' +
+ text +
+ '' +
+ '';
+ },
+
+ render: function() {
+ var that = this;
+
+ //Update the LI to match the SELECT
+ this.$element.find('option').each(function(index) {
+ that.setDisabled(index, $(this).is(':disabled') || $(this).parent().is(':disabled') );
+ that.setSelected(index, $(this).is(':selected') );
+ });
+
+ var selectedItems = this.$element.find('option:selected').map(function(index,value) {
+ var $this = $(this);
+ var icon = $this.data('icon') && that.options.showIcon ? ' ' : '';
+ var subtext;
+ if (that.options.showSubtext && $this.attr('data-subtext') && !that.multiple) {
+ subtext = ' '+$this.data('subtext') +'';
+ } else {
+ subtext = '';
+ }
+ if ($this.data('content') && that.options.showContent) {
+ return $this.data('content');
+ } else if ($this.attr('title') != undefined) {
+ return $this.attr('title');
+ } else {
+ return icon + $this.html() + subtext;
+ }
+ }).toArray();
+
+ //Fixes issue in IE10 occurring when no default option is selected and at least one option is disabled
+ //Convert all the values into a comma delimited string
+ var title = !this.multiple ? selectedItems[0] : selectedItems.join(", ");
+
+ //If this is multi select, and the selectText type is count, the show 1 of 2 selected etc..
+ if (this.multiple && this.options.selectedTextFormat.indexOf('count') > -1) {
+ var max = this.options.selectedTextFormat.split(">");
+ var notDisabled = this.options.hideDisabled ? ':not([disabled])' : '';
+ if ( (max.length>1 && selectedItems.length > max[1]) || (max.length==1 && selectedItems.length>=2)) {
+ title = this.options.countSelectedText.replace('{0}', selectedItems.length).replace('{1}', this.$element.find('option:not([data-divider="true"]):not([data-hidden="true"])'+notDisabled).length);
+ }
+ }
+
+ //If we dont have a title, then use the default, or if nothing is set at all, use the not selected text
+ if (!title) {
+ title = this.options.title != undefined ? this.options.title : this.options.noneSelectedText;
+ }
+
+ this.$newElement.find('.filter-option').html(title);
+ },
+
+ setStyle: function(style, status) {
+ if (this.$element.attr('class')) {
+ this.$newElement.addClass(this.$element.attr('class').replace(/selectpicker|mobile-device/gi, ''));
+ }
+
+ var buttonClass = style ? style : this.options.style;
+
+ if (status == 'add') {
+ this.$button.addClass(buttonClass);
+ } else if (status == 'remove') {
+ this.$button.removeClass(buttonClass);
+ } else {
+ this.$button.removeClass(this.options.style);
+ this.$button.addClass(buttonClass);
+ }
+ },
+
+ liHeight: function() {
+ var selectClone = this.$newElement.clone();
+ selectClone.appendTo('body');
+ var $menuClone = selectClone.addClass('open').find('> .dropdown-menu');
+ var liHeight = $menuClone.find('li > a').outerHeight();
+ var headerHeight = this.options.header ? $menuClone.find('.popover-title').outerHeight() : 0;
+ selectClone.remove();
+ this.$newElement.data('liHeight', liHeight).data('headerHeight', headerHeight);
+ },
+
+ setSize: function() {
+ var that = this,
+ menu = this.$menu,
+ menuInner = menu.find('.inner'),
+ menuA = menuInner.find('li > a'),
+ selectHeight = this.$newElement.outerHeight(),
+ liHeight = this.$newElement.data('liHeight'),
+ headerHeight = this.$newElement.data('headerHeight'),
+ divHeight = menu.find('li .divider').outerHeight(true),
+ menuPadding = parseInt(menu.css('padding-top')) +
+ parseInt(menu.css('padding-bottom')) +
+ parseInt(menu.css('border-top-width')) +
+ parseInt(menu.css('border-bottom-width')),
+ notDisabled = this.options.hideDisabled ? ':not(.disabled)' : '',
+ $window = $(window),
+ menuExtras = menuPadding + parseInt(menu.css('margin-top')) + parseInt(menu.css('margin-bottom')) + 2,
+ menuHeight,
+ selectOffsetTop,
+ selectOffsetBot,
+ posVert = function() {
+ selectOffsetTop = that.$newElement.offset().top - $window.scrollTop();
+ selectOffsetBot = $window.height() - selectOffsetTop - selectHeight;
+ };
+ posVert();
+ if (this.options.header) menu.css('padding-top', 0);
+
+ if (this.options.size == 'auto') {
+ var getSize = function() {
+ var minHeight;
+ posVert();
+ menuHeight = selectOffsetBot - menuExtras;
+ that.$newElement.toggleClass('dropup', (selectOffsetTop > selectOffsetBot) && (menuHeight - menuExtras) < menu.height() && that.options.dropupAuto);
+ if (that.$newElement.hasClass('dropup')) {
+ menuHeight = selectOffsetTop - menuExtras;
+ }
+ if ((menu.find('li').length + menu.find('dt').length) > 3) {
+ minHeight = liHeight*3 + menuExtras - 2;
+ } else {
+ minHeight = 0;
+ }
+ menu.css({'max-height' : menuHeight + 'px', 'overflow' : 'hidden', 'min-height' : minHeight + 'px'});
+ menuInner.css({'max-height' : menuHeight - headerHeight- menuPadding + 'px', 'overflow-y' : 'auto', 'min-height' : minHeight - menuPadding + 'px'});
+ }
+ getSize();
+ $(window).resize(getSize);
+ $(window).scroll(getSize);
+ } else if (this.options.size && this.options.size != 'auto' && menu.find('li'+notDisabled).length > this.options.size) {
+ var optIndex = menu.find("li"+notDisabled+" > *").filter(':not(.div-contain)').slice(0,this.options.size).last().parent().index();
+ var divLength = menu.find("li").slice(0,optIndex + 1).find('.div-contain').length;
+ menuHeight = liHeight*this.options.size + divLength*divHeight + menuPadding;
+ this.$newElement.toggleClass('dropup', (selectOffsetTop > selectOffsetBot) && menuHeight < menu.height() && this.options.dropupAuto);
+ menu.css({'max-height' : menuHeight + headerHeight + 'px', 'overflow' : 'hidden'});
+ menuInner.css({'max-height' : menuHeight - menuPadding + 'px', 'overflow-y' : 'auto'});
+ }
+ },
+
+ setWidth: function() {
+ if (this.options.width == 'auto') {
+ this.$menu.css('min-width', '0');
+
+ // Get correct width if element hidden
+ var selectClone = this.$newElement.clone().appendTo('body');
+ var ulWidth = selectClone.find('> .dropdown-menu').css('width');
+ selectClone.remove();
+
+ this.$newElement.css('width', ulWidth);
+ } else if (this.options.width == 'fit') {
+ // Remove inline min-width so width can be changed from 'auto'
+ this.$menu.css('min-width', '');
+ this.$newElement.css('width', '').addClass('fit-width');
+ } else if (this.options.width) {
+ // Remove inline min-width so width can be changed from 'auto'
+ this.$menu.css('min-width', '');
+ this.$newElement.css('width', this.options.width);
+ } else {
+ // Remove inline min-width/width so width can be changed
+ this.$menu.css('min-width', '');
+ this.$newElement.css('width', '');
+ }
+ // Remove fit-width class if width is changed programmatically
+ if (this.$newElement.hasClass('fit-width') && this.options.width !== 'fit') {
+ this.$newElement.removeClass('fit-width');
+ }
+ },
+
+ selectPosition: function() {
+ var that = this,
+ drop = "",
+ $drop = $(drop),
+ pos,
+ actualHeight,
+ getPlacement = function($element) {
+ $drop.addClass($element.attr('class')).toggleClass('dropup', $element.hasClass('dropup'));
+ pos = $element.offset();
+ actualHeight = $element.hasClass('dropup') ? 0 : $element[0].offsetHeight;
+ $drop.css({'top' : pos.top + actualHeight, 'left' : pos.left, 'width' : $element[0].offsetWidth, 'position' : 'absolute'});
+ };
+ this.$newElement.on('click', function(e) {
+ getPlacement($(this));
+ $drop.appendTo(that.options.container);
+ $drop.toggleClass('open', !$(this).hasClass('open'));
+ $drop.append(that.$menu);
+ });
+ $(window).resize(function() {
+ getPlacement(that.$newElement);
+ });
+ $(window).on('scroll', function(e) {
+ getPlacement(that.$newElement);
+ });
+ $('html').on('click', function(e) {
+ if ($(e.target).closest(that.$newElement).length < 1) {
+ $drop.removeClass('open');
+ }
+ });
+ },
+
+ mobile: function() {
+ this.$element.addClass('mobile-device').appendTo(this.$newElement);
+ if (this.options.container) this.$menu.hide();
+ },
+
+ refresh: function() {
+ this.reloadLi();
+ this.render();
+ this.setWidth();
+ this.setStyle();
+ this.checkDisabled();
+ this.liHeight();
+ },
+
+ setSelected: function(index, selected) {
+ this.$menu.find('li').eq(index).toggleClass('selected', selected);
+ },
+
+ setDisabled: function(index, disabled) {
+ if (disabled) {
+ this.$menu.find('li').eq(index).addClass('disabled').find('a').attr('href','#').attr('tabindex',-1);
+ } else {
+ this.$menu.find('li').eq(index).removeClass('disabled').find('a').removeAttr('href').attr('tabindex',0);
+ }
+ },
+
+ isDisabled: function() {
+ return this.$element.is(':disabled');
+ },
+
+ checkDisabled: function() {
+ var that = this;
+ if (this.isDisabled()) {
+ this.$button.addClass('disabled');
+ this.$button.attr('tabindex','-1');
+ } else if (this.$button.hasClass('disabled')) {
+ this.$button.removeClass('disabled');
+ this.$button.removeAttr('tabindex');
+ }
+ this.$button.click(function() {
+ return !that.isDisabled();
+ });
+ },
+
+ checkTabIndex: function() {
+ if (this.$element.is('[tabindex]')) {
+ var tabindex = this.$element.attr("tabindex");
+ this.$button.attr('tabindex', tabindex);
+ }
+ },
+
+ clickListener: function() {
+ var that = this;
+
+ $('body').on('touchstart.dropdown', '.dropdown-menu', function(e) {
+ e.stopPropagation();
+ });
+
+ this.$newElement.on('click', function() {
+ that.setSize();
+ });
+
+ this.$menu.on('click', 'li a', function(e) {
+ var clickedIndex = $(this).parent().index(),
+ $this = $(this).parent(),
+ prevValue = that.$element.val();
+
+ //Dont close on multi choice menu
+ if (that.multiple) {
+ e.stopPropagation();
+ }
+
+ e.preventDefault();
+
+ //Dont run if we have been disabled
+ if (!that.isDisabled() && !$(this).parent().hasClass('disabled')) {
+ var $options = that.$element.find('option');
+ var $option = $options.eq(clickedIndex);
+
+ //Deselect all others if not multi select box
+ if (!that.multiple) {
+ $options.prop('selected', false);
+ $option.prop('selected', true);
+ }
+ //Else toggle the one we have chosen if we are multi select.
+ else {
+ var state = $option.prop('selected');
+
+ $option.prop('selected', !state);
+ }
+
+ that.$button.focus();
+
+ // Trigger select 'change'
+ if (prevValue != that.$element.val()) {
+ that.$element.change();
+ }
+ }
+ });
+
+ this.$menu.on('click', 'li.disabled a, li dt, li .div-contain, h3.popover-title', function(e) {
+ if (e.target == this) {
+ e.preventDefault();
+ e.stopPropagation();
+ that.$button.focus();
+ }
+ });
+
+ this.$searchbox.on('click', function(e) {
+ e.stopPropagation();
+ });
+
+ this.$element.change(function() {
+ that.render()
+ });
+ },
+
+ liveSearchListener: function() {
+ var that = this;
+
+ this.$newElement.on('click.dropdown.data-api', function(e){
+ if(that.options.liveSearch) {
+ setTimeout(function() {
+ that.$searchbox.focus();
+ }, 10);
+ }
+ });
+
+ this.$searchbox.on('input', function() {
+ that.$newElement.find('li').show().not(':icontains(' + that.$searchbox.val() + ')').hide();
+ });
+ },
+
+ val: function(value) {
+
+ if (value != undefined) {
+ this.$element.val( value );
+
+ this.$element.change();
+ return this.$element;
+ } else {
+ return this.$element.val();
+ }
+ },
+
+ selectAll: function() {
+ this.$element.find('option').prop('selected', true).attr('selected', 'selected');
+ this.render();
+ },
+
+ deselectAll: function() {
+ this.$element.find('option').prop('selected', false).removeAttr('selected');
+ this.render();
+ },
+
+ keydown: function(e) {
+ var $this,
+ $items,
+ $parent,
+ index,
+ next,
+ first,
+ last,
+ prev,
+ nextPrev,
+ that;
+
+ $this = $(this);
+
+ $parent = $this.parent();
+
+ that = $parent.data('this');
+
+ if (that.options.container) $parent = that.$menu;
+
+ $items = $('[role=menu] li:not(.divider):visible a', $parent);
+
+ if (!$items.length) return;
+
+ if (/(38|40)/.test(e.keyCode)) {
+
+ index = $items.index($items.filter(':focus'));
+ first = $items.parent(':not(.disabled)').first().index();
+ last = $items.parent(':not(.disabled)').last().index();
+ next = $items.eq(index).parent().nextAll(':not(.disabled)').eq(0).index();
+ prev = $items.eq(index).parent().prevAll(':not(.disabled)').eq(0).index();
+ nextPrev = $items.eq(next).parent().prevAll(':not(.disabled)').eq(0).index();
+
+ if (e.keyCode == 38) {
+ if (index != nextPrev && index > prev) index = prev;
+ if (index < first) index = first;
+ }
+
+ if (e.keyCode == 40) {
+ if (index != nextPrev && index < next) index = next;
+ if (index > last) index = last;
+ if (index == -1) index = 0;
+ }
+
+ $items.eq(index).focus();
+ } else {
+ var keyCodeMap = {
+ 48:"0", 49:"1", 50:"2", 51:"3", 52:"4", 53:"5", 54:"6", 55:"7", 56:"8", 57:"9", 59:";",
+ 65:"a", 66:"b", 67:"c", 68:"d", 69:"e", 70:"f", 71:"g", 72:"h", 73:"i", 74:"j", 75:"k", 76:"l",
+ 77:"m", 78:"n", 79:"o", 80:"p", 81:"q", 82:"r", 83:"s", 84:"t", 85:"u", 86:"v", 87:"w", 88:"x", 89:"y", 90:"z",
+ 96:"0", 97:"1", 98:"2", 99:"3", 100:"4", 101:"5", 102:"6", 103:"7", 104:"8", 105:"9"
+ }
+
+ var keyIndex = [];
+
+ $items.each(function() {
+ if ($(this).parent().is(':not(.disabled)')) {
+ if ($.trim($(this).text().toLowerCase()).substring(0,1) == keyCodeMap[e.keyCode]) {
+ keyIndex.push($(this).parent().index());
+ }
+ }
+ });
+
+ var count = $(document).data('keycount');
+ count++;
+ $(document).data('keycount',count);
+
+ var prevKey = $.trim($(':focus').text().toLowerCase()).substring(0,1);
+
+ if (prevKey != keyCodeMap[e.keyCode]) {
+ count = 1;
+ $(document).data('keycount',count);
+ } else if (count >= keyIndex.length) {
+ $(document).data('keycount',0);
+ }
+
+ $items.eq(keyIndex[count - 1]).focus();
+ }
+
+ // select focused option if "Enter" or "Spacebar" are pressed
+ if (/(13|32)/.test(e.keyCode)) {
+ e.preventDefault();
+ $(':focus').click();
+ $(document).data('keycount',0);
+ }
+ },
+
+ hide: function() {
+ this.$newElement.hide();
+ },
+
+ show: function() {
+ this.$newElement.show();
+ },
+
+ destroy: function() {
+ this.$newElement.remove();
+ this.$element.remove();
+ }
+ };
+
+ $.fn.selectpicker = function(option, event) {
+ //get the args of the outer function..
+ var args = arguments;
+ var value;
+ var chain = this.each(function() {
+ if ($(this).is('select')) {
+ var $this = $(this),
+ data = $this.data('selectpicker'),
+ options = typeof option == 'object' && option;
+
+ if (!data) {
+ $this.data('selectpicker', (data = new Selectpicker(this, options, event)));
+ } else if (options) {
+ for(var i in options) {
+ data.options[i] = options[i];
+ }
+ }
+
+ if (typeof option == 'string') {
+ //Copy the value of option, as once we shift the arguments
+ //it also shifts the value of option.
+ var property = option;
+ if (data[property] instanceof Function) {
+ [].shift.apply(args);
+ value = data[property].apply(data, args);
+ } else {
+ value = data.options[property];
+ }
+ }
+ }
+ });
+
+ if (value != undefined) {
+ return value;
+ } else {
+ return chain;
+ }
+ };
+
+ $.fn.selectpicker.defaults = {
+ style: 'btn-default',
+ size: 'auto',
+ title: null,
+ selectedTextFormat : 'values',
+ noneSelectedText : 'Nothing selected',
+ countSelectedText: '{0} of {1} selected',
+ width: false,
+ container: false,
+ hideDisabled: false,
+ showSubtext: false,
+ showIcon: true,
+ showContent: true,
+ dropupAuto: true,
+ header: false,
+ liveSearch: false
+ }
+
+ $(document)
+ .data('keycount', 0)
+ .on('keydown', '[data-toggle=dropdown], [role=menu]' , Selectpicker.prototype.keydown)
+
+}(window.jQuery);
diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js
index 094dfe623..1c7c3f2be 100644
--- a/templates/admin/default/assets/js/main.js
+++ b/templates/admin/default/assets/js/main.js
@@ -47,6 +47,11 @@
$('[rel="tooltip"]').tooltip();
}
+ // -- Bootstrap select --
+ if($('[data-toggle="selectpicker"]').length){
+ $('[data-toggle="selectpicker"]').selectpicker();
+ }
+
// -- Confirm Box --
if($('[data-toggle="confirm"]').length){
$('[data-toggle="confirm"]').click(function(e){
diff --git a/templates/admin/default/assets/less/thelia/bootstrap-select.less b/templates/admin/default/assets/less/thelia/bootstrap-select.less
new file mode 100644
index 000000000..10d019be5
--- /dev/null
+++ b/templates/admin/default/assets/less/thelia/bootstrap-select.less
@@ -0,0 +1,269 @@
+/*!
+ * bootstrap-select v1.3.1
+ * http://silviomoreto.github.io/bootstrap-select/
+ *
+ * Copyright 2013 bootstrap-select
+ * Licensed under the MIT license
+ */
+
+ .input-group{
+
+ .bootstrap-select.btn-group,
+ .bootstrap-select.btn-group[class*="span"] {
+ width: 100%;
+ margin-bottom: 0;
+
+ .btn{
+ .border-right-radius(0);
+ }
+ }
+
+ }
+
+.bootstrap-select.btn-group,
+.bootstrap-select.btn-group[class*="span"] {
+ float: none;
+ display: inline-block;
+ margin-bottom: 10px;
+ margin-left: 0;
+}
+.form-search .bootstrap-select.btn-group,
+.form-inline .bootstrap-select.btn-group,
+.form-horizontal .bootstrap-select.btn-group {
+ margin-bottom: 0;
+}
+
+.bootstrap-select.btn-group.pull-right,
+.bootstrap-select.btn-group[class*="span"].pull-right,
+.row-fluid .bootstrap-select.btn-group[class*="span"].pull-right {
+ float: right;
+}
+
+.input-append .bootstrap-select.btn-group {
+ margin-left: -1px;
+}
+
+.input-prepend .bootstrap-select.btn-group {
+ margin-right: -1px;
+}
+
+.bootstrap-select:not([class*="span"]) {
+ width: 220px;
+}
+
+.bootstrap-select {
+ /*width: 220px\9; IE8 and below*/
+ width: 220px\0; /*IE9 and below*/
+}
+
+.bootstrap-select > .btn {
+ width: 100%;
+}
+
+.error .bootstrap-select .btn {
+ border: 1px solid #b94a48;
+}
+
+
+.dropdown-menu {
+ z-index: 2000;
+}
+
+.bootstrap-select.show-menu-arrow.open > .btn {
+ z-index: 2051;
+}
+
+.bootstrap-select.btn-group .btn .filter-option {
+ overflow: hidden;
+ position: absolute;
+ left: 12px;
+ right: 25px;
+ text-align: left;
+}
+
+.bootstrap-select.btn-group .btn .caret {
+ position: absolute;
+ top: 50%;
+ right: 12px;
+ margin-top: -2px;
+ vertical-align: middle;
+}
+
+.bootstrap-select.btn-group > .disabled,
+.bootstrap-select.btn-group .dropdown-menu li.disabled > a {
+ cursor: not-allowed;
+}
+
+.bootstrap-select.btn-group > .disabled:focus {
+ outline: none !important;
+}
+
+.bootstrap-select.btn-group[class*="span"] .btn {
+ width: 100%;
+}
+
+.bootstrap-select.btn-group .dropdown-menu {
+ min-width: 100%;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
+.bootstrap-select.btn-group .dropdown-menu.inner {
+ position: static;
+ border: 0;
+ padding: 0;
+ margin: 0;
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+}
+
+.bootstrap-select.btn-group .dropdown-menu dt {
+ display: block;
+ padding: 3px 20px;
+ cursor: default;
+}
+
+.bootstrap-select.btn-group .div-contain {
+ overflow: hidden;
+}
+
+.bootstrap-select.btn-group .dropdown-menu li {
+ position: relative;
+
+ &:focus, a:focus{
+ outline: none;
+ }
+}
+
+.bootstrap-select.btn-group .dropdown-menu li > a.opt {
+ position: relative;
+ padding-left: 35px;
+}
+
+.bootstrap-select.btn-group .dropdown-menu li > a {
+ cursor: pointer;
+}
+
+.bootstrap-select.btn-group .dropdown-menu li > dt small {
+ font-weight: normal;
+}
+
+.bootstrap-select.btn-group.show-tick .dropdown-menu li.selected a i.check-mark {
+ display: inline-block;
+ position: absolute;
+ right: 15px;
+ margin-top: 2.5px;
+}
+
+.bootstrap-select.btn-group .dropdown-menu li a i.check-mark {
+ display: none;
+}
+
+.bootstrap-select.btn-group.show-tick .dropdown-menu li a span.text {
+ margin-right: 34px;
+}
+
+.bootstrap-select.btn-group .dropdown-menu li small {
+ padding-left: 0.5em;
+}
+
+.bootstrap-select.btn-group .dropdown-menu li:not(.disabled) > a:hover small,
+.bootstrap-select.btn-group .dropdown-menu li:not(.disabled) > a:focus small {
+ color: #64b1d8;
+ color: rgba(255,255,255,0.4);
+}
+
+.bootstrap-select.btn-group .dropdown-menu li > dt small {
+ font-weight: normal;
+}
+
+.bootstrap-select.show-menu-arrow .dropdown-toggle:before {
+ content: '';
+ display: inline-block;
+ border-left: 7px solid transparent;
+ border-right: 7px solid transparent;
+ border-bottom: 7px solid #CCC;
+ border-bottom-color: rgba(0, 0, 0, 0.2);
+ position: absolute;
+ bottom: -4px;
+ left: 9px;
+ display: none;
+}
+
+.bootstrap-select.show-menu-arrow .dropdown-toggle:after {
+ content: '';
+ display: inline-block;
+ border-left: 6px solid transparent;
+ border-right: 6px solid transparent;
+ border-bottom: 6px solid white;
+ position: absolute;
+ bottom: -4px;
+ left: 10px;
+ display: none;
+}
+
+.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:before {
+ bottom: auto;
+ top: -3px;
+ border-top: 7px solid #ccc;
+ border-bottom: 0;
+ border-top-color: rgba(0, 0, 0, 0.2);
+}
+
+.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:after {
+ bottom: auto;
+ top: -3px;
+ border-top: 6px solid #ffffff;
+ border-bottom: 0;
+}
+
+.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:before {
+ right: 12px;
+ left: auto;
+}
+.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:after {
+ right: 13px;
+ left: auto;
+}
+
+.bootstrap-select.show-menu-arrow.open > .dropdown-toggle:before,
+.bootstrap-select.show-menu-arrow.open > .dropdown-toggle:after {
+ display: block;
+}
+
+.mobile-device {
+ position: absolute;
+ top: 0;
+ left: 0;
+ display: block !important;
+ width: 100%;
+ height: 100% !important;
+ opacity: 0;
+}
+
+.bootstrap-select.fit-width {
+ width: auto !important;
+}
+
+.bootstrap-select.btn-group.fit-width .btn .filter-option {
+ position: static;
+}
+
+.bootstrap-select.btn-group.fit-width .btn .caret {
+ position: static;
+ top: auto;
+ margin-top: -1px;
+}
+
+.control-group.error .bootstrap-select .dropdown-toggle{
+ border-color: #b94a48;
+}
+
+.bootstrap-select-searchbox {
+ padding: 4px 8px;
+}
diff --git a/templates/admin/default/assets/less/thelia/thelia.less b/templates/admin/default/assets/less/thelia/thelia.less
index ba1654c7c..466f9d419 100644
--- a/templates/admin/default/assets/less/thelia/thelia.less
+++ b/templates/admin/default/assets/less/thelia/thelia.less
@@ -11,6 +11,7 @@
@import "wizard.less";
@import "bootstrap-editable.less";
@import "bootstrap-switch.less";
+@import "bootstrap-select.less";
@import "jqplot.less";
// -- Base styling ------------------------------------------------------------
diff --git a/templates/admin/default/shipping-configuration-edit.html b/templates/admin/default/shipping-configuration-edit.html
new file mode 100644
index 000000000..39b69dcde
--- /dev/null
+++ b/templates/admin/default/shipping-configuration-edit.html
@@ -0,0 +1,136 @@
+{extends file="admin-layout.tpl"}
+
+{block name="page-title"}{intl l='Edit a shipping configuration'}{/block}
+
+{block name="check-permissions"}admin.configuration.shipping-configuration.edit{/block}
+
+{block name="main-content"}
+
+
+
+
+
+
+
+
+
+
+
+ {intl l='Edit shipping configuration %title' title=$TITLE}
+
+
+
+
+
+
+
+
+
+
+
+ {* Delete related content confirmation dialog *}
+
+ {capture "delete_country_dialog"}
+
+ {/capture}
+
+ {include
+ file = "includes/generic-confirm-dialog.html"
+
+ dialog_id = "delete_country_dialog"
+ dialog_title = {intl l="Remove country"}
+ dialog_message = {intl l="Do you really want to remove this country ?"}
+
+ form_action = {url path=''}
+ form_content = {$smarty.capture.delete_country_dialog nofilter}
+ }
+{/block}
+
+{block name="javascript-initialization"}
+ {javascripts file='assets/js/main.js'}
+
+ {/javascripts}
+ {javascripts file='assets/js/bootstrap-select/bootstrap-select.js'}
+
+ {/javascripts}
+{/block}
\ No newline at end of file
diff --git a/templates/admin/default/shipping-zones-edit.html b/templates/admin/default/shipping-zones-edit.html
index cdb9886bf..70ee29a35 100644
--- a/templates/admin/default/shipping-zones-edit.html
+++ b/templates/admin/default/shipping-zones-edit.html
@@ -12,7 +12,7 @@
@@ -31,7 +31,7 @@