Merge pull request #21 from glafir/3.0.0

release 3.0 with mew interface

Gemfile

@@ -1,13 +1,19 @@
 source 'https://rubygems.org'
-gem 'rails', '4.2.3'
+gem 'rails', '4.2.4'
 gem 'turbolinks'
 gem 'turbolinks-redirect'
-group :assets do
-  gem 'sass-rails', '~> 5.0.1'
-  gem 'coffee-rails', '~> 4.1.0'
-  gem 'uglifier', '>= 2.7.1'
-#  gem 'compass-rails','~> 2.0.4'
-end
+gem 'sass-rails', '~> 5.0.1'
+gem 'coffee-rails', '~> 4.1.0'
+gem 'uglifier', '>= 2.7.1'
+#gem 'compass-rails','~> 2.0.4'
+#gem 'twitter-bootstrap-rails'
+gem 'bootstrap-sass'
+gem 'bootstrap-sass-extras'
+gem "bootstrap_flash_messages"
+gem 'kaminari-bootstrap'
+gem 'rails_bootstrap_navbar'
+gem 'bootswatch-rails'
+gem 'bootstrap-select-rails'
 
 gem 'protected_attributes'
 
@@ -18,9 +24,10 @@ gem "jquery-easing-rails"
 gem 'jquery-validation-rails'
 gem "jquery-form-rails"
 gem "jquery-turbolinks"
+gem "jquery-tmpl-rails"
 gem "momentjs-rails"
 gem 'rails-jquery-autocomplete'
-gem 'mysql2'
+gem 'mysql2', '~> 0.3.20'
 gem 'bcrypt-ruby'
 gem 'devise'
 gem 'devise-encryptable'
@@ -59,13 +66,11 @@ gem 'jquery-ui-themes'
 gem 'html5_validators'
 gem 'pundit'
 gem 'dalli'
-group :development do
-  gem 'better_errors'
-  gem 'quiet_assets'
-  gem 'rails_layout'
-  gem 'spring-commands-rspec'
-  gem "binding_of_caller"
-end
+gem 'better_errors'
+gem 'quiet_assets'
+gem 'rails_layout'
+gem 'spring-commands-rspec'
+gem "binding_of_caller"
 
 gem 'gritter_notices'
 gem 'activerecord-session_store'
@@ -74,3 +79,6 @@ gem 'rails-erd'
 gem 'rack-cors', :require => 'rack/cors'
 gem "paperclip", :git => "git://github.com/thoughtbot/paperclip.git"
 gem 'nested_scaffold'
+gem 'carrierwave'
+gem 'mini_magick'
+gem 'translit'

app/assets/javascripts/desktop/airports.js

@@ -1,8 +1,4 @@
 $(function() {
-//  $("#airports th a, #airports .pagination a").on("click", '', //function() {
-//    $.getScript(this.href);
-//    return false;
-//  });
   $("#airports_search input").keyup(function() {
     $.get($("#airports_search").attr("action"),
     $("#airports_search").serialize(), null, "script");

app/assets/javascripts/desktop/application.js

@@ -11,27 +11,17 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require jquery
+//= require jquery-ui
 //= require jquery_ujs
-//= require mousetrap
 //= require jquery-tablesorter
 //= require jquery.validate
 //= require jquery.validate.additional-methods
-//= require jquery.form
-//= require jquery-ui/core
-//= require jquery-ui/widget
-//= require jquery-ui/mouse
-//= require jquery-ui/position
-//= require jquery-ui/sortable
-//= require jquery-ui/accordion
-//= require jquery-ui/accordion
+//= require mousetrap
 //= require jquery-ui/autocomplete
-//= require jquery-ui/datepicker
-//= require jquery-ui/datepicker-ru
-//= require jquery-ui/button
-//= require jquery-ui/slider
-//= require jquery-ui/selectmenu
-//= require moment
 //= require autocomplete-rails
-//= require_tree
+//= require bootstrap-sprockets
+//= require bootstrap
+//= require_tree ./templates
+//= require_tree .
 //= require_self
 

app/assets/javascripts/desktop/bootstrap.js.coffee

@@ -0,0 +1,3 @@
+jQuery ->
+  $("a[rel~=popover], .has-popover").popover()
+  $("a[rel~=tooltip], .has-tooltip").tooltip()