mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
Bump phraseanet-production-client
fix jquery ui dependency, fix ftp export, fix thesaurus search actions, misc fixes
This commit is contained in:
@@ -33,6 +33,6 @@
|
|||||||
"postinstall": "./node_modules/.bin/gulp install;"
|
"postinstall": "./node_modules/.bin/gulp install;"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"phraseanet-production-client": "~0.6.0"
|
"phraseanet-production-client": "~0.7.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -13,6 +13,10 @@
|
|||||||
|
|
||||||
|
|
||||||
{% block javascript %}
|
{% block javascript %}
|
||||||
|
<script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui{% if not app.debug %}.min{% endif %}.js"></script>
|
||||||
|
<script type="text/javascript">
|
||||||
|
$.widget.bridge('uitooltip', $.ui.tooltip);
|
||||||
|
</script>
|
||||||
{% include "common/templates.html.twig" %}
|
{% include "common/templates.html.twig" %}
|
||||||
<script type="text/javascript" src="/assets/vendors/jquery-test-paths/jquery.test-paths{% if not app.debug %}.min{% endif %}.js"></script>
|
<script type="text/javascript" src="/assets/vendors/jquery-test-paths/jquery.test-paths{% if not app.debug %}.min{% endif %}.js"></script>
|
||||||
{# note: Tinymce must be include here without minify else URL resolution for tinymce plugins will fail #}
|
{# note: Tinymce must be include here without minify else URL resolution for tinymce plugins will fail #}
|
||||||
|
@@ -487,20 +487,6 @@
|
|||||||
<button type="button" class="close_button btn btn-inverse">{{ 'boutton::annuler' | trans }}</button>
|
<button type="button" class="close_button btn btn-inverse">{{ 'boutton::annuler' | trans }}</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script type="text/javascript">
|
|
||||||
$(document).ready(function(){
|
|
||||||
$('#ftp_form_selector').bind('change',function(){
|
|
||||||
$('#ftp .ftp_form').hide();
|
|
||||||
$('#ftp .ftp_form_'+$(this).val()).show();
|
|
||||||
$('.ftp_folder_check', dialog.get(1).getDomElement()).unbind('change').bind('change', function(){
|
|
||||||
if($(this).prop('checked'))
|
|
||||||
$(this).next().prop('disabled',false);
|
|
||||||
else
|
|
||||||
$(this).next().prop('disabled',true);
|
|
||||||
});
|
|
||||||
}).trigger('change');
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
@@ -510,6 +496,7 @@
|
|||||||
var exportConfig = {
|
var exportConfig = {
|
||||||
isGuest: false,
|
isGuest: false,
|
||||||
maxDownload: {{max_download}},
|
maxDownload: {{max_download}},
|
||||||
|
haveFtp: {% if download.get_total_ftp() > 0 %}true{% else %}false{% endif %},
|
||||||
msg: {
|
msg: {
|
||||||
termOfUseTitle: '{{ "Terms of Use" | trans }}',
|
termOfUseTitle: '{{ "Terms of Use" | trans }}',
|
||||||
termOfUseAgree: '{{ 'You must agree to the Terms of Use to continue.' | trans }}',
|
termOfUseAgree: '{{ 'You must agree to the Terms of Use to continue.' | trans }}',
|
||||||
|
@@ -19,16 +19,7 @@
|
|||||||
|
|
||||||
<script type="text/javascript" src="/assets/vendors/modernizr/modernizr{% if not app.debug %}.min{% endif %}.js"></script>
|
<script type="text/javascript" src="/assets/vendors/modernizr/modernizr{% if not app.debug %}.min{% endif %}.js"></script>
|
||||||
<script type="text/javascript" src="/assets/vendors/jquery/jquery{% if not app.debug %}.min{% endif %}.js"></script>
|
<script type="text/javascript" src="/assets/vendors/jquery/jquery{% if not app.debug %}.min{% endif %}.js"></script>
|
||||||
<script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui{% if not app.debug %}.min{% endif %}.js"></script>
|
|
||||||
<script type="text/javascript">
|
|
||||||
$.widget.bridge('uitooltip', $.ui.tooltip);
|
|
||||||
</script>
|
|
||||||
<script type="text/javascript" src="/assets/vendors/bootstrap/js/bootstrap{% if not app.debug %}.min{% endif %}.js"></script>
|
<script type="text/javascript" src="/assets/vendors/bootstrap/js/bootstrap{% if not app.debug %}.min{% endif %}.js"></script>
|
||||||
<script type="text/javascript">
|
|
||||||
// jQuery.noConflict();
|
|
||||||
var btn = $.fn.button.noConflict(); // reverts $.fn.button to jqueryui btn
|
|
||||||
$.fn.btn = btn; // assigns bootstrap button functionality to $.fn.btn
|
|
||||||
</script>
|
|
||||||
{% block rss %}{% endblock %}
|
{% block rss %}{% endblock %}
|
||||||
{% block javascript %}{% endblock %}
|
{% block javascript %}{% endblock %}
|
||||||
</head>
|
</head>
|
||||||
|
@@ -106,7 +106,6 @@
|
|||||||
|
|
||||||
{% if list['complete'] is not defined %} {# Zip not done #}
|
{% if list['complete'] is not defined %} {# Zip not done #}
|
||||||
$.post("{{ path('execute_download', {'token': token.getValue(), 'type': type, 'anonymous': anonymous}) }}", function(data){
|
$.post("{{ path('execute_download', {'token': token.getValue(), 'type': type, 'anonymous': anonymous}) }}", function(data){
|
||||||
var data = $.parseJSON(data);
|
|
||||||
if(data.success) {
|
if(data.success) {
|
||||||
$('form[name=download]').submit();
|
$('form[name=download]').submit();
|
||||||
}
|
}
|
||||||
|
@@ -10,6 +10,10 @@
|
|||||||
{% endblock icon%}
|
{% endblock icon%}
|
||||||
|
|
||||||
{% block javascript %}
|
{% block javascript %}
|
||||||
|
<script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui{% if not app.debug %}.min{% endif %}.js"></script>
|
||||||
|
<script type="text/javascript">
|
||||||
|
$.widget.bridge('uitooltip', $.ui.tooltip);
|
||||||
|
</script>
|
||||||
<script type="text/javascript" >
|
<script type="text/javascript" >
|
||||||
|
|
||||||
var usrId = '{{ app.getAuthenticator().user.getId }}' ;
|
var usrId = '{{ app.getAuthenticator().user.getId }}' ;
|
||||||
|
Reference in New Issue
Block a user