[Revert][Issue #6942] Defer and preload assets to improve page loadin…

…g times
GeoNode · Feb 22, 2021 · 7ed8097 · 7ed8097
1 parent fcd6b60
commit 7ed8097
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 23 deletions.
diff --git a/geonode/catalogue/templates/geonode_metadata_full.html b/geonode/catalogue/templates/geonode_metadata_full.html
@@ -15,15 +15,9 @@
       <link href="{% static "lib/css/jquery-ui.css" %}" rel="stylesheet"/>
       <link href="{% static "lib/css/bootstrap-datetimepicker.css" %}" rel="stylesheet" />
       {% else %}
-      <link href="{% static "lib/css/assets.min.css" %}" rel="stylesheet" media="none" onload="if(media!='all')media='all'"/>
-      <noscript>
-        <link rel="stylesheet" href="{% static "lib/css/assets.min.css" %}">
-      </noscript>
+      <link href="{% static "lib/css/assets.min.css" %}" rel="stylesheet"/>
       {% endif %}
-	  <link href="{% static "geonode/css/base.css" %}" rel="stylesheet" media="none" onload="if(media!='all')media='all'">
-      <noscript>
-        <link rel="stylesheet" href="{% static "geonode/css/base.css" %}">
-      </noscript>
+	  <link href="{% static "geonode/css/base.css" %}" rel="stylesheet"/>
       <style type="text/css">[ng\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}</style>
 	<style>
 	dl dd{ margin-left:20px; }

diff --git a/geonode/templates/500.html b/geonode/templates/500.html
@@ -16,10 +16,7 @@
       <link href="{% static "lib/css/jquery-ui.structure.css" %}" rel="stylesheet"/>
       <link href="{% static "lib/css/bootstrap-datetimepicker.css" %}" rel="stylesheet" />
       {% else %}
-      <link href="{% static "lib/css/assets.min.css" %}" rel="stylesheet" media="none" onload="if(media!='all')media='all'"/>
-      <noscript>
-        <link rel="stylesheet" href="{% static "lib/css/assets.min.css" %}">
-      </noscript>
+      <link href="{% static "lib/css/assets.min.css" %}" rel="stylesheet"/>
       {% endif %}
       <link href="{% static "geonode/css/base.css" %}" rel="stylesheet" />
       <style type="text/css">[ng\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}</style>

diff --git a/geonode/templates/base.html b/geonode/templates/base.html
@@ -54,20 +54,11 @@
           <link href="{% static "lib/css/jquery-ui.structure.min.css" %}" rel="stylesheet"/>
           <link href="{% static "lib/css/bootstrap-treeview.css" %}" rel="stylesheet"/>
       {% else %}
-      <link href="{% static "lib/css/assets.min.css" %}" rel="stylesheet" media="none" onload="if(media!='all')media='all'"/>
-      <noscript>
-        <link rel="stylesheet" href="{% static "lib/css/assets.min.css" %}">
-      </noscript>
+      <link href="{% static "lib/css/assets.min.css" %}" rel="stylesheet"/>
       {% endif %}
-
-      <link href="{% static "geonode/css/base.css" %}" rel="stylesheet" media="none" onload="if(media!='all')media='all'">
-      <noscript>
-        <link rel="stylesheet" href="{% static "geonode/css/base.css" %}">
-      </noscript>
-
+      <link href="{% static "geonode/css/base.css" %}" rel="stylesheet"/>
       <link rel='stylesheet' id='cookie-law-info-css'  href="{% static "geonode/css/cookie-law-info/cookie-law-info-public.css" %}" type='text/css' media='all' />
       <link rel='stylesheet' id='cookie-law-info-gdpr-css'  href="{% static "geonode/css/cookie-law-info/cookie-law-info-gdpr.css" %}" type='text/css' media='all' />
-
       <style type="text/css">[ng\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}</style>
       <style type="text/css">
         /* Additional styles by custom themes */