Use jquery-ui-rails gem

This commit is contained in:
Ana 2016-08-11 15:05:53 +02:00
parent 1989a33da1
commit 0e9b8b598f
7 changed files with 6 additions and 42 deletions

View file

@ -79,6 +79,7 @@ gem 'cocoon'
# as the JavaScript library
gem 'jquery-rails'
gem 'jquery-ui-rails', '~> 4.2.1'
# for languages validation
gem 'iso-639'

View file

@ -226,6 +226,8 @@ GEM
jquery-rails (3.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.2.1)
railties (>= 3.2.16)
json (1.8.3)
jwt (1.0.0)
launchy (2.4.2)
@ -567,6 +569,7 @@ DEPENDENCIES
iso-639
jquery-datatables-rails (~> 2.2.1)
jquery-rails
jquery-ui-rails (~> 4.2.1)
leaflet-rails
letter_opener
letter_opener_web

View file

@ -13,7 +13,8 @@
//= require jquery
//= require jquery_ujs
//= require jquery.mobile.custom.min
//= require jquery-ui.min
//= require jquery.ui.draggable
//= require jquery.ui.droppable
//= require waypoints/jquery.waypoints
//= require dataTables/jquery.dataTables
//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap

File diff suppressed because one or more lines are too long

View file

@ -14,5 +14,4 @@
*= require bootstrap-datetimepicker
*= require leaflet
*= require bootstrap3-switch
*= require jquery-ui.min
*/

File diff suppressed because one or more lines are too long

View file

@ -1,20 +0,0 @@
!!!
%html
%head
%meta{:charset => "utf-8"}
%meta{:name => "viewport", :content => "width=device-width, initial-scale=1, maximum-scale=1"}
%title= content_for?(:title) ? yield(:title) : (ENV['OSEM_NAME'] || 'OSEM')
%meta{:content => "", :name => "description"}
%meta{:content => "", :name => "author"}
= stylesheet_link_tag "/stylesheets/schedule/jquery-ui-1.9.2.custom.min"
= stylesheet_link_tag "/stylesheets/schedule/schedule"
= javascript_include_tag "/javascripts/schedule/jquery-1.8.3"
= javascript_include_tag "/javascripts/schedule/jquery-ui-1.9.2.custom.min"
= javascript_include_tag "/javascripts/schedule/date.format"
= javascript_include_tag "/javascripts/schedule/schedule"
= csrf_meta_tags
= yield(:head)
%body
.content
= yield