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

Add json3 dependency & add phraseanet namespace

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-02-26 20:39:46 +01:00
committed by Romain Neutron
parent 8058c43b5c
commit 1dc15d7858
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
component.json
View File

@@ -10,6 +10,7 @@
"underscore": "~1.4.4", "underscore": "~1.4.4",
"modernizr": "~2.6.2", "modernizr": "~2.6.2",
"normalize-css" : "~2.1.0", "normalize-css" : "~2.1.0",
"json3" : "3.2.4",
"jquery-file-upload": "~7", "jquery-file-upload": "~7",
"blueimp-load-image": "latest", "blueimp-load-image": "latest",
"requirejs" : "~2.1", "requirejs" : "~2.1",

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

@@ -1,10 +1,12 @@
{# variable "login" a login object #} {# variable "login" a login object #}
<!DOCTYPE html> <!DOCTYPE html>
<!--[if lt IE 7]> <html ng-app="phraseanetAuthentication" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]--> <!--[if lt IE 7]> <html ng-app="phraseanetAuthentication" 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"> <![endif]--> <!--[if IE 7]> <html ng-app="phraseanetAuthentication" 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"> <![endif]--> <!--[if IE 8]> <html ng-app="phraseanetAuthentication" class="no-js lt-ie9" xmlns:phraseanet="http://phraseanet.com"> <![endif]-->
<!--[if gt IE 8]><!--> <html ng-app="phraseanetAuthentication" class="no-js"> <!--<![endif]--> <!--[if gt IE 8]>
<!-->
<html ng-app="phraseanetAuthentication" class="no-js" xmlns:phraseanet="http://phraseanet.com">
<!--<![endif]-->
<head> <head>
{% block header %} {% block header %}
<meta charset="utf-8"> <meta charset="utf-8">
@@ -34,6 +36,10 @@
{% endblock header_stylesheet %} {% endblock header_stylesheet %}
{% block header_javascript %} {% block header_javascript %}
<!--[if lt IE 10]>
cript src="/assets/json3/lib/json3.min.js"></script>
<![endif]-->
<script src="/assets/modernizr/modernizr.js"></script> <script src="/assets/modernizr/modernizr.js"></script>
<script src="/assets/jquery/jquery.js"></script> <script src="/assets/jquery/jquery.js"></script>
<script src="/assets/bootstrap/js/bootstrap-transition.js"></script> <script src="/assets/bootstrap/js/bootstrap-transition.js"></script>