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

Update use of bootstrap to custom build

Browse Source
This commit is contained in:
Romain Neutron
2013-06-13 13:08:53 +02:00
parent b783577f1b
commit f451a4ebe7
9 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/conf.d/minifyGroupsConfig.php
View File

@@ -15,21 +15,6 @@ $groups = array(
'//skins/build/login.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(
'//assets/modernizr/modernizr.js',
'//assets/jquery/jquery.js',

2
templates/mobile/api/auth/end_user_authorization.html.twig
View File

@@ -103,6 +103,6 @@
</div>
<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>
</html>

2
templates/mobile/api/auth/native_app_access_token.html.twig
View File

@@ -80,6 +80,6 @@
</div>
<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>
</html>

2
templates/web/api/auth/end_user_authorization.html.twig
View File

@@ -103,6 +103,6 @@
</div>
<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>
</html>

2
templates/web/api/auth/native_app_access_token.html.twig
View File

@@ -81,6 +81,6 @@
<!-- 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', { 'g' : 'bootstrap_js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/build/bootstrap/js/bootstrap.js' }) }}"></script>
</body>
</html>

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

@@ -9,7 +9,7 @@
<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', { 'g' : 'bootstrap_js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/build/bootstrap/js/bootstrap.js' }) }}"></script>
{% block stylesheet %}{% endblock %}
{% block icon %}{% endblock %}

2
templates/web/login/layout/base-layout.html.twig
View File

@@ -49,7 +49,7 @@
<script src="/assets/angular-ui/build/angular-ui-ieshiv.min.js"></script>
<![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>
{% endblock header_javascript %}
{% endblock header %}

2
www/scripts/apps/admin/fields/main.js
View File

@@ -17,7 +17,7 @@ require.config({
backbone: "../assets/backbone-amd/backbone",
twig: "../assets/twig/twig",
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: {
twig: {

2
www/scripts/tests/main.js
View File

@@ -15,7 +15,7 @@ require.config({
backbone: "../assets/backbone-amd/backbone",
twig: "../assets/twig/twig",
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: {
bootstrap : ["jquery"],