From 09242ae2fdb8873246433e910664861f6bfda229 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Wed, 27 Feb 2013 12:58:57 +0100 Subject: [PATCH] Fix IE angular bootstrap && html5 tag resolution --- .../web/login/layout/base-layout.html.twig | 39 +++++++++---------- www/skins/login/js/main.js | 4 ++ 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig index 105c910ce1..41e45d3e14 100644 --- a/templates/web/login/layout/base-layout.html.twig +++ b/templates/web/login/layout/base-layout.html.twig @@ -1,11 +1,11 @@ -{# variable "login" a login object #} +{# variable "login" a login object for all template as i is inherited #} - - - + + + - + {% block header %} @@ -31,13 +31,24 @@ {% endblock header_stylesheet %} {% block header_javascript %} - @@ -60,18 +71,6 @@ - - {% endblock header_javascript %} {% endblock header %} diff --git a/www/skins/login/js/main.js b/www/skins/login/js/main.js index 8dc54c9490..63ef38d292 100644 --- a/www/skins/login/js/main.js +++ b/www/skins/login/js/main.js @@ -145,3 +145,7 @@ function passwordChangeFormCtrl($scope) { }; } +// bootstrap angular +angular.element(document).ready(function() { + angular.bootstrap(document, ['phraseanetAuthentication']); +});