add new multiselect css and js

2017-02-25 13:13:21 +06:30
parent 13a66b65a0
commit 0f68580411
6 changed files with 5 additions and 8 deletions
--- a/2
+++ b/2
@@ -43,7 +43,7 @@ gem 'bcrypt', '~> 3.1.7'
 gem 'simple_form'
 gem 'kaminari'
 gem 'to_csv-rails'
-gem 'bootstrap-multiselect-rails'
+# gem 'bootstrap-multiselect-rails'

 group :development, :test do
  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,8 +42,6 @@ GEM
      sshkit (>= 1.6.1, != 1.7.0)
    arel (7.1.4)
    bcrypt (3.1.11)
-    bootstrap-multiselect-rails (0.9.9)
-      rails (>= 4.0.0)
    builder (3.2.3)
    byebug (9.0.6)
    capistrano (3.7.2)
@@ -222,7 +220,6 @@ PLATFORMS

 DEPENDENCIES
  bcrypt (~> 3.1.7)
-  bootstrap-multiselect-rails
  byebug
  capistrano
  capistrano-bundler
--- a/app/assets/.DS_Store
+++ b/app/assets/.DS_Store
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -14,5 +14,4 @@
 //= require jquery_ujs
 //= require turbolinks
 //= require bootstrap.v4a2.min 
-//= require bootstrap-multiselect
 //= require_tree .
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -14,4 +14,3 @@
 *= require_self
 */
 @import "bootstrap.v4a2.min";  
- @import "bootstrap-multiselect";
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -8,6 +8,8 @@
    <%= csrf_meta_tags %>
    <%= stylesheet_link_tag    'application', media: 'all' %>
    <%= javascript_include_tag 'application', 'data-turbolinks-eval' => true %>  
+    <script src="/assets/multiselect.js"    type="text/javascript"></script>
+    <link href="/assets/multiselect.css" rel="stylesheet" type="text/css" />
    <link href="/assets/style.css" rel="stylesheet" type="text/css" />
  </head>
  <body>