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

Merge pull request #2538 from mike-esokia/PHRAS-1937_fix_preview_permalink_new

Browse Source 
PHRAS-1937 - fix preview permalink new
This commit is contained in:
Nicolas Maillat
2018-03-30 09:43:32 +02:00
committed by GitHub
parent 236a0c95c7 e4689a180b
commit 482cacbd20
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,6 @@
<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-ui/jquery-ui.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/vendors/bootstrap/js/bootstrap{% if not app.debug %}.min{% endif %}.js"></script>
<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
@@ -29,8 +28,9 @@
<script type="text/javascript"
src="/assets/vendors/underscore/underscore{% if not app.debug %}.min{% endif %}.js"></script>
{% block rss %}{% endblock %}
{% block javascript %}{% endblock %}
<script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui.js"></script>
{% block javascript %}
<script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui.js"></script>
{% endblock %}
</head>
<body class="PNB">
<div id="mainContainer" class="PNB">

7
templates/web/common/indexfloat.html.twig
View File

@@ -9,7 +9,12 @@
{% block rss %}{% endblock %}
{% block stylesheet %}{% endblock %}
{% block icon %}{% endblock %}
{% block javascript %}{% endblock %}
{% block javascript %}
<script type="text/javascript"
src="/assets/vendors/jquery/jquery{% if not app.debug %}.min{% endif %}.js"></script>
<script type="text/javascript"
src="/assets/vendors/underscore/underscore{% if not app.debug %}.min{% endif %}.js"></script>
{% endblock %}
</head>
<body>
<div id="mainContainer">