Bugfix/ionicons warnings (#353)

ron-huberfeld · web-flow · commit fd99fc15b09e · 2021-03-21T04:35:10.000+02:00
* Apply automatic translateable string changes
* fix: ionicons warnings in console
* fix: move scripts section to end of body
* fix: move scripts section
diff --git a/app/templates/base.html b/app/templates/base.html
@@ -9,8 +9,6 @@
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-giJF6kkoqNQ00vy+HMDP7azOuL0xtbfIcaT9wjKHr8RbDVddVHyTfAAsrekwKmP1" crossorigin="anonymous">
     <link rel="icon" href="{{ url_for('static', path='/images/icons/calendar-outline.svg') }}" />
     <link href="{{ url_for('static', path='/style.css') }}" rel="stylesheet">
-    <script type="module" src="https://unpkg.com/ionicons@5.4.0/dist/ionicons/ionicons.esm.js"></script>
-    <script nomodule="" src="https://unpkg.com/ionicons@5.4.0/dist/ionicons/ionicons.js"></script>
 
     <title>PyLendar {% block title %}{% endblock %}</title>
     {% endblock %}
@@ -102,6 +100,8 @@
     <script src="{{ url_for('static', path='/js/darkmode.js') }}"></script>
     <script src="{{ url_for('static', path='/joke.js') }}"></script>
     <script src="https://cdn.jsdelivr.net/npm/sweetalert2@10"></script>
+    <script type="module" src="https://unpkg.com/ionicons@5.4.0/dist/ionicons/ionicons.esm.js"></script>
+    <script nomodule="" src="https://unpkg.com/ionicons@5.4.0/dist/ionicons/ionicons.js"></script>
     <audio id="my-audio" muted="true"></audio>
     <audio id="sfx" muted="true"></audio>
 
diff --git a/app/templates/calendar/layout.html b/app/templates/calendar/layout.html
@@ -7,7 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <!-- Fonts -->
-    <link href="https://fonts.googleapis.com/css2?family=Assistant:wght@200;300;400;500;600;700;800&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Assistant:wght@200;300;400;500;600;700;800&display=swap"
+        rel="stylesheet">
 
     <!-- CSS -->
     <link href="{{ url_for('static', path='/grid_style.css') }}" rel="stylesheet" type="text/css">
@@ -76,8 +77,9 @@ <h1 class="title"> PYLENDAR </h1>
 
     <!-- Scripts -->
     <script src="{{ url_for('static', path='/js/grid_scripts.js') }}"></script>
-    <script src="https://unpkg.com/ionicons@5.2.3/dist/ionicons.js"></script>
+    <script type="module" src="https://unpkg.com/ionicons@5.4.0/dist/ionicons/ionicons.esm.js"></script>
+    <script nomodule="" src="https://unpkg.com/ionicons@5.4.0/dist/ionicons/ionicons.js"></script>
 
 </body>
 
-</html>
+</html>
diff --git a/app/templates/partials/base.html b/app/templates/partials/base.html
@@ -16,8 +16,18 @@
     integrity="sha384-giJF6kkoqNQ00vy+HMDP7azOuL0xtbfIcaT9wjKHr8RbDVddVHyTfAAsrekwKmP1" crossorigin="anonymous">
   <link href="{{ url_for('static', path='/global.css') }}" rel="stylesheet">
 
+  {% endblock head %}
+  {% block title %}
+  <title>Pylendar{% if self.page_name() %} - {% endif %}{% block page_name %}{% endblock %}</title>
+  {% endblock %}
+</head>
+
+<body>
+  {% block body %}
+  {% endblock %}
   <!-- Icons -->
-  <script src="https://unpkg.com/ionicons@5.2.3/dist/ionicons.js"></script>
+  <script type="module" src="https://unpkg.com/ionicons@5.4.0/dist/ionicons/ionicons.esm.js"></script>
+  <script nomodule="" src="https://unpkg.com/ionicons@5.4.0/dist/ionicons/ionicons.js"></script>
   <script defer src="https://use.fontawesome.com/releases/v5.0.8/js/all.js"
     integrity="sha384-SlE991lGASHoBfWbelyBPLsUlwY1GwNDJo3jSJO04KZ33K2bwfV9YBauFfnzvynJ"
     crossorigin="anonymous"></script>
@@ -37,16 +47,6 @@
   <!-- Audio -->
   <audio id="my-audio" muted="true"></audio>
   <audio id="sfx" muted="true"></audio>
-
-  {% endblock head %}
-  {% block title %}
-  <title>Pylendar{% if self.page_name() %} - {% endif %}{% block page_name %}{% endblock %}</title>
-  {% endblock %}
-</head>
-
-<body>
-  {% block body %}
-  {% endblock %}
   <script src="{{ url_for('static', path='/js/darkmode.js') }}"></script>
 </body>
 
