mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-15 05:53:13 +00:00
Update use of bootstrap to custom build
This commit is contained in:
@@ -15,21 +15,6 @@ $groups = array(
|
|||||||
'//skins/build/login.css',
|
'//skins/build/login.css',
|
||||||
'//assets/font-awesome/css/font-awesome.css',
|
'//assets/font-awesome/css/font-awesome.css',
|
||||||
),
|
),
|
||||||
'bootstrap_js' => array(
|
|
||||||
'//assets/bootstrap/js/bootstrap-tooltip.js',
|
|
||||||
'//assets/bootstrap/js/bootstrap-affix.js',
|
|
||||||
'//assets/bootstrap/js/bootstrap-alert.js',
|
|
||||||
'//assets/bootstrap/js/bootstrap-button.js',
|
|
||||||
'//assets/bootstrap/js/bootstrap-carousel.js',
|
|
||||||
'//assets/bootstrap/js/bootstrap-collapse.js',
|
|
||||||
'//assets/bootstrap/js/bootstrap-dropdown.js',
|
|
||||||
'//assets/bootstrap/js/bootstrap-modal.js',
|
|
||||||
'//assets/bootstrap/js/bootstrap-popover.js',
|
|
||||||
'//assets/bootstrap/js/bootstrap-scrollspy.js',
|
|
||||||
'//assets/bootstrap/js/bootstrap-tab.js',
|
|
||||||
'//assets/bootstrap/js/bootstrap-transition.js',
|
|
||||||
'//assets/bootstrap/js/bootstrap-typeahead.js',
|
|
||||||
),
|
|
||||||
'authentication' => array(
|
'authentication' => array(
|
||||||
'//assets/modernizr/modernizr.js',
|
'//assets/modernizr/modernizr.js',
|
||||||
'//assets/jquery/jquery.js',
|
'//assets/jquery/jquery.js',
|
||||||
|
@@ -103,6 +103,6 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
|
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
|
||||||
<script type="text/javascript" src="{{ path('minifier', { 'g' : 'bootstrap_js' }) }}"></script>
|
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/build/bootstrap/js/bootstrap.js' }) }}"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
@@ -80,6 +80,6 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
|
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
|
||||||
<script type="text/javascript" src="{{ path('minifier', { 'g' : 'bootstrap_js' }) }}"></script>
|
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/build/bootstrap/js/bootstrap.js' }) }}"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
@@ -103,6 +103,6 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
|
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
|
||||||
<script type="text/javascript" src="{{ path('minifier', { 'g' : 'bootstrap_js' }) }}"></script>
|
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/build/bootstrap/js/bootstrap.js' }) }}"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
@@ -81,6 +81,6 @@
|
|||||||
|
|
||||||
<!-- JavaScript at the bottom for fast page loading -->
|
<!-- 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' : 'assets/jquery/jquery.js' }) }}"></script>
|
||||||
<script type="text/javascript" src="{{ path('minifier', { 'g' : 'bootstrap_js' }) }}"></script>
|
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/build/bootstrap/js/bootstrap.js' }) }}"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/common/main.css' }) }}"/>
|
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/common/main.css' }) }}"/>
|
||||||
|
|
||||||
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
|
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
|
||||||
<script type="text/javascript" src="{{ path('minifier', { 'g' : 'bootstrap_js' }) }}"></script>
|
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/build/bootstrap/js/bootstrap.js' }) }}"></script>
|
||||||
|
|
||||||
{% block stylesheet %}{% endblock %}
|
{% block stylesheet %}{% endblock %}
|
||||||
{% block icon %}{% endblock %}
|
{% block icon %}{% endblock %}
|
||||||
|
@@ -49,7 +49,7 @@
|
|||||||
<script src="/assets/angular-ui/build/angular-ui-ieshiv.min.js"></script>
|
<script src="/assets/angular-ui/build/angular-ui-ieshiv.min.js"></script>
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
|
|
||||||
<script type="text/javascript" src="{{ path('minifier', { 'g' : 'bootstrap_js' }) }}"></script>
|
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/build/bootstrap/js/bootstrap.js' }) }}"></script>
|
||||||
<script type="text/javascript" src="{{ path('minifier', { 'g' : 'authentication' }) }}"></script>
|
<script type="text/javascript" src="{{ path('minifier', { 'g' : 'authentication' }) }}"></script>
|
||||||
{% endblock header_javascript %}
|
{% endblock header_javascript %}
|
||||||
{% endblock header %}
|
{% endblock header %}
|
||||||
|
@@ -17,7 +17,7 @@ require.config({
|
|||||||
backbone: "../assets/backbone-amd/backbone",
|
backbone: "../assets/backbone-amd/backbone",
|
||||||
twig: "../assets/twig/twig",
|
twig: "../assets/twig/twig",
|
||||||
i18n: "../assets/i18next/release/i18next.amd-1.6.2.min",
|
i18n: "../assets/i18next/release/i18next.amd-1.6.2.min",
|
||||||
bootstrap: "../skins/html5/bootstrap/js/bootstrap.min"
|
bootstrap: "../skins/build/bootstrap/js/bootstrap.min"
|
||||||
},
|
},
|
||||||
shim: {
|
shim: {
|
||||||
twig: {
|
twig: {
|
||||||
|
@@ -15,7 +15,7 @@ require.config({
|
|||||||
backbone: "../assets/backbone-amd/backbone",
|
backbone: "../assets/backbone-amd/backbone",
|
||||||
twig: "../assets/twig/twig",
|
twig: "../assets/twig/twig",
|
||||||
i18n: "../assets/i18next/release/i18next.amd-1.6.2.min",
|
i18n: "../assets/i18next/release/i18next.amd-1.6.2.min",
|
||||||
bootstrap: "../skins/html5/bootstrap/js/bootstrap.min"
|
bootstrap: "../skins/build/bootstrap/js/bootstrap.min"
|
||||||
},
|
},
|
||||||
shim: {
|
shim: {
|
||||||
bootstrap : ["jquery"],
|
bootstrap : ["jquery"],
|
||||||
|
Reference in New Issue
Block a user