diff --git a/lib/conf.d/minifyGroupsConfig.php b/lib/conf.d/minifyGroupsConfig.php index 3836157de6..7fdf5a2e56 100644 --- a/lib/conf.d/minifyGroupsConfig.php +++ b/lib/conf.d/minifyGroupsConfig.php @@ -9,6 +9,35 @@ * changes. http://yourdomain/min/builder/ * */ $groups = array( + 'authentication_css' => array( + '//assets/normalize-css/normalize.css', + '//assets/bootstrap-switch/static/stylesheets/bootstrapSwitch.css', + '//skins/login/css/style.css', + '//assets/font-awesome/css/font-awesome.css', + ), + 'authentication' => array( + '//assets/modernizr/modernizr.js', + '//assets/jquery/jquery.js', + '//assets/bootstrap/js/bootstrap-transition.js', + '//assets/bootstrap/js/bootstrap-alert.js', + '//assets/bootstrap/js/bootstrap-modal.js', + '//assets/bootstrap/js/bootstrap-dropdown.js', + '//assets/bootstrap/js/bootstrap-scrollspy.js', + '//assets/bootstrap/js/bootstrap-tab.js', + '//assets/bootstrap/js/bootstrap-tooltip.js', + '//assets/bootstrap/js/bootstrap-popover.js', + '//assets/bootstrap/js/bootstrap-button.js', + '//assets/bootstrap/js/bootstrap-collapse.js', + '//assets/bootstrap/js/bootstrap-carousel.js', + '//assets/bootstrap/js/bootstrap-typeahead.js', + '//assets/bootstrap/js/bootstrap-affix.js', + '//assets/angular/angular.js', + '//assets/angular-ui/build/angular-ui.js', + '//assets/bootstrap-switch/static/js/bootstrapSwitch.js', + '//assets/underscore/underscore.js', + '//skins/login/js/main.js', + '//skins/login/js/angular/app/app.js' + ), 'client' => array( '//include/jslibs/swfobject/swfobject.js' , '//include/jslibs/jquery-ui-1.8.17/jquery-ui-i18n.js' diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig index c8daaf4289..a21412402b 100644 --- a/templates/web/login/layout/base-layout.html.twig +++ b/templates/web/login/layout/base-layout.html.twig @@ -26,10 +26,8 @@ {% endblock favicon %} {% block header_stylesheet %} - - - - + + @@ -48,30 +46,10 @@ window.myCustomTags = ['phraseanetAlert']; // optional - + - - - - - - - - - - - - - - - - - - - - - + {% endblock header_javascript %} {% endblock header %}