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

report component, js lib moved

Browse Source
This commit is contained in:
Florian BLOUET
2015-11-17 17:56:06 +01:00
parent 0f723c6f58
commit 416c8cf161
6 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/gulp/components/report.js
View File

@@ -21,9 +21,10 @@ gulp.task('build-report-css', ['build-report-print-css'], function(){
gulp.task('build-report', ['copy-report-images', 'build-report-css'], function(){ gulp.task('build-report', ['copy-report-images', 'build-report-css'], function(){
var reportGroup = [ var reportGroup = [
config.paths.dist + 'include/jslibs/jquery.print.js', config.paths.src + 'report/js/jquery.print.js',
config.paths.dist + 'include/jslibs/jquery.cluetip.js', config.paths.src + 'report/js/jquery.cluetip.js',
config.paths.dist + 'include/jquery.nicoslider.js', config.paths.src + 'report/js/jquery.nicoslider.js',
config.paths.src + 'report/js/jquery.gvChart-0.1.js',
config.paths.src + 'report/js/report.js' config.paths.src + 'report/js/report.js'
]; ];
return utils.buildJsGroup(reportGroup, 'report', 'report/js'); return utils.buildJsGroup(reportGroup, 'report', 'report/js');

0
www/include/jslibs/jquery.cluetip.js → resources/www/report/js/jquery.cluetip.js
View File

0
www/include/jslibs/jquery.gvChart-0.1.js → resources/www/report/js/jquery.gvChart-0.1.js
View File

0
www/include/jquery.nicoslider.js → resources/www/report/js/jquery.nicoslider.js
View File

0
www/include/jslibs/jquery.print.js → resources/www/report/js/jquery.print.js
View File

1
templates/web/report/all_content.html.twig
View File

@@ -35,7 +35,6 @@
<script type="text/javascript" src="https://www.google.com/jsapi"></script> <script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript" src="/assets/common/js/common{% if not app.debug %}.min{% endif %}.js"></script> <script type="text/javascript" src="/assets/common/js/common{% if not app.debug %}.min{% endif %}.js"></script>
<script type="text/javascript" src="/assets/report/js/report{% if not app.debug %}.min{% endif %}.js"></script> <script type="text/javascript" src="/assets/report/js/report{% if not app.debug %}.min{% endif %}.js"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery.gvChart-0.1.js' }) }}"></script>
<script type="text/javascript"> <script type="text/javascript">
gvChartInit(); gvChartInit();
</script> </script>