Select2 localization, styles, assets refactoring

KyivKrishnaAcademy · Mar 12, 2023 · 729ced8 · 729ced8
1 parent b283ff1
commit 729ced8
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 15 deletions.
diff --git a/app/assets/javascripts/select_2_initializers.js.coffee b/app/assets/javascripts/select_2_initializers.js.coffee
@@ -14,6 +14,7 @@ personOption = (person) ->
 personSelect = (domObj, jsonRoot) ->
   if domObj.length
     domObj.select2
+      theme: 'bootstrap'
       ajax:
         dataType: 'json'
         delay: 250
@@ -38,6 +39,7 @@ personSelect = (domObj, jsonRoot) ->
 simpleSelect = (domObj, jsonRoot) ->
   if domObj.length
     domObj.select2
+      theme: 'bootstrap'
       ajax:
         dataType: 'json'
         delay: 250

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -71,4 +71,13 @@ def class_schedules_table_headers
   def sidebar_opened?
     cookies[:'sidebar-is-opened']
   end
+
+  def select2_scripts_and_stylesheets
+    content_tag(:div, class: 'select2-dependencies') do
+      concat(javascript_include_tag('select2/dist/js/select2.min', type: 'text/javascript'))
+      concat(javascript_include_tag("select2/dist/js/i18n/#{locale}", type: 'text/javascript'))
+      concat(stylesheet_link_tag('select2/dist/css/select2.min', media: 'all'))
+      concat(stylesheet_link_tag('select2-bootstrap-theme/dist/select2-bootstrap.min', media: 'all'))
+    end
+  end
 end
diff --git a/app/views/academic_groups/_form.html.haml b/app/views/academic_groups/_form.html.haml
@@ -1,6 +1,5 @@
 - content_for(:js_and_css) do
-  = javascript_include_tag 'select2.min', type: 'text/javascript'
-  = stylesheet_link_tag 'select2.min', media: 'all'
+  = select2_scripts_and_stylesheets
 
 = simple_form_for @academic_group do |f|
   = render 'shared/error_messages', object: f.object

diff --git a/app/views/class_schedules/_form.html.haml b/app/views/class_schedules/_form.html.haml
@@ -1,6 +1,5 @@
 - content_for(:js_and_css) do
-  = javascript_include_tag 'select2.min', type: 'text/javascript'
-  = stylesheet_link_tag 'select2.min', media: 'all'
+  = select2_scripts_and_stylesheets
 
 .col-xs-12.col-sm-6.vert-offset-top-1
   = simple_form_for @class_schedule do |f|

diff --git a/app/views/courses/_form.html.haml b/app/views/courses/_form.html.haml
@@ -1,6 +1,5 @@
 - content_for(:js_and_css) do
-  = javascript_include_tag 'select2.min', type: 'text/javascript'
-  = stylesheet_link_tag 'select2.min', media: 'all'
+  = select2_scripts_and_stylesheets
 
 = simple_form_for @course do |f|
   = render 'shared/error_messages', object: f.object

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -1,5 +1,5 @@
 !!! 5
-%html
+%html{ lang: locale }
   %head
     %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }
     %meta{ name: 'theme-color', content: '#222' }

diff --git a/app/views/programs/_form.html.haml b/app/views/programs/_form.html.haml
@@ -1,6 +1,5 @@
 - content_for(:js_and_css) do
-  = javascript_include_tag 'select2.min', type: 'text/javascript'
-  = stylesheet_link_tag 'select2.min', media: 'all'
+  = select2_scripts_and_stylesheets
 
 = simple_form_for @program do |f|
   = render 'shared/error_messages', object: f.object

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -28,8 +28,11 @@
   intl-tel-input/build/js/intlTelInput
   intl-tel-input/build/js/utils
 
-  select2.min.js
-  select2.min.css
+  select2/dist/js/select2.min.js
+  select2/dist/js/i18n/uk.js
+  select2/dist/js/i18n/ru.js
+  select2/dist/css/select2.min.css
+  select2-bootstrap-theme/dist/select2-bootstrap.min.css
 
   range-slider
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,6 +30,8 @@
     "cookies-js": "1.2.3",
     "intl-tel-input": "8.5.2",
     "jquery-bigtext": "git+https://github.com/mpugach/jquery-bigtext.git",
-    "raven-js": "3.9.1"
+    "raven-js": "3.9.1",
+    "select2": "^4.0.13",
+    "select2-bootstrap-theme": "0.1.0-beta.10"
   }
 }
diff --git a/vendor/assets/javascripts/select2.min.js b/vendor/assets/javascripts/select2.min.js
diff --git a/vendor/assets/stylesheets/select2.min.css b/vendor/assets/stylesheets/select2.min.css