locomotivecms 3.0.0.rc6 → 3.0.0.rc7

data/config/locales/simple_form.nl.yml

@@ -44,6 +44,8 @@ nl:
           locales: Talen
           timezone_name: Tijdzone
           cache_enabled: Cache
+          private_access: "Wachtwoord-bescherming inschakelen"
+          password: "Site-wijde wachtwoord"
           new:
             locales: Eerste taal
         membership:
@@ -68,7 +70,6 @@ nl:
     hints:
       locomotive:
         account:
-          api_key: "Gebruik Wagon om uw site te implementeren (controleer config/deploy.yml van uw Wagon site)."
           password: Minimum 6 karakters
         page:
           handle: "Unieke identificatie nodig om deze pagina te ontvangen binnenin een externe controller instance."
@@ -93,6 +94,8 @@ nl:
           cache_enabled: "Wanneer ingeschakeld, uw pagina's zullen worden gecached zolang de inhoud niet veranderd. Het uitschakelen van de cache per pagina is toegestaan."
           redirect_to_first_domain: "Wanneer ingeschakeld, requests gemaakt naar gelijk welke domeinnaam zal worden doorgestuurd naar het eerste domein."
           url_redirections: "Redirect (301) verouderde urls naar pagina's die u gecreëerd hebt in de back-office. De oorsprong en de bestemming URLs zijn gescheiden door een <u>spatie</u>."
+          private_access: U kunt uw site verbergen achter een wachtwoord.
+          password: Het wachtwoord dat publieke bezoekers zullen moeten ingeven om de inhoud te bekijken van uw website.
           new:
             locales: "U kan andere talen toevoegen eenmaal de site gecreëerd is."
         translation:
@@ -146,3 +149,5 @@ nl:
           submit: Formaat wijzigen
         site:
           delete: Verwijder deze site
+        page:
+          delete: Verwijder

data/config/routes.rb

@@ -74,7 +74,7 @@ Locomotive::Engine.routes.draw do
     end
 
     # Preview mode handled by Steam
-    mount Locomotive::Steam::Server.to_app => '/preview', as: 'preview', anchor: false
+    mount Locomotive::Steam.to_app => '/preview', as: 'preview', anchor: false
 
   end
 end

data/lib/generators/locomotive/install/templates/locomotive.rb

@@ -14,6 +14,9 @@ Locomotive.configure do |config|
   # default locale (for now, only en, de, fr, pl, pt, pt-BR, it, nl, nb, ja, cs, bg and sk are supported)
   config.default_locale = :en
 
+  # locales allowed for the back-office UI
+  # config.locales = [:en, :fr, :de]
+
   # available locales suggested to "localize" a site. You will have to pick up at least one among that list.
   # config.site_locales = %w{en de fr pl pt pt-BR it nl nb es ru ja cs bg sk}
 

data/lib/locomotive.rb

@@ -14,7 +14,6 @@ require 'locomotive/custom_fields'
 require 'locomotive/action_controller'
 require 'locomotive/rails'
 require 'locomotive/regexps'
-# require 'locomotive/middlewares'
 
 module Locomotive
   extend ActiveSupport::Autoload

data/lib/locomotive/dependencies.rb

@@ -20,7 +20,6 @@ require 'carrierwave'
 require 'custom_fields'
 require 'mimetype_fu'
 require 'actionmailer_with_request'
-require 'select2-rails'
 require 'dragonfly'
 require 'pundit'
 require 'sanitize'
@@ -29,7 +28,6 @@ require 'bazaar'
 require 'csv'
 require 'rails-i18n'
 
-require 'compass-rails'
 require 'codemirror/rails'
 require 'jquery/rails'
 require 'jquery-ui-rails'

data/lib/locomotive/engine.rb

