mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 09:53:15 +00:00
Merge branch 'master' into PHRAS-2671_change_behaviour_of_display_audio
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
<script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui.js"></script>
|
||||
{% endblock %}
|
||||
</head>
|
||||
<body class="PNB {{ cssfile }}">
|
||||
<body class="PNB">
|
||||
<div id="mainContainer" class="PNB">
|
||||
{% include 'common/menubar.html.twig' %}
|
||||
<div class="PNB" id="mainContent" style="overflow: auto">
|
||||
|
@@ -146,7 +146,7 @@
|
||||
$(document).ready(function(){
|
||||
prodApp.appEvents.emit('workzone.doRemoveWarning', "{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), "warning_on_delete_story") %}true{% else %}false{% endif %}");
|
||||
prodApp.appEvents.emit('search.updateFacetData');
|
||||
|
||||
$('body').addClass('{{ cssfile }}');
|
||||
|
||||
});
|
||||
</script>
|
||||
|
Reference in New Issue
Block a user