diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 7dd75e1..aee55c8 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -17,7 +17,7 @@ body { font-family: "Open Sans", sans-serif; color: #fff; - background-image: linear-gradient(rgba(61, 19, 52, 0.65), rgba(43, 15, 47, 0.65)), url('bg.jpg'); + background-image: linear-gradient(rgba(19, 20, 61, 0.65), rgba(43, 15, 47, 0.65)), url('bg.jpg'); background-size: cover; position: relative; } @@ -50,6 +50,6 @@ a { text-decoration: none; } a:hover { - color: rgb(191, 50, 196); + color: rgb(150, 64, 153); text-decoration: none; } \ No newline at end of file diff --git a/app/views/display/index.html.erb b/app/views/display/index.html.erb index da2dd41..d5c50e0 100644 --- a/app/views/display/index.html.erb +++ b/app/views/display/index.html.erb @@ -4,7 +4,7 @@ Bienvenue
- <%= link_to 'Data Countries', country_index_path,class: 'btn bg-purple ' %> + <%= link_to 'Listes des Pays', country_index_path,class: 'btn bg-purple ' %>
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake index 2f3f3ca..b31734d 100644 --- a/lib/tasks/import.rake +++ b/lib/tasks/import.rake @@ -28,8 +28,11 @@ namespace :import do counter += 1 data = row[0].split(';') begin - country = Country.all.detect{ |country| country.name_fr.parameterize == data[1].parameterize } - Embassy.create!(in_country: data[1], latitude: data[2], longitude: data[3], gps: data[4], country_id: country.id) + country = Country.all.detect do |country| + p /#{Regexp.escape(country.name_fr.parameterize)}/.match("#{Regexp.escape(data[1].parameterize)}") + end + #p { |country| country.name_fr.parameterize == data[1].parameterize } + #Embassy.create!(in_country: data[1], latitude: data[2], longitude: data[3], gps: data[4], country_id: country.id) counter2 += 1 rescue => e p e