Update to use minifier

This commit is contained in:
Romain Neutron
2013-05-24 18:28:59 +02:00
parent c1e76db8fc
commit 220a37faf9
6 changed files with 11 additions and 11 deletions

View File

@@ -5,8 +5,8 @@
{% set selected = "informations" %}
{% block head %}
<link rel="stylesheet" type="text/css" href="/include/minify/f=/skins/geonames/geonames.css">
<script type="text/javascript" src="/include/minify/f=/skins/geonames/geonames.js"></script>
<link rel="stylesheet" type="text/css" href="/include/minify/?f=/skins/geonames/geonames.css">
<script type="text/javascript" src="/include/minify/?f=/skins/geonames/geonames.js"></script>
<script type="text/javascript">
initialize_geoname_field($("#form_geonameid"));

View File

@@ -1,8 +1,8 @@
<html lang="{{ app["locale.I18n"] }}">
<head>
<title>{{ app["phraseanet.registry"].get("GV_homeTitle") }} {% block title %}{% endblock %}</title>
<link rel="stylesheet" type="text/css" href="/include/minify/f=/skins/build/account.css"/>
<script type="text/javascript" language="javascript" src="/include/minify/f=/assets/jquery/jquery.js,/assets/bootstrap/js/bootstrap-modal.js,/skins/account/account.js"></script>
<link rel="stylesheet" type="text/css" href="/include/minify/?f=/skins/build/account.css"/>
<script type="text/javascript" language="javascript" src="/include/minify/?f=/assets/jquery/jquery.js,/assets/bootstrap/js/bootstrap-modal.js,/skins/account/account.js"></script>
{% block head %}{% endblock %}
</head>

View File

@@ -8,7 +8,7 @@
{% endblock %}
{% block stylesheet %}
<link type="text/css" rel="stylesheet" href="/include/minify/?f=include/jslibs/jquery-ui-1.8.17/css/ui-lightness/jquery-ui-1.8.17.custom.css,include/jslibs/jquery-treeview/jquery.treeview.css,include/jslibs/jquery.contextmenu.css,skins/account/geonames.css,skins/common/main.css,skins/admin/css/Main.css,skins/admin/css/Bases.css,skins/admin/css/Tables.css,skins/admin/css/fields.css " />
<link type="text/css" rel="stylesheet" href="/include/minify/?f=include/jslibs/jquery-ui-1.8.17/css/ui-lightness/jquery-ui-1.8.17.custom.css,include/jslibs/jquery-treeview/jquery.treeview.css,include/jslibs/jquery.contextmenu.css,skins/geonames/geonames.css,skins/common/main.css,skins/admin/css/Main.css,skins/admin/css/Bases.css,skins/admin/css/Tables.css,skins/admin/css/fields.css" />
{% endblock %}

View File

@@ -26,7 +26,7 @@
{% endblock favicon %}
{% block header_stylesheet %}
<link rel="stylesheet" href="/include/minify/g=authentication_css">
<link rel="stylesheet" href="/include/minify/?g=authentication_css">
<!--[if IE 7]>
<link rel="stylesheet" href="/assets/font-awesome/css/font-awesome-ie7.min.css">
@@ -49,7 +49,7 @@
<script src="/assets/angular-ui/build/angular-ui-ieshiv.min.js"></script>
<![endif]-->
<script type="text/javascript" src="/include/minify/g=authentication"></script>
<script type="text/javascript" src="/include/minify/?g=authentication"></script>
{% endblock header_javascript %}
{% endblock header %}
</head>

View File

@@ -97,9 +97,9 @@
}
</style>
<link type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/f=include/jslibs/jquery.contextmenu.css,include/jslibs/colorpicker/css/colorpicker.css,include/jslibs/jquery-treeview/jquery.treeview.css,skins/common/main.css,skins/geonames/geonames.css,include/jquery.image_enhancer.css,include/jslibs/jquery-ui-1.8.17/css/dark-hive/jquery-ui-1.8.17.custom.css" >
<link id="skinCss" type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/f=skins/prod/{{cssfile}}/prodcolor.css" >
<link type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/f=assets/humane-js/themes/libnotify.css,skins/prod/Prod.css,skins/prod/Basket.css,skins/prod/Push.css" >
<link type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/?f=include/jslibs/jquery.contextmenu.css,include/jslibs/colorpicker/css/colorpicker.css,include/jslibs/jquery-treeview/jquery.treeview.css,skins/common/main.css,skins/geonames/geonames.css,include/jquery.image_enhancer.css,include/jslibs/jquery-ui-1.8.17/css/dark-hive/jquery-ui-1.8.17.custom.css" >
<link id="skinCss" type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/?f=skins/prod/{{cssfile}}/prodcolor.css" >
<link type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/?f=assets/humane-js/themes/libnotify.css,skins/prod/Prod.css,skins/prod/Basket.css,skins/prod/Push.css" >
<!--[if IE 7]>
<link type="text/css" rel="stylesheet" href="/include/minify/?f=skins/prod/ie7.css" >

View File

@@ -2,7 +2,7 @@
"http://www.w3.org/TR/html4/strict.dtd">
<html lang="{{ locale }}">
<head>
<script src="/include/minify/f=include/jslibs/jquery-1.7.1.js,include/jslibs/jquery-validation/$.validate.js,include/jslibs/jquery-validate.password/$.validate.password.js,include/jslibs/$.cookie.js" type="text/javascript"></script>
<script src="/include/minify/?f=include/jslibs/jquery-1.7.1.js,include/jslibs/jquery-validation/$.validate.js,include/jslibs/jquery-validate.password/$.validate.password.js,include/jslibs/$.cookie.js" type="text/javascript"></script>
<script type="text/javascript" src="/include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js"></script>
<script type="text/javascript" src="/include/path_files_tests.$.js"></script>
<link rel="stylesheet" type="text/css" href="/include/jslibs/jquery-ui-1.8.17/css/dark-hive/jquery-ui-1.8.17.custom.css" />