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

Fix assets path

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-08-13 01:30:10 +02:00
parent f3e1627130
commit 7d8e93bddd
18 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Gruntfile.js
View File

@@ -38,9 +38,10 @@ module.exports = function(grunt) {
},
"blueimp": {
"expand": true,
"src": ["js/load-image.js", "css/jquery.fileupload-ui.css"],
"src": "js/load-image.js",
"dest": "www/assets/blueimp-load-image/",
"cwd": "assets/blueimp-load-image"
"cwd": "assets/blueimp-load-image",
"flatten": true
},
"bootstrap": {
"expand": true,
@@ -109,21 +110,26 @@ module.exports = function(grunt) {
"expand": true,
"src": [
"assets/jquery-file-upload/js/jquery.fileupload.js",
"assets/jquery-file-upload/js/jquery.iframe-transport.js"
"assets/jquery-file-upload/js/jquery.iframe-transport.js",
"assets/jquery-file-upload/css/jquery.fileupload-ui.css"
],
"dest": "www/assets/jquery-file-upload/",
"flatten": true
},
"jquery-ui": {
"expand": true,
"cwd": "assets/jquery.ui/dist",
"cwd": "assets/jquery.ui",
"src": [
"i18n/*",
"images/*",
"themes/*",
"jquery-ui.css",
"jquery-ui.js"
"dist/i18n/*",
"dist/images/*",
"themes/base/*",
"themes/base/images/*",
"dist/jquery-ui.css",
"dist/jquery-ui.js"
],
"rename": function(dest, src) {
return dest + src.replace("dist", "");
},
"dest": "www/assets/jquery.ui/"
},
"js-fixtures": {

16
lib/conf.d/minifyGroupsConfig.php
View File

@@ -11,7 +11,7 @@
$groups = array(
'authentication_css' => array(
'//assets/normalize-css/normalize.css',
'//skins/build/login.css',
'//assets/build/login.css',
'//assets/font-awesome/css/font-awesome.css',
'//assets/jquery.ui/themes/base/jquery.ui.autocomplete.css'
),
@@ -22,7 +22,7 @@ $groups = array(
),
'client' => array(
'//include/jslibs/swfobject/swfobject.js'
, '//include/jslibs/jquery-ui-1.10.3/jquery-ui-i18n.js'
, '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//include/jslibs/jquery.cookie.js'
, '//include/jquery.common.js'
, '//include/jslibs/json2.js'
@@ -39,7 +39,7 @@ $groups = array(
, '//assets/underscore-amd/underscore.js'
, '//include/jslibs/jquery.cookie.js'
, '//include/jslibs/jquery-treeview/jquery.treeview.js'
, '//include/jslibs/jquery-ui-1.10.3/jquery-ui-i18n.js'
, '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//include/jquery.kb-event.js'
, '//skins/admin/users.js'
, '//skins/admin/editusers.js'
@@ -51,7 +51,7 @@ $groups = array(
, '//assets/jquery-file-upload/jquery.fileupload.js'
),
'report' => array(
'//include/jslibs/jquery-ui-1.10.3/jquery-ui-i18n.js'
'//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//include/jslibs/jquery.cookie.js'
, '//include/jquery.common.js'
, '//include/jquery.tooltip.js'
@@ -63,7 +63,7 @@ $groups = array(
, '//skins/report/report.js'
),
'modalBox' => array(
'//include/jslibs/jquery-ui-1.10.3/jquery-ui-i18n.js'
'//assets/jquery.ui/i18n/jquery-ui-i18n.js'
),
'prod' => array(
'//include/jslibs/swfobject/swfobject.js'
@@ -72,7 +72,7 @@ $groups = array(
, '//include/jslibs/colorpicker/js/colorpicker.js'
, '//include/jslibs/jquery.mousewheel.js'
, '//include/jslibs/jquery.lazyload/jquery.lazyload.1.8.1.js'
, '//include/jslibs/jquery-ui-1.10.3/jquery-ui-i18n.js'
, '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//include/jslibs/jquery.cookie.js'
, '//include/jquery.common.js'
, '//assets/humane-js/humane.js'
@@ -118,7 +118,7 @@ $groups = array(
'//include/jslibs/jquery.mousewheel.js'
, '//include/jquery.tooltip.js'
, '//include/jslibs/swfobject/swfobject.js'
, '//include/jslibs/jquery-ui-1.10.3/jquery-ui-i18n.js'
, '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//include/jslibs/jquery.cookie.js'
, '//include/jslibs/jquery.contextmenu_scroll.js'
, '//include/jquery.common.js'
@@ -130,7 +130,7 @@ $groups = array(
'//include/jslibs/jquery.mousewheel.js'
, '//include/jquery.tooltip.js'
, '//include/jslibs/swfobject/swfobject.js'
, '//include/jslibs/jquery-ui-1.10.3/jquery-ui-i18n.js'
, '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//include/jslibs/jquery.cookie.js'
, '//include/jslibs/jquery.contextmenu_scroll.js'
, '//include/jquery.common.js'

6
templates/mobile/api/auth/end_user_authorization.html.twig
View File

@@ -9,8 +9,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- styles -->
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap-responsive.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/bootstrap/css/bootstrap.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/bootstrap/css/bootstrap-responsive.css' }) }}" />
<link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/oauth/default.css' }) }}" />
<!-- All JavaScript at the bottom, except this Modernizr build.
@@ -103,6 +103,6 @@
</div>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/build/bootstrap/js/bootstrap.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/bootstrap/js/bootstrap.js' }) }}"></script>
</body>
</html>

6
templates/mobile/api/auth/native_app_access_token.html.twig
View File

@@ -15,8 +15,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- styles -->
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap-responsive.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/bootstrap/css/bootstrap.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/bootstrap/css/bootstrap-responsive.css' }) }}" />
<link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/oauth/default.css' }) }}" />
<!-- All JavaScript at the bottom, except this Modernizr build.
@@ -80,6 +80,6 @@
</div>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/build/bootstrap/js/bootstrap.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/bootstrap/js/bootstrap.js' }) }}"></script>
</body>
</html>

2
templates/web/account/base.html.twig
View File

@@ -4,7 +4,7 @@
{% extends "common/index_bootstrap.html.twig" %}
{% block stylesheet %}
<link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/build/account.css' }) }}"/>
<link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'assets/build/account.css' }) }}"/>
{% endblock %}
{% block javascript %}

2
templates/web/admin/index.html.twig
View File

@@ -8,7 +8,7 @@
{% endblock %}
{% block stylesheet %}
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'include/jslibs/jquery-treeview/jquery.treeview.css,include/jslibs/jquery.contextmenu.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,skins/geonames/geonames.css,assets/jquery-file-upload/css/jquery.fileupload-ui.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'include/jslibs/jquery-treeview/jquery.treeview.css,include/jslibs/jquery.contextmenu.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,skins/geonames/geonames.css,assets/jquery-file-upload/jquery.fileupload-ui.css' }) }}" />
{% endblock %}

2
templates/web/admin/subdefs.html.twig
View File

@@ -12,7 +12,7 @@
{% block javascript %}
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js,include/path_files_tests.jquery.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.10.3.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery.ui/jquery-ui.js' }) }}"></script>
<script type="text/javascript">
$(document).ready(function(){
$('.path_testable').path_file_test();

6
templates/web/api/auth/end_user_authorization.html.twig
View File

@@ -9,8 +9,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- styles -->
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap-responsive.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/bootstrap/css/bootstrap.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/bootstrap/css/bootstrap-responsive.css' }) }}" />
<link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/oauth/default.css' }) }}" />
<!-- All JavaScript at the bottom, except this Modernizr build.
@@ -103,6 +103,6 @@
</div>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/build/bootstrap/js/bootstrap.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/bootstrap/js/bootstrap.js' }) }}"></script>
</body>
</html>

6
templates/web/api/auth/native_app_access_token.html.twig
View File

@@ -15,8 +15,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- styles -->
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap-responsive.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/bootstrap/css/bootstrap.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/bootstrap/css/bootstrap-responsive.css' }) }}" />
<link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/oauth/default.css' }) }}" />
<!-- All JavaScript at the bottom, except this Modernizr build.
@@ -81,6 +81,6 @@
<!-- JavaScript at the bottom for fast page loading -->
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/build/bootstrap/js/bootstrap.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/bootstrap/js/bootstrap.js' }) }}"></script>
</body>
</html>

2
templates/web/client/index.html.twig
View File

@@ -39,7 +39,7 @@
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/client/ie6.css' }) }}" >
<![endif]-->
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.10.3.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery.ui/jquery-ui.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'g' : 'client' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/flowplayer/flowplayer-3.2.11.min.js' }) }}"></script>

8
templates/web/common/index_bootstrap.html.twig
View File

@@ -5,8 +5,8 @@
<title>{% if local_title is defined%}{{local_title}} | {% endif %}{{ app['phraseanet.registry'].get('GV_homeTitle') }} {% if module_name is defined %} - {{ module_name }} {% endif %}</title>
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.10.3/css/'~ jquery_theme|default('ui-lightness') ~'/jquery-ui-1.10.3.custom.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap-responsive.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/bootstrap/css/bootstrap.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/bootstrap/css/bootstrap-responsive.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/font-awesome/css/font-awesome.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/common/main.css' }) }}"/>
@@ -16,11 +16,11 @@
<![endif]-->
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.10.3.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery.ui/jquery-ui.js' }) }}"></script>
<script type="text/javascript">
$.widget.bridge('uitooltip', $.ui.tooltip);
</script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/build/bootstrap/js/bootstrap.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/bootstrap/js/bootstrap.js' }) }}"></script>
<script type="text/javascript">
var btn = $.fn.button.noConflict(); // reverts $.fn.button to jqueryui btn
$.fn.btn = btn; // assigns bootstrap button functionality to $.fn.btn

2
templates/web/overview.html.twig
View File

@@ -61,7 +61,7 @@
{% endblock %}
{% block javascript %}
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js,include/jslibs/jquery.mousewheel.js,include/jquery.image_enhancer.js,include/jslibs/swfobject/swfobject.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.10.3.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery.ui/jquery-ui.js' }) }}"></script>
<script type="text/javascript" src="/include/jslibs/flowplayer/flowplayer-3.2.11.min.js"></script>
<script type="text/javascript">
$(document).ready(function(){

2
templates/web/setup/wrapper.html.twig
View File

@@ -3,7 +3,7 @@
<html lang="{{ locale }}">
<head>
<script src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.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="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.10.3.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery.ui/jquery-ui.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/path_files_tests.jquery.js' }) }}"></script>
<link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.10.3/css/dark-hive/jquery-ui-1.10.3.custom.css' }) }}" />
<link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/setup/setup.css' }) }}" />

2
templates/web/thesaurus/thesaurus.html.twig
View File

@@ -15,7 +15,7 @@
<link rel="shortcut icon" type="image/x-icon" href="/skins/thesaurus/favicon.ico">
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.10.3.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery.ui/jquery-ui.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'g' : 'thesaurus' }) }}"></script>
<script type="text/javascript">

2
www/include/js/tests/jquery.Upload.js.html
View File

@@ -4,7 +4,7 @@
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script src="../../../assets/jquery/jquery.js"></script>
<script src="../../jslibs/jquery-ui-1.10.3.js"></script>
<script src="../../../assets/jquery.ui/jquery-ui.js"></script>
<script src="../../../assets/qunit/qunit.js"></script>
<script src="../../../assets/blueimp-load-image/load-image.js"></script>
<script src="../../../skins/prod/jquery.Upload.js"></script>

2
www/include/jslibs/jquery.vertical.buttonset.html
View File

@@ -1,7 +1,7 @@
<meta charset="utf-8">
<script type="text/javascript" src="/assets/jquery/jquery.js"></script>
<script type="text/javascript" src="jquery-ui-1.10.3.js"></script>
<script type="text/javascript" src="/assets/jquery.ui/jquery-ui.js"></script>
<script type="text/javascript" src="jquery.vertical.buttonset.js"></script>
<link media="all" type="text/css" href="jquery-ui-1.10.3/css/dark-hive/jquery-ui-1.10.3.custom.css" rel="stylesheet">

6
www/scripts/apps/admin/fields/main.js
View File

@@ -12,11 +12,11 @@ require.config({
baseUrl: "/scripts",
paths: {
jquery: "../assets/jquery/jquery",
jqueryui: "../include/jslibs/jquery-ui-1.10.3",
jqueryui: "../assets/jquery.ui/jquery-ui",
underscore: "../assets/underscore-amd/underscore",
backbone: "../assets/backbone-amd/backbone",
i18n: "../assets/i18next/release/i18next.amd-1.6.2.min",
bootstrap: "../skins/build/bootstrap/js/bootstrap.min"
i18n: "../assets/i18next/i18next.amd-1.6.3",
bootstrap: "../assets/bootstrap/js/bootstrap.min"
},
shim: {
bootstrap : ["jquery"],

6
www/scripts/apps/login/home/config.js
View File

@@ -12,11 +12,11 @@ require.config({
baseUrl: "/scripts",
paths: {
jquery: "../assets/jquery/jquery",
jqueryui: "../include/jslibs/jquery-ui-1.10.3.min",
jqueryui: "..assets/jquery.ui/jquery-ui",
underscore: "../assets/underscore-amd/underscore",
backbone: "../assets/backbone-amd/backbone",
i18n: "../assets/i18next/release/i18next.amd-1.6.2.min",
bootstrap: "../skins/build/bootstrap/js/bootstrap.min",
i18n: "../assets/i18next/i18next.amd-1.6.3",
bootstrap: "../assets/bootstrap/js/bootstrap.min",
multiselect: "../assets/bootstrap-multiselect/js/bootstrap-multiselect",
"jquery.geonames": "../assets/geonames-server-jquery-plugin/jquery.geonames"
},