hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix IE angular bootstrap && html5 tag resolution

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-02-27 12:58:57 +01:00
committed by Romain Neutron
parent 13b31b7da2
commit 09242ae2fd
2 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
templates/web/login/layout/base-layout.html.twig
View File

@@ -1,11 +1,11 @@
{# variable "login" a login object #} {# variable "login" a login object for all template as i is inherited #}
<!DOCTYPE html> <!DOCTYPE html>
<!--[if lt IE 7]> <html ng-app="phraseanetAuthentication" class="no-js lt-ie9 lt-ie8 lt-ie7" xmlns:phraseanet="http://phraseanet.com"> <![endif]--> <!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" xmlns:phraseanet="http://phraseanet.com"> <![endif]-->
<!--[if IE 7]> <html ng-app="phraseanetAuthentication" class="no-js lt-ie9 lt-ie8" xmlns:phraseanet="http://phraseanet.com"> <![endif]--> <!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" xmlns:phraseanet="http://phraseanet.com"> <![endif]-->
<!--[if IE 8]> <html ng-app="phraseanetAuthentication" class="no-js lt-ie9" xmlns:phraseanet="http://phraseanet.com"> <![endif]--> <!--[if IE 8]> <html class="no-js lt-ie9" xmlns:phraseanet="http://phraseanet.com"> <![endif]-->
<!--[if gt IE 8]> <!--[if gt IE 8]>
<!--> <!-->
<html ng-app="phraseanetAuthentication" class="no-js" xmlns:phraseanet="http://phraseanet.com"> <html class="no-js" xmlns:phraseanet="http://phraseanet.com">
<!--<![endif]--> <!--<![endif]-->
<head> <head>
{% block header %} {% block header %}
@@ -36,8 +36,19 @@
{% endblock header_stylesheet %} {% endblock header_stylesheet %}
{% block header_javascript %} {% block header_javascript %}
<!--[if lt IE 10]> <!--[if lte IE 8]>
cript src="/assets/json3/lib/json3.min.js"></script> <script src="/assets/json3/lib/json3.min.js"></script>
<script>
// The ieshiv takes care of our ui.directives, bootstrap module directives and
// AngularJS's ng-view, ng-include, ng-pluralize and ng-switch directives.
// However, IF you have custom directives (yours or someone else's) then
// enumerate the list of tags in window.myCustomTags
window.myCustomTags = ['phraseanetAlert']; // optional
</script>
<script src="/assets/angular-ui/build/angular-ui-ieshiv.js"></script>
<![endif]--> <![endif]-->
<script src="/assets/modernizr/modernizr.js"></script> <script src="/assets/modernizr/modernizr.js"></script>
@@ -60,18 +71,6 @@
<script src="/skins/login/js/bootstrap-switch.js"></script> <script src="/skins/login/js/bootstrap-switch.js"></script>
<script src="/assets/underscore/underscore.js"></script> <script src="/assets/underscore/underscore.js"></script>
<script src="/skins/login/js/main.js"></script> <script src="/skins/login/js/main.js"></script>
<!--[if lte IE 8]>
<script>
// The ieshiv takes care of our ui.directives, bootstrap module directives and
// AngularJS's ng-view, ng-include, ng-pluralize and ng-switch directives.
// However, IF you have custom directives (yours or someone else's) then
// enumerate the list of tags in window.myCustomTags
window.myCustomTags = ['alert']; // optional
</script>
<script src="/assets/angular-ui/build/angular-ui-ieshiv.js"></script>
<![endif]-->
{% endblock header_javascript %} {% endblock header_javascript %}
{% endblock header %} {% endblock header %}
</head> </head>

4
www/skins/login/js/main.js
View File

@@ -145,3 +145,7 @@ function passwordChangeFormCtrl($scope) {
}; };
} }
// bootstrap angular
angular.element(document).ready(function() {
angular.bootstrap(document, ['phraseanetAuthentication']);
});