@@ -35,6 +35,8 @@ module Locomotive
 
     initializer 'locomotive.precompile.hook', group: :all do |app|
       app.config.assets.precompile += %w(
+        locomotive/icons/flags/*.png
+        locomotive/*.png
         locomotive/bootstrap-colorpicker/saturation.png
         locomotive/bootstrap-colorpicker/alpha-horizontal.png
         locomotive/bootstrap-colorpicker/alpha.png
@@ -63,6 +65,9 @@ module Locomotive
     initializer 'locomotive.middlewares' do |app|
       require 'locomotive/middlewares'
 
+      # Note: "insert 4" means inserting after Rack::Lock
+      # specifying Rack::Lock caused an error in production.
+      app.middleware.insert 4, '::Locomotive::Middlewares::ImageThumbnail'
       app.middleware.use '::Locomotive::Middlewares::Site'
     end
 

data/lib/locomotive/middlewares.rb

@@ -1 +1,2 @@
 require 'locomotive/middlewares/site'
+require 'locomotive/middlewares/image_thumbnail'

data/lib/locomotive/middlewares/image_thumbnail.rb

@@ -0,0 +1,57 @@
+module Locomotive
+  module Middlewares
+    class ImageThumbnail
+
+      PATH = '_image_thumbnail'
+
+      def initialize(app, opts = {})
+        @app = app
+      end
+
+      def call(env)
+        if env['PATH_INFO'] == self.class.route
+          request = Rack::Request.new(env)
+
+          image, format = request.params['image'], request.params['format']
+
+          if thumb = make_thumb(image, format)
+            respond(thumb)
+          else
+            respond('', 422)
+          end
+        else
+          @app.call(env)
+        end
+
+      end
+
+      def self.route
+        Locomotive.mounted_on + '/' + PATH
+      end
+
+      private
+
+      def make_thumb(image, format)
+        return nil if image.blank? || format.blank?
+
+        file = Locomotive::Dragonfly.app.fetch_url(image)
+
+        begin
+          if image.starts_with?('data') # base64
+            file.apply.content.process!(:thumb, format).b64_data
+          else
+            file.thumb(format).url # url
+          end
+        rescue ArgumentError => e
+          Locomotive.log "[image thumbnail] error = #{e.message}"
+          nil
+        end
+      end
+
+      def respond(response = '', status = 200)
+        [status, { 'Content-Type' => 'text/plain' }, [response]]
+      end
+
+    end
+  end
+end

data/lib/locomotive/simple_form.rb

@@ -115,7 +115,7 @@ module Locomotive
 
       template.content_tag :button, label,
         type:   'submit',
-        class:  "btn btn-success btn-sm #{options[:class]}",
+        class:  options[:change_class] || "btn btn-primary btn-sm #{options[:class]}",
         data:   { loading_text: loading_text }
     end
 

data/lib/locomotive/steam/middlewares/page_editing.rb

@@ -12,6 +12,7 @@ module Locomotive
 
         def call(env)
           status, headers, response = @app.call(env)
+
           site, page, locale, live_editing = env['steam.site'], env['steam.page'], env['steam.locale'].to_s, env['steam.live_editing']
 
           if editable?(page, response, live_editing)

data/lib/locomotive/steam_adaptor.rb

@@ -19,7 +19,8 @@ Locomotive::Steam.configure do |config|
 
   # rely on Mongoid for the connection information
   if mongoid = Mongoid.configure.clients[:default]
-    options = mongoid[:uri] ? mongoid.slice(:uri) : mongoid.slice(:database, :hosts, :username, :password)
+    options = mongoid[:uri] ? mongoid.slice(:uri) : mongoid.slice(:hosts, :database)
+    options.merge!(mongoid[:options].symbolize_keys) if mongoid[:options]
     config.adapter = { name: :'mongoDB' }.merge(options.symbolize_keys)
   end
 
@@ -40,6 +41,8 @@ Locomotive::Steam.configure do |config|
   config.render_404_if_no_site = false
 
   config.services_hook = -> (services) {
+    services.cache = Rails.cache
+
     if services.request
       services.entry_submission = Locomotive::Steam::APIEntrySubmissionService.new(services.request.env['locomotive.site'], services.locale)
       services.defer(:liquid_parser) { Locomotive::Steam::LiquidParserWithCacheService.new(services.current_site, services.parent_finder, services.snippet_finder, services.locale) }

data/lib/locomotive/version.rb

@@ -2,5 +2,5 @@
 # MAJOR.MINOR.PATCH format.
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive #:nodoc
-  VERSION = '3.0.0.rc6'
+  VERSION = '3.0.0.rc7'
 end

data/spec/dummy/config/initializers/locomotive.rb

@@ -11,6 +11,9 @@ Locomotive.configure do |config|
   # default locale (for now, only en, de, fr, pl, pt, pt-BR, it, nl, nb, ja, cs, bg and sk are supported)
   config.default_locale = :en
 
+  # locales allowed for the back-office UI
+  config.locales = [:en, :nl, :el]
+
   # available locales suggested to "localize" a site. You will have to pick up at least one among that list.
   # config.site_locales = %w{en de fr pl pt pt-BR it nl nb es ru ja cs bg sk}
 

data/spec/dummy/config/routes.rb

@@ -9,6 +9,6 @@ Rails.application.routes.draw do
   mount Locomotive::API.to_app => '/locomotive(/:site_handle)/api'
 
   # Render site
-  mount Locomotive::Steam::Server.to_app => '/', anchor: false
+  mount Locomotive::Steam.to_app => '/', anchor: false
 
 end

data/spec/models/locomotive/editable_element_spec.rb

@@ -23,4 +23,26 @@ describe Locomotive::EditableElement do
 
   end
 
+  describe '#path' do
+
+    subject { element.path }
+
+    it { is_expected.to eq '' }
+
+    context 'no block and a slug' do
+
+      let(:attributes) { { slug: 'banner' } }
+      it { is_expected.to eq 'banner' }
+
+    end
+
+    context 'a block and a slug' do
+
+      let(:attributes) { { block: 'content/header', slug: 'banner' } }
+      it { is_expected.to eq 'content--header--banner' }
+
+    end
+
+  end
+
 end

data/spec/requests/locomotive/image_thumbnail_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe Locomotive::Middlewares::ImageThumbnail do
+
+  let(:app)         { ->(env) { [200, env, 'Hello world'] } }
+  let(:middleware)  { described_class.new(app) }
+
+  describe '.route' do
+
+    subject { described_class.route }
+
+    it { is_expected.to eq '/locomotive/_image_thumbnail' }
+
+  end
+
+  describe '#call' do
+
+    let(:url)     { 'http://locomotive.dev/locomotive/_image_thumbnail' }
+    let(:image)   { 'http://locomotive.dev/assets/banner.png' }
+    let(:format)  { '300x300' }
+    let(:params)  { { 'image' => image, 'format' => format } }
+    let(:request) { Rack::MockRequest.new(middleware) }
+
+    subject { request.post(url, params: params) }
+
+    describe "pass if it doesn't match the route" do
+
+      let(:url) { 'http://locomotive.dev/locomotive/image_thumbnail' }
+      it { expect(subject.body).to eq 'Hello world' }
+
+    end
+
+    describe 'missing parameters' do
+
+      let(:params) { '' }
+      it { expect(subject.status).to eq 422 }
+
+    end
+
+    describe 'convert an url' do
+
+      it { expect(subject.status).to eq 200 }
+      it { expect(subject.body).to eq '/images/dynamic/W1siZnUiLCJodHRwOi8vbG9jb21vdGl2ZS5kZXYvYXNzZXRzL2Jhbm5lci5wbmciXSxbInAiLCJ0aHVtYiIsIjMwMHgzMDAiXV0/banner.png?sha=36df3764149782ba' }
+
+    end
+
+    describe 'convert a base64' do
+
+      let(:image) { 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNgYPhfDwACggF/yWU3jgAAAABJRU5ErkJggg==' }
+
+      it { expect(subject.status).to eq 200 }
+      it { expect(subject.body).to include("data:image/png;base64") }
+
+      describe 'wrong format' do
+
+        let(:format) { 'wrongsyntax' }
+
+        it { expect(subject.status).to eq 422 }
+
+      end
+
+    end
+
+  end
+
+end

data/spec/requests/{site_spec.rb → locomotive/site_spec.rb}

@@ -25,7 +25,7 @@ describe Locomotive::Middlewares::Site do
       subject { middleware.call(rack_env) }
 
       it { expect(subject.first).to eq 404 }
-      it { expect(subject.last.body).to match(/Sign In/) }
+      it { expect(subject.last.body).to match(/Site not found \| Locomotive/) }
 
       context 'default host' do
 
@@ -120,5 +120,4 @@ describe Locomotive::Middlewares::Site do
 
   end
 
-
 end

data/spec/requests/locomotive/steam/cache_spec.rb

@@ -39,7 +39,7 @@ describe Locomotive::Steam::Middlewares::Cache do
 
     subject { middleware.send(:cache_key, steam_env) }
 
-    it { expect(subject).to eq 'baf811bda8ae9dbeab661855d023de69' }
+    it { expect(subject).to eq 'be37e623aefc313bc83bc68e75f8ca67' }
 
   end
 

data/spec/requests/locomotive/steam/wysihtml_css_spec.rb

@@ -33,7 +33,7 @@ describe Locomotive::Steam::Middlewares::WysihtmlCss do
 
       let(:html) { '<html><head></head><body></body></html>' }
 
-      it { is_expected.to eq('<html><head><link rel="stylesheet" type="text/css" href="/assets/locomotive/wysihtml5_editor.css"></head><body></body></html>') }
+      it { is_expected.to match(%r(<html><head><link rel="stylesheet" type="text/css" href="/assets/locomotive/wysihtml5_editor-[^.]+.css"></head><body></body></html>)) }
 
     end
 

data/spec/support/features/session_helpers.rb

@@ -20,7 +20,9 @@ module Features
 
     def forgot_password(&block)
       sign_up_with 'John Doe', 'john@doe.net', 'password'
-      click_link 'Log out'
+      click_link 'John Doe'
+      within('.navigation') { click_link 'Log out' }
+      # click_link 'Log out'
       click_link 'Forgot my password'
       fill_in 'Your email', with: 'john@doe.net'
       click_button 'Submit'

data/vendor/assets/components/locomotive/select2-bootstrap-css/select2-bootstrap.css

@@ -0,0 +1,495 @@
+/*! Select2 Bootstrap 3 CSS v1.4.6 | MIT License | github.com/t0m/select2-bootstrap-css */
+/**
+ * Reset Bootstrap 3 .form-control styles which - if applied to the
+ * original <select>-element the Select2-plugin may be run against -
+ * are copied to the .select2-container.
+ *
+ * 1. Overwrite .select2-container's original display:inline-block
+ *    with Bootstrap 3's default for .form-control, display:block;
+ *    courtesy of @juristr (@see https://github.com/fk/select2-bootstrap-css/pull/1)
+ */
+.select2-container.form-control {
+  background: transparent;
+  box-shadow: none;
+  border: none;
+  display: block;
+  /* 1 */
+  margin: 0;
+  padding: 0;
+}
+
+/**
+ * Adjust Select2 inputs to fit Bootstrap 3 default .form-control appearance.
+ */
+.select2-container .select2-choices .select2-search-field input,
+.select2-container .select2-choice,
+.select2-container .select2-choices {
+  background: none;
+  padding: 0;
+  border-color: #cccccc;
+  border-radius: 4px;
+  color: #555555;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  background-color: white;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.select2-search input {
+  border-color: #cccccc;
+  border-radius: 4px;
+  color: #555555;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  background-color: white;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.select2-container .select2-choices .select2-search-field input {
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+
+/**
+ * Adjust Select2 input heights to match the Bootstrap default.
+ */
+.select2-container .select2-choice {
+  height: 34px;
+  line-height: 1.42857;
+}
+
+/**
+ * Address Multi Select2's height which - depending on how many elements have been selected -
+ * may grown higher than their initial size.
+ */
+.select2-container.select2-container-multi.form-control {
+  height: auto;
+}
+
+/**
+ * Address Bootstrap 3 control sizing classes
+ * @see http://getbootstrap.com/css/#forms-control-sizes
+ */
+.select2-container.input-sm .select2-choice,
+.input-group-sm .select2-container .select2-choice {
+  height: 30px;
+  line-height: 1.5;
+  border-radius: 3px;
+}
+
+.select2-container.input-lg .select2-choice,
+.input-group-lg .select2-container .select2-choice {
+  height: 46px;
+  line-height: 1.33333;
+  border-radius: 6px;
+}
+
+.select2-container-multi .select2-choices .select2-search-field input {
+  height: 32px;
+}
+
+.select2-container-multi.input-sm .select2-choices .select2-search-field input,
+.input-group-sm .select2-container-multi .select2-choices .select2-search-field input {
+  height: 28px;
+}
+
+.select2-container-multi.input-lg .select2-choices .select2-search-field input,
+.input-group-lg .select2-container-multi .select2-choices .select2-search-field input {
+  height: 44px;
+}
+
+/**
+ * Adjust height and line-height for .select2-search-field amd multi-select Select2 widgets.
+ *
+ * 1. Class repetition to address missing .select2-chosen in Select2 < 3.3.2.
+ */
+.select2-container-multi .select2-choices .select2-search-field input {
+  margin: 0;
+}
+
+.select2-chosen,
+.select2-choice > span:first-child,
+.select2-container .select2-choices .select2-search-field input {
+  padding: 6px 12px;
+}
+
+.input-sm .select2-chosen,
+.input-group-sm .select2-chosen,
+.input-sm .select2-choice > span:first-child,
+.input-group-sm .select2-choice > span:first-child,
+.input-sm .select2-choices .select2-search-field input,
+.input-group-sm .select2-choices .select2-search-field input {
+  padding: 5px 10px;
+}
+
+.input-lg .select2-chosen,
+.input-group-lg .select2-chosen,
+.input-lg .select2-choice > span:first-child,
+.input-group-lg .select2-choice > span:first-child,
+.input-lg .select2-choices .select2-search-field input,
+.input-group-lg .select2-choices .select2-search-field input {
+  padding: 10px 16px;
+}
+
+.select2-container-multi .select2-choices .select2-search-choice {
+  margin-top: 5px;
+  margin-bottom: 3px;
+}
+
+.select2-container-multi.input-sm .select2-choices .select2-search-choice,
+.input-group-sm .select2-container-multi .select2-choices .select2-search-choice {
+  margin-top: 3px;
+  margin-bottom: 2px;
+}
+
+.select2-container-multi.input-lg .select2-choices .select2-search-choice,
+.input-group-lg .select2-container-multi .select2-choices .select2-search-choice {
+  line-height: 24px;
+}
+
+/**
+ * Adjust the single Select2's dropdown arrow button appearance.
+ *
+ * 1. For Select2 v.3.3.2.
+ */
+.select2-container .select2-choice .select2-arrow,
+.select2-container .select2-choice div {
+  border-left: none;
+  background: none;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+
+.select2-dropdown-open .select2-choice .select2-arrow,
+.select2-dropdown-open .select2-choice div {
+  border-left-color: transparent;
+  background: none;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+
+/**
+ * Adjust the dropdown arrow button icon position for the single-select Select2 elements
+ * to make it line up vertically now that we increased the height of .select2-container.
+ *
+ * 1. Class repetition to address missing .select2-chosen in Select2 v.3.3.2.
+ */
+.select2-container .select2-choice .select2-arrow b,
+.select2-container .select2-choice div b {
+  background-position: 0 3px;
+}
+
+.select2-dropdown-open .select2-choice .select2-arrow b,
+.select2-dropdown-open .select2-choice div b {
+  background-position: -18px 3px;
+}
+
+.select2-container.input-sm .select2-choice .select2-arrow b,
+.input-group-sm .select2-container .select2-choice .select2-arrow b,
+.select2-container.input-sm .select2-choice div b,
+.input-group-sm .select2-container .select2-choice div b {
+  background-position: 0 1px;
+}
+
+.select2-dropdown-open.input-sm .select2-choice .select2-arrow b,
+.input-group-sm .select2-dropdown-open .select2-choice .select2-arrow b,
+.select2-dropdown-open.input-sm .select2-choice div b,
+.input-group-sm .select2-dropdown-open .select2-choice div b {
+  background-position: -18px 1px;
+}
+
+.select2-container.input-lg .select2-choice .select2-arrow b,
+.input-group-lg .select2-container .select2-choice .select2-arrow b,
+.select2-container.input-lg .select2-choice div b,
+.input-group-lg .select2-container .select2-choice div b {
+  background-position: 0 9px;
+}
+
+.select2-dropdown-open.input-lg .select2-choice .select2-arrow b,
+.input-group-lg .select2-dropdown-open .select2-choice .select2-arrow b,
+.select2-dropdown-open.input-lg .select2-choice div b,
+.input-group-lg .select2-dropdown-open .select2-choice div b {
+  background-position: -18px 9px;
+}
+
+/**
+ * Address Bootstrap's validation states and change Select2's border colors and focus states.
+ * Apply .has-warning, .has-danger or .has-succes to #select2-drop to match Bootstraps' colors.
+ */
+.has-warning .select2-choice,
+.has-warning .select2-choices {
+  border-color: #8a6d3b;
+}
+.has-warning .select2-container-active .select2-choice,
+.has-warning .select2-container-multi.select2-container-active .select2-choices {
+  border-color: #66512c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+}
+.has-warning.select2-drop-active {
+  border-color: #66512c;
+}
+.has-warning.select2-drop-active.select2-drop.select2-drop-above {
+  border-top-color: #66512c;
+}
+
+.has-error .select2-choice,
+.has-error .select2-choices {
+  border-color: #a94442;
+}
+.has-error .select2-container-active .select2-choice,
+.has-error .select2-container-multi.select2-container-active .select2-choices {
+  border-color: #843534;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
+}
+.has-error.select2-drop-active {
+  border-color: #843534;
+}
+.has-error.select2-drop-active.select2-drop.select2-drop-above {
+  border-top-color: #843534;
+}
+
+.has-success .select2-choice,
+.has-success .select2-choices {
+  border-color: #3c763d;
+}
+.has-success .select2-container-active .select2-choice,
+.has-success .select2-container-multi.select2-container-active .select2-choices {
+  border-color: #2b542c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
+}
+.has-success.select2-drop-active {
+  border-color: #2b542c;
+}
+.has-success.select2-drop-active.select2-drop.select2-drop-above {
+  border-top-color: #2b542c;
+}
+
+/**
+ * Make Select2's active-styles - applied to .select2-container when the widget receives focus -
+ * fit Bootstrap 3's .form-element:focus appearance.
+ */
+.select2-container-active .select2-choice,
+.select2-container-multi.select2-container-active .select2-choices {
+  border-color: #66afe9;
+  outline: none;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
+  -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+  -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+  transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+}
+
+.select2-drop-active {
+  border-color: #66afe9;
+}
+
+.select2-drop-auto-width,
+.select2-drop.select2-drop-above.select2-drop-active {
+  border-top-color: #66afe9;
+}
+
+/**
+ * Select2 widgets in Bootstrap Input Groups
+ *
+ * When Select2 widgets are combined with other elements using Bootstrap 3's
+ * "Input Group" component, we don't want specific edges of the Select2 container
+ * to have a border-radius.
+ *
+ * In Bootstrap 2, input groups required a markup where these style adjustments
+ * could be bound to a CSS-class identifying if the additional elements are appended,
+ * prepended or both.
+ *
+ * Bootstrap 3 doesn't rely on these classes anymore, so we have to use our own.
+ * Use .select2-bootstrap-prepend and .select2-bootstrap-append on a Bootstrap 3 .input-group
+ * to let the contained Select2 widget know which edges should not be rounded as they are
+ * directly followed by another element.
+ *
+ * @see http://getbootstrap.com/components/#input-groups
+ */
+.input-group.select2-bootstrap-prepend [class^="select2-choice"] {
+  border-bottom-left-radius: 0 !important;
+  border-top-left-radius: 0 !important;
+}
+
+.input-group.select2-bootstrap-append [class^="select2-choice"] {
+  border-bottom-right-radius: 0 !important;
+  border-top-right-radius: 0 !important;
+}
+
+.select2-dropdown-open [class^="select2-choice"] {
+  border-bottom-right-radius: 0 !important;
+  border-bottom-left-radius: 0 !important;
+}
+
+.select2-dropdown-open.select2-drop-above [class^="select2-choice"] {
+  border-top-right-radius: 0 !important;
+  border-top-left-radius: 0 !important;
+  border-bottom-right-radius: 4px !important;
+  border-bottom-left-radius: 4px !important;
+  background: white;
+  filter: none;
+}
+.input-group.select2-bootstrap-prepend .select2-dropdown-open.select2-drop-above [class^="select2-choice"] {
+  border-bottom-left-radius: 0 !important;
+  border-top-left-radius: 0 !important;
+}
+.input-group.select2-bootstrap-append .select2-dropdown-open.select2-drop-above [class^="select2-choice"] {
+  border-bottom-right-radius: 0 !important;
+  border-top-right-radius: 0 !important;
+}
+.input-group.input-group-sm.select2-bootstrap-prepend .select2-dropdown-open.select2-drop-above [class^="select2-choice"] {
+  border-bottom-right-radius: 3px !important;
+}
+.input-group.input-group-lg.select2-bootstrap-prepend .select2-dropdown-open.select2-drop-above [class^="select2-choice"] {
+  border-bottom-right-radius: 6px !important;
+}
+.input-group.input-group-sm.select2-bootstrap-append .select2-dropdown-open.select2-drop-above [class^="select2-choice"] {
+  border-bottom-left-radius: 3px !important;
+}
+.input-group.input-group-lg.select2-bootstrap-append .select2-dropdown-open.select2-drop-above [class^="select2-choice"] {
+  border-bottom-left-radius: 6px !important;
+}
+
+/**
+ * Adjust Select2's choices hover and selected styles to match Bootstrap 3's default dropdown styles.
+ */
+.select2-results .select2-highlighted {
+  color: white;
+  background-color: #337ab7;
+}
+
+/**
+ * Adjust alignment of Bootstrap 3 buttons in Bootstrap 3 Input Groups to address
+ * Multi Select2's height which - depending on how many elements have been selected -
+ * may grown higher than their initial size.
+ */
+.select2-bootstrap-append .select2-container-multiple,
+.select2-bootstrap-append .input-group-btn,
+.select2-bootstrap-append .input-group-btn .btn,
+.select2-bootstrap-prepend .select2-container-multiple,
+.select2-bootstrap-prepend .input-group-btn,
+.select2-bootstrap-prepend .input-group-btn .btn {
+  vertical-align: top;
+}
+
+/**
+ * Make Multi Select2's choices match Bootstrap 3's default button styles.
+ */
+.select2-container-multi .select2-choices .select2-search-choice {
+  color: #555555;
+  background: white;
+  border-color: #cccccc;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+
+.select2-container-multi .select2-choices .select2-search-choice-focus {
+  background: #ebebeb;
+  border-color: #adadad;
+  color: #333333;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+
+/**
+ * Address Multi Select2's choice close-button vertical alignment.
+ */
+.select2-search-choice-close {
+  margin-top: -7px;
+  top: 50%;
+}
+
+/**
+ * Adjust the single Select2's clear button position (used to reset the select box
+ * back to the placeholder value and visible once a selection is made
+ * activated by Select2's "allowClear" option).
+ */
+.select2-container .select2-choice abbr {
+  top: 50%;
+}
+
+/**
+ * Adjust "no results" and "selection limit" messages to make use
+ * of Bootstrap 3's default "Alert" style.
+ *
+ * @see http://getbootstrap.com/components/#alerts-default
+ */
+.select2-results .select2-no-results,
+.select2-results .select2-searching,
+.select2-results .select2-selection-limit {
+  background-color: #fcf8e3;
+  color: #8a6d3b;
+}
+
+/**
+ * Address disabled Select2 styles.
+ *
+ * 1. For Select2 v.3.3.2.
+ * 2. Revert border-left:0 inherited from Select2's CSS to prevent the arrow
+ *    from jumping when switching from disabled to enabled state and vice versa.
+ */
+.select2-container.select2-container-disabled .select2-choice,
+.select2-container.select2-container-disabled .select2-choices {
+  cursor: not-allowed;
+  background-color: #eeeeee;
+  border-color: #cccccc;
+}
+.select2-container.select2-container-disabled .select2-choice .select2-arrow,
+.select2-container.select2-container-disabled .select2-choice div,
+.select2-container.select2-container-disabled .select2-choices .select2-arrow,
+.select2-container.select2-container-disabled .select2-choices div {
+  background-color: transparent;
+  border-left: 1px solid transparent;
+  /* 2 */
+}
+
+/**
+ * Address Select2's loading indicator position - which should not stick
+ * to the right edge of Select2's search input.
+ *
+ * 1. in .select2-search input
+ * 2. in Multi Select2's .select2-search-field input
+ * 3. in the status-message of infinite-scroll with remote data (@see http://ivaynberg.github.io/select2/#infinite)
+ *
+ * These styles alter Select2's default background-position of 100%
+ * and supply the new background-position syntax to browsers which support it:
+ *
+ * 1. Android, Safari < 6/Mobile, IE<9: change to a relative background-position of 99%
+ * 2. Chrome 25+, Firefox 13+, IE 9+, Opera 10.5+: use the new CSS3-background-position syntax
+ *
+ * @see http://www.w3.org/TR/css3-background/#background-position
+ *
+ * @todo Since both Select2 and Bootstrap 3 only support IE8 and above,
+ * we could use the :after-pseudo-element to display the loading indicator.
+ * Alternatively, we could supply an altered loading indicator image which already
+ * contains an offset to the right.
+ */
+.select2-search input.select2-active,
+.select2-container-multi .select2-choices .select2-search-field input.select2-active,
+.select2-more-results.select2-active {
+  background-position: 99%;
+  /* 4 */
+  background-position: right 4px center;
+  /* 5 */
+}
+
+/**
+ * To support Select2 pre v3.4.2 in combination with Bootstrap v3.2.0,
+ * ensure that .select2-offscreen width, height and position can not be overwritten.
+ *
+ * This adresses changes in Bootstrap somewhere after the initial v3.0.0 which -
+ * in combination with Select2's pre-v3.4.2 CSS missing the "!important" after
+ * the following rules - allow Bootstrap to overwrite the latter, which results in
+ * the original <select> element Select2 is replacing not be properly being hidden
+ * when used in a "Bootstrap Input Group with Addon".
+ **/
+.select2-offscreen,
+.select2-offscreen:focus {
+  width: 1px !important;
+  height: 1px !important;
+  position: absolute !important;
+}