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

Merge branch 'develop' of github.com:sgmap/tps into develop

Browse source
This commit is contained in:
Tanguy PATTE 2016-01-20 15:51:08 +01:00
commit df7ac75483
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,6 @@ $(document).on('page:load', franceconnect_kit);
$(document).ready(franceconnect_kit);
function franceconnect_kit() {
//franceConnectKit.init();
}

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

@ -4,6 +4,8 @@
%meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
%title TPS - Téléprocédures simplifiées
%meta{'http-equiv' => "X-UA-Compatible", :content => "IE=edge"}
%script{src: 'http://fcp.integ01.dev-franceconnect.fr/js/franceconnect.js'}
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
= javascript_include_tag 'application', 'data-turbolinks-track' => true
= csrf_meta_tags
@ -48,5 +50,3 @@
%div{:style => 'margin-left:10%; margin-right:10%;'}
= yield
%script{src: 'http://fcp.integ01.dev-franceconnect.fr/js/franceconnect.js'}