DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #60 from sgmap/update_turbolinks

Browse source 
Update turbolinks
This commit is contained in:
Mathieu Magnin 2017-04-03 15:55:44 +02:00 committed by GitHub
commit 564ff45117
29 changed files with 62 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -16,7 +16,7 @@ gem 'therubyracer', platforms: :ruby
# Use jquery as the JavaScript library
gem 'jquery-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks', '~> 2.5'
gem 'turbolinks', '~> 5.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

23
Gemfile.lock
View file

@ -95,7 +95,7 @@ GEM
bootstrap-wysihtml5-rails (0.3.3.8)
railties (>= 3.0)
browser (2.3.0)
builder (3.2.2)
builder (3.2.3)
byebug (9.0.6)
capybara (2.11.0)
addressable
@ -120,8 +120,8 @@ GEM
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.11.1)
concurrent-ruby (1.0.2)
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
connection_pool (2.2.1)
crack (0.4.3)
safe_yaml (~> 1.0.0)
@ -331,7 +331,7 @@ GEM
domain_name (~> 0.5)
http_parser.rb (0.6.0)
httpclient (2.8.3)
i18n (0.7.0)
i18n (0.8.1)
inflecto (0.0.2)
ipaddress (0.8.3)
jquery-rails (4.2.1)
@ -452,9 +452,9 @@ GEM
actionpack (~> 5.x)
actionview (~> 5.x)
activesupport (~> 5.x)
rails-dom-testing (2.0.1)
rails-dom-testing (2.0.2)
activesupport (>= 4.2.0, < 6.0)
nokogiri (~> 1.6.0)
nokogiri (~> 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (5.0.0.1)
@ -585,13 +585,14 @@ GEM
libv8 (~> 3.16.14.0)
ref
thor (0.19.4)
thread_safe (0.3.5)
thread_safe (0.3.6)
tilt (2.0.5)
timecop (0.8.1)
trollop (2.1.2)
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.0.4)
execjs (>= 0.3.0, < 3)
@ -707,7 +708,7 @@ DEPENDENCIES
sqlite3
therubyracer
timecop
turbolinks (~> 2.5)
turbolinks (~> 5.0)
uglifier (>= 1.3.0)
unicode_utils
unicorn

3
app/assets/javascripts/action_btn_rules.js
View file

