mirror of
				https://gitlab.com/animath/si/plateforme.git
				synced 2025-11-04 04:22:14 +01:00 
			
		
		
		
	Don't minify what is already minified
Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>
This commit is contained in:
		@@ -15,11 +15,16 @@
 | 
				
			|||||||
    <link rel="shortcut icon" href="{% static "favicon.ico" %}">
 | 
					    <link rel="shortcut icon" href="{% static "favicon.ico" %}">
 | 
				
			||||||
    <meta name="theme-color" content="#ffffff">
 | 
					    <meta name="theme-color" content="#ffffff">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    {# Bootstrap + Font Awesome CSS #}
 | 
					    {# Bootstrap CSS #}
 | 
				
			||||||
    {% stylesheet 'bootstrap_fontawesome' %}
 | 
					    <link href="{% static "bootstrap/css/bootstrap.min.css" %}" rel="stylesheet" type="text/css">
 | 
				
			||||||
 | 
					    {# Fontawesome CSS #}
 | 
				
			||||||
 | 
					    <link href="{% static "fontawesome/css/all.min.css" %}" rel="stylesheet" type="text/css">
 | 
				
			||||||
 | 
					    <link href="{% static "fontawesome/css/v4-shims.css" %}">
 | 
				
			||||||
 | 
					    {# bootstrap-select CSS #}
 | 
				
			||||||
 | 
					    <link href="{% static "bootstrap-select/css/bootstrap-select.min.css" %}" rel="stylesheet" type="text/css">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    {# Bootstrap JavaScript #}
 | 
					    {# Bootstrap JavaScript #}
 | 
				
			||||||
    {% javascript 'bootstrap' %}
 | 
					    <script type="application/javascript" src="{% static "bootstrap/js/bootstrap.bundle.min.js" %}" charset="utf-8"></script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    {# Webmanifest PWA permettant l'installation de l'application sur un écran d'accueil, pour navigateurs supportés #}
 | 
					    {# Webmanifest PWA permettant l'installation de l'application sur un écran d'accueil, pour navigateurs supportés #}
 | 
				
			||||||
    <link rel="manifest" href="{% static "tfjm/chat.webmanifest" %}">
 | 
					    <link rel="manifest" href="{% static "tfjm/chat.webmanifest" %}">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,10 +16,13 @@
 | 
				
			|||||||
    <meta name="theme-color" content="#ffffff">
 | 
					    <meta name="theme-color" content="#ffffff">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    {# Bootstrap CSS #}
 | 
					    {# Bootstrap CSS #}
 | 
				
			||||||
    {% stylesheet 'bootstrap_fontawesome' %}
 | 
					    <link href="{% static "bootstrap/css/bootstrap.min.css" %}" rel="stylesheet" type="text/css">
 | 
				
			||||||
 | 
					    {# Fontawesome CSS #}
 | 
				
			||||||
 | 
					    <link href="{% static "fontawesome/css/all.min.css" %}" rel="stylesheet" type="text/css">
 | 
				
			||||||
 | 
					    <link href="{% static "fontawesome/css/v4-shims.css" %}">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    {# Bootstrap JavaScript #}
 | 
					    {# Bootstrap JavaScript #}
 | 
				
			||||||
    {% javascript 'bootstrap' %}
 | 
					    <script type="application/javascript" src="{% static "bootstrap/js/bootstrap.bundle.min.js" %}" charset="utf-8"></script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    {# Webmanifest PWA permettant l'installation de l'application sur un écran d'accueil, pour navigateurs supportés #}
 | 
					    {# Webmanifest PWA permettant l'installation de l'application sur un écran d'accueil, pour navigateurs supportés #}
 | 
				
			||||||
    <link rel="manifest" href="{% static "tfjm/chat.webmanifest" %}">
 | 
					    <link rel="manifest" href="{% static "tfjm/chat.webmanifest" %}">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -206,25 +206,6 @@ STATICFILES_FINDERS = (
 | 
				
			|||||||
PIPELINE = {
 | 
					PIPELINE = {
 | 
				
			||||||
    'DISABLE_WRAPPER': True,
 | 
					    'DISABLE_WRAPPER': True,
 | 
				
			||||||
    'JAVASCRIPT': {
 | 
					    'JAVASCRIPT': {
 | 
				
			||||||
        'bootstrap': {
 | 
					 | 
				
			||||||
            'source_filenames': {
 | 
					 | 
				
			||||||
                'bootstrap/js/bootstrap.bundle.min.js',
 | 
					 | 
				
			||||||
            },
 | 
					 | 
				
			||||||
            'output_filename': 'tfjm/js/bootstrap.bundle.min.js',
 | 
					 | 
				
			||||||
        },
 | 
					 | 
				
			||||||
        'jquery': {
 | 
					 | 
				
			||||||
            'source_filenames': {
 | 
					 | 
				
			||||||
                'jquery/jquery.min.js',
 | 
					 | 
				
			||||||
            },
 | 
					 | 
				
			||||||
            'output_filename': 'tfjm/js/jquery.min.js',
 | 
					 | 
				
			||||||
        },
 | 
					 | 
				
			||||||
        'bootstrap_select': {
 | 
					 | 
				
			||||||
            'source_filenames': {
 | 
					 | 
				
			||||||
                'bootstrap-select/js/bootstrap-select.min.js',
 | 
					 | 
				
			||||||
                'bootstrap-select/js/defaults-fr_FR.min.js',
 | 
					 | 
				
			||||||
            },
 | 
					 | 
				
			||||||
            'output_filename': 'tfjm/js/bootstrap-select-jquery.min.js',
 | 
					 | 
				
			||||||
        },
 | 
					 | 
				
			||||||
        'main': {
 | 
					        'main': {
 | 
				
			||||||
            'source_filenames': (
 | 
					            'source_filenames': (
 | 
				
			||||||
              'tfjm/js/main.js',
 | 
					              'tfjm/js/main.js',
 | 
				
			||||||
@@ -251,17 +232,6 @@ PIPELINE = {
 | 
				
			|||||||
            'output_filename': 'tfjm/js/draw.min.js',
 | 
					            'output_filename': 'tfjm/js/draw.min.js',
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    'STYLESHEETS': {
 | 
					 | 
				
			||||||
        'bootstrap_fontawesome': {
 | 
					 | 
				
			||||||
            'source_filenames': (
 | 
					 | 
				
			||||||
                'bootstrap/css/bootstrap.min.css',
 | 
					 | 
				
			||||||
                'fontawesome/css/all.css',
 | 
					 | 
				
			||||||
                'fontawesome/css/v4-shims.css',
 | 
					 | 
				
			||||||
                'bootstrap-select/css/bootstrap-select.min.css',
 | 
					 | 
				
			||||||
            ),
 | 
					 | 
				
			||||||
            'output_filename': 'tfjm/css/bootstrap_fontawesome.min.css',
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    },
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
MEDIA_URL = '/media/'
 | 
					MEDIA_URL = '/media/'
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,13 +20,18 @@
 | 
				
			|||||||
    <meta name="theme-color" content="#ffffff">
 | 
					    <meta name="theme-color" content="#ffffff">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    {# Bootstrap CSS #}
 | 
					    {# Bootstrap CSS #}
 | 
				
			||||||
    {% stylesheet 'bootstrap_fontawesome' %}
 | 
					    <link href="{% static "bootstrap/css/bootstrap.min.css" %}" rel="stylesheet" type="text/css">
 | 
				
			||||||
 | 
					    {# Fontawesome CSS #}
 | 
				
			||||||
 | 
					    <link href="{% static "fontawesome/css/all.min.css" %}" rel="stylesheet" type="text/css">
 | 
				
			||||||
 | 
					    <link href="{% static "fontawesome/css/v4-shims.css" %}">
 | 
				
			||||||
 | 
					    {# bootstrap-select CSS #}
 | 
				
			||||||
 | 
					    <link href="{% static "bootstrap-select/css/bootstrap-select.min.css" %}" rel="stylesheet" type="text/css">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    {# Bootstrap JavaScript #}
 | 
					    {# Bootstrap JavaScript #}
 | 
				
			||||||
    {% javascript 'bootstrap' %}
 | 
					    <script type="application/javascript" src="{% static "bootstrap/js/bootstrap.bundle.min.js" %}" charset="utf-8"></script>
 | 
				
			||||||
    {# bootstrap-select for beautiful selects and JQuery dependency #}
 | 
					    {# bootstrap-select for beautiful selects and JQuery dependency #}
 | 
				
			||||||
    {% javascript 'jquery' %}
 | 
					    <script type="application/javascript" src="{% static "jquery/jquery.min.js" %}" charset="utf-8"></script>
 | 
				
			||||||
    {% javascript 'bootstrap_select' %}
 | 
					    <script type="application/javascript" src="{% static "bootstrap-select/js/bootstrap-select.min.js" %}" charset="utf-8"></script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    {# Si un formulaire requiert des données supplémentaires (notamment JS), les données sont chargées #}
 | 
					    {# Si un formulaire requiert des données supplémentaires (notamment JS), les données sont chargées #}
 | 
				
			||||||
    {% if form.media %}
 | 
					    {% if form.media %}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user