@ -1,5 +1,4 @@
$(document).on('page:load', init_action_btn_rules);
$(document).ready(init_action_btn_rules);
$(document).on('turbolinks:load', init_action_btn_rules);
function init_action_btn_rules() {
$('.btn-send').click(function () {

3
app/assets/javascripts/admin.js
View file

@ -1,5 +1,4 @@
$(document).on('page:load', init_admin);
$(document).ready(init_admin);
$(document).on('turbolinks:load', init_admin);
function init_admin(){
destroy_action();

5
app/assets/javascripts/admin_procedures_modal.js
View file

@ -1,5 +1,4 @@
$(document).on('page:load', init_path_modal);
$(document).ready(init_path_modal);
$(document).on('turbolinks:load', init_path_modal);
function init_path_modal() {
path_modal_action();
@ -95,4 +94,4 @@ function transfer_errors_message(show) {
else {
$("#not_found_admin").slideUp(100)
}
}
}

4
app/assets/javascripts/application.js
View file

@ -33,8 +33,7 @@
//= require typeahead.bundle
//= require select2
$(document).on('page:load', application_init);
$(document).ready(application_init);
$(document).on('turbolinks:load', application_init);
function application_init(){
@ -55,4 +54,3 @@ function scroll_to() {
return false;
});
}

5
app/assets/javascripts/archive.js
View file

@ -1,5 +1,4 @@
$(document).on('page:load', buttons_archived);
$(document).ready(buttons_archived);
$(document).on('turbolinks:load', buttons_archived);
function buttons_archived(){
$("button#archive").on('click', function(){
@ -11,4 +10,4 @@ function buttons_archived(){
$("button#archive").show();
$("#confirm").hide();
});
}
}

3
app/assets/javascripts/bootstrap_wysihtml5.js vendored
View file

@ -1,5 +1,4 @@
$(document).ready(wysihtml5_active);
$(document).on('page:load', wysihtml5_active);
$(document).on('turbolinks:load', wysihtml5_active);
function wysihtml5_active (){
$('.wysihtml5').each(function(i, elem) {

5
app/assets/javascripts/cgu.js
View file

@ -1,9 +1,8 @@
$(document).on('page:load', buttons_anchor);
$(document).ready(buttons_anchor);
$(document).on('turbolinks:load', buttons_anchor);
function buttons_anchor(){
$("#cgu_menu_block").on('click', 'a', function(){
event.preventDefault();
$('html,body').animate({scrollTop:$(this.hash).offset().top-80}, 500);
});
}
}

3
app/assets/javascripts/default_data_block.js
View file

@ -1,5 +1,4 @@
$(document).on('page:load', init_default_data_block);
$(document).ready(init_default_data_block);
$(document).on('turbolinks:load', init_default_data_block);
function init_default_data_block() {
$('.default_data_block #dossier .body').toggle();

3
app/assets/javascripts/description.js
View file

@ -1,5 +1,4 @@
$(document).on('page:load', action_type_de_champs);
$(document).ready(action_type_de_champs);
$(document).on('turbolinks:load', action_type_de_champs);
function action_type_de_champs() {

3
app/assets/javascripts/dossier_commentaires_modal.js
View file

@ -1,5 +1,4 @@
$(document).on('page:load', init_modal_commentaire);
$(document).ready(init_modal_commentaire);
$(document).on('turbolinks:load', init_modal_commentaire);
function init_modal_commentaire() {
var modal = $("#modalCommentairesDossierParChamp");

6
app/assets/javascripts/dossiers.js
View file

@ -1,7 +1,5 @@
$(document).on('page:load', the_terms);
$(document).ready(the_terms);
$(document).on('page:load', pannel_switch);
$(document).ready(pannel_switch);
$(document).on('turbolinks:load', the_terms);
$(document).on('turbolinks:load', pannel_switch);
function pannel_switch() {
$('#switch-notifications').click(function () {

7
app/assets/javascripts/dossiers_list_filter.js
View file

@ -1,14 +1,13 @@
$(document).on('page:load', filters_init);
$(document).ready(filters_init);
$(document).on('turbolinks:load', filters_init);
function filters_init() {
$('html').click(function(event) {
$('html').click(function(event) {
var visible_filter = $('.filter_framed:visible')
if(visible_filter.length) {
if (!$(event.target).closest('.filter_framed').is(":visible")) {
visible_filter.hide();
}
}
}
});
$(".filter").on('click', function (event) {

3
app/assets/javascripts/dossiers_list_link.js
View file

@ -1,5 +1,4 @@
$(document).on('page:load', link_init);
$(document).ready(link_init);
$(document).on('turbolinks:load', link_init);
function link_init() {
$('#dossiers_list tr').on('click', function () {

4
app/assets/javascripts/franceconnect_kit.js
View file

@ -1,7 +1,5 @@
$(document).on('page:load', franceconnect_kit);
$(document).ready(franceconnect_kit);
$(document).on('turbolinks:load', franceconnect_kit);
function franceconnect_kit() {
franceConnectKit.init()
}

3
app/assets/javascripts/gestionnaire_dossier_modal.js
View file

@ -1,5 +1,4 @@
$(document).on('page:load', modal_action);
$(document).ready(modal_action);
$(document).on('turbolinks:load', modal_action);
function modal_action() {
$('#PJmodal').on('show.bs.modal', function (event) {

3
app/assets/javascripts/pref_list_dossier.js
View file

@ -1,5 +1,4 @@
$(document).on('page:load', pref_list_dossier_actions);
$(document).ready(pref_list_dossier_actions);
$(document).on('turbolinks:load', pref_list_dossier_actions);
function pref_list_dossier_actions() {
pref_list_dossier_open_action();

5
app/assets/javascripts/procedure.js
View file

@ -1,5 +1,4 @@
$(document).on('page:load', button_edit_procedure_init);
$(document).ready(button_edit_procedure_init);
$(document).on('turbolinks:load', button_edit_procedure_init);
function button_edit_procedure_init(){
buttons_api_carto();
@ -35,4 +34,4 @@ function button_individual () {
if ($('#procedure_for_individual').is(':checked'))
$("#individual_with_siret").show();
}
}

3
app/assets/javascripts/search.js
View file

@ -1,5 +1,4 @@
$(document).on('page:load', init_search_anim);
$(document).ready(init_search_anim);
$(document).on('turbolinks:load', init_search_anim);
function init_search_anim(){
$("#search_area").on('click', search_fadeIn);

3
app/assets/javascripts/user/description.js
View file

@ -1,5 +1,4 @@
$(document).on('page:load', activeSelect2);
$(document).ready(activeSelect2);
$(document).on('turbolinks:load', activeSelect2);
function activeSelect2() {
$('select.select2').select2({ theme: "bootstrap", width: '100%' });

5
app/assets/stylesheets/_turbolinks.scss Normal file
View file

@ -0,0 +1,5 @@
@import "variables";
.turbolinks-progress-bar {
background-color: $light-blue;
}

6
app/assets/stylesheets/_variables.scss
View file

@ -1 +1,5 @@
$font-size-base: 16px;
// colors
$light-blue: #F2F6FA;
// Bootstrap variables
$font-size-base: 16px;

4
app/assets/stylesheets/application.scss
View file

@ -27,7 +27,7 @@
@import "bootstrap";
body {
background-color: #F2F6FA;
background-color: $light-blue;
}
html, body {
@ -63,7 +63,7 @@ form {
}
#footer {
background-color: #F2F6FA;
background-color: $light-blue;
text-align: center;
padding: 0;
a, p {

4
app/assets/stylesheets/default_data_block.scss
View file

@ -1,3 +1,5 @@
@import "variables";
.default_data_block {
font-family: Arial;
@ -53,7 +55,7 @@
color: #FFFFFF;
}
.action:hover {
color: #F2F6FA;
color: $light-blue;
}
.count {
font-size: 16px;

4
app/assets/stylesheets/navbar.scss
View file

@ -1,3 +1,5 @@
@import "variables";
#header {
top: 0;
left: 0;
@ -185,7 +187,7 @@
}
}
.button-navbar-action:hover {
color: #F2F6FA;
color: $light-blue;
}
.button_navbar:hover, .button-navbar-action:hover {

4
app/assets/stylesheets/users.scss
View file

@ -1,3 +1,5 @@
@import "variables";
#users_index, #admins_index{
margin-left: 2rem;
margin-right: 2rem;
@ -48,7 +50,7 @@
padding: 10px;
}
.action:hover {
color: #F2F6FA;
color: $light-blue;
}
.padding-left-30 {
padding-left: 30px;

1
app/views/layouts/application.html.haml
View file

@ -1,6 +1,7 @@
%html
%head
%meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
%meta{ name: "turbolinks-cache-control", content: "no-cache" }
%title
=t('dynamics.page_title')
%meta{'http-equiv' => "X-UA-Compatible", :content => "IE=edge"}

3
app/views/users/carte/_init_carto.html.haml
View file

@ -1,4 +1,3 @@
%script{type: 'text/javascript'}
="var dossier_id =#{dossier.id}"
$(document).on('page:load', initCarto);
$(document).ready(initCarto);
$(document).on('turbolinks:load', initCarto);