- Backport fixes and PRs from master

GeoNode · Jul 13, 2018 · 4b635ef · 4b635ef
1 parent 7df99f2
commit 4b635ef
Show file tree

Hide file tree

Showing 34 changed files with 191 additions and 155 deletions.
diff --git a/geonode/base/templates/base/_resourcebase_snippet.html b/geonode/base/templates/base/_resourcebase_snippet.html
@@ -41,7 +41,7 @@ <h4>
               </h4>
             </div>
           </div>
-          <em ng-if="item.online and item.store_type == 'remoteStore'">
+          <em ng-if="item.online && item.store_type == 'remoteStore'">
             {% endverbatim %}
             <span ng-if="item.online == true"><i class="fa fa-power-off text-success"></i> {% trans "Service is" %} {% trans "online" %}</span>
             <span ng-if="item.online == false"><i class="fa fa-power-off text-danger"></i> {% trans "Service is" %} {% trans "offline" %}</span>

diff --git a/geonode/catalogue/templates/geonode_metadata_full.html b/geonode/catalogue/templates/geonode_metadata_full.html
@@ -1,4 +1,6 @@
 {% load i18n %}
+{% load static from staticfiles %}
+
 <html>
 	<head>
     <meta charset="utf-8">
@@ -7,17 +9,17 @@
     <title>{{ resource.title }}</title>
     {% block head %}
       {% if DEBUG_STATIC %}
-      <link href="{{ STATIC_URL }}lib/css/jquery.dataTables.css" rel="stylesheet" />
-      <link href="{{ STATIC_URL }}lib/css/select2.css" rel="stylesheet"/>
-      <link href="{{ STATIC_URL }}lib/css/bootstrap.min.css" rel="stylesheet"/>
-      <link href="{{ STATIC_URL }}lib/css/jquery-ui.css" rel="stylesheet"/>
-      <link href="{{ STATIC_URL }}lib/css/bootstrap-datetimepicker.css" rel="stylesheet"/>
+      <link href="{% static "lib/css/jquery.dataTables.css" %}" rel="stylesheet" />
+      <link href="{% static "lib/css/select2.css" %}" rel="stylesheet"/>
+      <link href="{% static "lib/css/bootstrap.min.css" %}" rel="stylesheet"/>
+      <link href="{% static "lib/css/jquery-ui.css" %}" rel="stylesheet"/>
+      <link href="{% static "lib/css/bootstrap-datetimepicker.css" %}" rel="stylesheet"/>
       {% else %}
-      <link href="{{ STATIC_URL }}lib/css/assets.min.css" rel="stylesheet"/>
+      <link href="{% static "lib/css/assets.min.css" %}" rel="stylesheet"/>
       {% endif %}
-      <link href="{{ STATIC_URL }}geonode/css/ext-compatibility.css" rel="stylesheet" />
-      <link href="{{ STATIC_URL }}geonode/css/ux-all.css" rel="stylesheet" />
-      <link href="{{ STATIC_URL }}geonode/css/base.css" rel="stylesheet" />
+      <link href="{% static "geonode/css/ext-compatibility.css" %}" rel="stylesheet" />
+      <link href="{% static "geonode/css/ux-all.css" %}" rel="stylesheet" />
+      <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/client/templates/geoext/app_header.html b/geonode/client/templates/geoext/app_header.html
@@ -1 +1,2 @@
-<script src="{{ STATIC_URL }}geonode/js/extjs/ux.js?v={{ VERSION }}"></script>
+{% load static from staticfiles %}
+<script src="{% static "geonode/js/extjs/ux.js" %}?v={{ VERSION }}"></script>
diff --git a/geonode/client/templates/geoext/ext_header.html b/geonode/client/templates/geoext/ext_header.html
@@ -1,8 +1,9 @@
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/ext/resources/css/ext-all.css?v={{ VERSION }}" />
-<script type="text/javascript" src="{{ STATIC_URL }}geoexplorer/externals/ext/adapter/ext/ext-base.js?v={{ VERSION }}"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}geoexplorer/externals/ext/ext-all.js?v={{ VERSION }}"></script>
+{% load static from staticfiles %}
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/ext/resources/css/ext-all.css" %}?v={{ VERSION }}" />
+<script type="text/javascript" src="{% static "geoexplorer/externals/ext/adapter/ext/ext-base.js" %}?v={{ VERSION }}"></script>
+<script type="text/javascript" src="{% static "geoexplorer/externals/ext/ext-all.js" %}?v={{ VERSION }}"></script>
 
 <script type="text/javascript">
   Ext.Ajax.defaultHeaders = { 'X-CSRFToken': '{{ csrf_token|escapejs }}' };
-  Ext.BLANK_IMAGE_URL = "{{ STATIC_URL }}geoexplorer/externals/ext/resources/images/default/s.gif";
+  Ext.BLANK_IMAGE_URL = "{% static "geoexplorer/externals/ext/resources/images/default/s.gif" %}";
 </script>
diff --git a/geonode/client/templates/geoext/geo_header.html b/geonode/client/templates/geoext/geo_header.html
@@ -1,38 +1,38 @@
 {% load api_basemaps_tags %}
-
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/GeoExt/resources/css/geoext-all.css?v={{ VERSION }}" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/GeoExt/resources/css/gxtheme-gray.css?v={{ VERSION }}">
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/theme/ux/colorpicker/color-picker.ux.css?v={{ VERSION }}" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/PrintPreview/resources/css/printpreview.css?v={{ VERSION }}" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/openlayers/theme/default/style.css?v={{ VERSION }}" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/gxp/src/theme/all.css?v={{ VERSION }}" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/theme/app/geoexplorer.css?v={{ VERSION }}" />
-<!--[if IE]><link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/theme/app/ie.css"/><![endif]-->
+{% load static from staticfiles %}
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/GeoExt/resources/css/geoext-all.css" %}?v={{ VERSION }}" />
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/GeoExt/resources/css/gxtheme-gray.css" %}?v={{ VERSION }}">
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/theme/ux/colorpicker/color-picker.ux.css" %}?v={{ VERSION }}" />
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/PrintPreview/resources/css/printpreview.css" %}?v={{ VERSION }}" />
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/openlayers/theme/default/style.css" %}?v={{ VERSION }}" />
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/gxp/src/theme/all.css" %}?v={{ VERSION }}" />
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/theme/app/geoexplorer.css" %}?v={{ VERSION }}" />
+<!--[if IE]><link rel="stylesheet" type="text/css" href="{% static "geoexplorer/theme/app/ie.css" %}"/><![endif]-->
 
 <script src="https://maps.googleapis.com/maps/api/js?key={% google_api_key %}" type="text/javascript"></script>
 
-<script src="{{ STATIC_URL }}geoexplorer/script/GeoExplorer.js?v={{ VERSION }}" type="text/javascript"></script>
-<!-- script type="text/javascript" src="{{ STATIC_URL }}geonode/js/extjs/GeoExplorer-debug.js"></script -->
+<script src="{% static "geoexplorer/script/GeoExplorer.js" %}?v={{ VERSION }}" type="text/javascript"></script>
+<!-- script type="text/javascript" src="{% static "geonode/js/extjs/GeoExplorer-debug.js"></script -->
 
 <style>
     .olImageLoadError {
         background-color: lightgray !important;
         opacity: 0.2 !important;
         filter: alpha(opacity=20) !important; /* IE */
 
-        /* background-image: url('{{ STATIC_URL }}geonode/img/light_gray.jpg') !important;
+        /* background-image: url('{% static "geonode/img/light_gray.jpg') !important;
         background-repeat: no-repeat !important; */
 
         /*display: none !important;*/
     }
 </style>
 
 <script type="text/javascript">
-OpenLayers.ImgPath = "{{ STATIC_URL }}geoexplorer/externals/openlayers/theme/default/img";
+OpenLayers.ImgPath = "{% static "geoexplorer/externals/openlayers/theme/default/img" %}";
 OpenLayers.Util.onImageLoadErrorColor = 1;
 OpenLayers.Util.onImageLoadErrorColor = 'transparent';
 OpenLayers.Util.onImageLoadError = function() {
-    this.src = '{{ STATIC_URL }}geonode/img/light_gray.jpg';
+    this.src = '{% static "geonode/img/light_gray.jpg';
 };
 
 OpenLayers.Request.DEFAULT_CONFIG.headers = {

diff --git a/geonode/client/templates/geoext/geo_header_debug.html b/geonode/client/templates/geoext/geo_header_debug.html
@@ -1,13 +1,14 @@
 {% load api_basemaps_tags %}
+{% load static from staticfiles %}
 
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/GeoExt/resources/css/geoext-all.css?v={{ VERSION }}" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/GeoExt/resources/css/gxtheme-gray.css?v={{ VERSION }}">
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/theme/ux/colorpicker/color-picker.ux.css?v={{ VERSION }}" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/PrintPreview/resources/css/printpreview.css?v={{ VERSION }}" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/openlayers/theme/default/style.css?v={{ VERSION }}" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/gxp/src/theme/all.css?v={{ VERSION }}" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/theme/app/geoexplorer.css?v={{ VERSION }}" />
-<!--[if IE]><link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/theme/app/ie.css"/><![endif]-->
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/GeoExt/resources/css/geoext-all.css" %}?v={{ VERSION }}" />
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/GeoExt/resources/css/gxtheme-gray.css" %}?v={{ VERSION }}">
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/theme/ux/colorpicker/color-picker.ux.css" %}?v={{ VERSION }}" />
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/PrintPreview/resources/css/printpreview.css" %}?v={{ VERSION }}" />
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/openlayers/theme/default/style.css" %}?v={{ VERSION }}" />
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/gxp/src/theme/all.css" %}?v={{ VERSION }}" />
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/theme/app/geoexplorer.css" %}?v={{ VERSION }}" />
+<!--[if IE]><link rel="stylesheet" type="text/css" href="{% static "geoexplorer/theme/app/ie.css" %}"/><![endif]-->
 <script src="http://localhost:9080/script/@/app/static/externals/openlayers/lib/OpenLayers/SingleFile.js"></script>
 <script src="http://localhost:9080/script/@/app/static/externals/openlayers/lib/OpenLayers/BaseTypes/Class.js"></script>
 <script src="http://localhost:9080/script/@/app/static/externals/openlayers/lib/OpenLayers/BaseTypes.js"></script>
@@ -322,23 +323,23 @@
 
 <script src="https://maps.googleapis.com/maps/api/js?key={% google_api_key %}" type="text/javascript"></script>
 
-<script src="{{STATIC_URL}}geoexplorer/script/GeoExplorer-debug.js.js?v={{ VERSION }}" type="text/javascript"></script>
+<script src="{% static "geoexplorer/script/GeoExplorer-debug.js.js" %}?v={{ VERSION }}" type="text/javascript"></script>
 
 <style>
     .olImageLoadError {
         display: none !important;
     }
     .olImageLoadError {
-        background-image: url('{{ STATIC_URL }}geonode/img/light_gray.jpg');
+        background-image: url("{% static "geonode/img/light_gray.jpg" %}");
         background-repeat: no-repeat;
     }
 </style>
 
 <script type="text/javascript">
-OpenLayers.ImgPath = "{{ STATIC_URL }}geoexplorer/externals/openlayers/theme/default/img";
+OpenLayers.ImgPath = "{% static "geoexplorer/externals/openlayers/theme/default/img" %}";
 OpenLayers.Util.onImageLoadErrorColor = 'transparent';
 OpenLayers.Util.onImageLoadError = function() {
-    this.src = '{{ STATIC_URL }}geonode/img/light_gray.jpg';
+    this.src = "{% static "geonode/img/light_gray.jpg" %}";
 };
 
 OpenLayers.Request.DEFAULT_CONFIG.headers = {

diff --git a/geonode/client/templates/geoext/geo_header_mini.html b/geonode/client/templates/geoext/geo_header_mini.html
@@ -1,22 +1,23 @@
 {% load api_basemaps_tags %}
+{% load static from staticfiles %}
 
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/GeoExt/resources/css/geoext-all.css?v={{ VERSION }}" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/GeoExt/resources/css/gxtheme-gray.css?v={{ VERSION }}">
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/theme/ux/colorpicker/color-picker.ux.css?v={{ VERSION }}" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/PrintPreview/resources/css/printpreview.css?v={{ VERSION }}" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/openlayers/theme/default/style.css?v={{ VERSION }}" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/externals/gxp/src/theme/all.css?v={{ VERSION }}" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/theme/app/geoexplorer.css?v={{ VERSION }}" />
-<!--[if IE]><link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}geoexplorer/theme/app/ie.css"/><![endif]-->
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/GeoExt/resources/css/geoext-all.css" %}?v={{ VERSION }}" />
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/GeoExt/resources/css/gxtheme-gray.css" %}?v={{ VERSION }}">
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/theme/ux/colorpicker/color-picker.ux.css" %}?v={{ VERSION }}" />
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/PrintPreview/resources/css/printpreview.css" %}?v={{ VERSION }}" />
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/openlayers/theme/default/style.css" %}?v={{ VERSION }}" />
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/externals/gxp/src/theme/all.css" %}?v={{ VERSION }}" />
+<link rel="stylesheet" type="text/css" href="{% static "geoexplorer/theme/app/geoexplorer.css" %}?v={{ VERSION }}" />
+<!--[if IE]><link rel="stylesheet" type="text/css" href="{% static "geoexplorer/theme/app/ie.css" %}"/><![endif]-->
 
 <script src="https://maps.googleapis.com/maps/api/js?key={% google_api_key %}" type="text/javascript"></script>
 
-<script src="{{ STATIC_URL }}geoexplorer/script/GeoExplorer.js?v={{ VERSION }}" type="text/javascript"></script>
+<script src="{% static "geoexplorer/script/GeoExplorer.js" %}?v={{ VERSION }}" type="text/javascript"></script>
 <script type="text/javascript">
-OpenLayers.ImgPath = "{{ STATIC_URL }}geoexplorer/externals/openlayers/theme/default/img";
+OpenLayers.ImgPath = "{% static "geoexplorer/externals/openlayers/theme/default/img" %}";
 OpenLayers.Util.onImageLoadErrorColor = 'transparent';
 OpenLayers.Util.onImageLoadError = function() {
-    this.src = '{{ STATIC_URL }}geonode/img/light_gray.jpg';
+    this.src = "{% static "geonode/img/light_gray.jpg" %}";
 };
 
 OpenLayers.Request.DEFAULT_CONFIG.headers = {

diff --git a/geonode/client/templates/geoext/layers/layer_geoext_map.html b/geonode/client/templates/geoext/layers/layer_geoext_map.html
@@ -1,10 +1,11 @@
 {% include "geoext/ext_header.html" %}
 {% include "geoext/app_header.html" %}
 {% include "geoext/geo_header.html" %}
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/GeoNode-mixin.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/Geonode-CatalogueApiSearch.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/GeoNode-GeoExplorer.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/utils/thumbnail.js"></script>
+{% load static from staticfiles %}
+<script type="text/javascript" src="{% static "geonode/js/extjs/GeoNode-mixin.js" %}"></script>
+<script type="text/javascript" src="{% static "geonode/js/extjs/Geonode-CatalogueApiSearch.js" %}"></script>
+<script type="text/javascript" src="{% static "geonode/js/extjs/GeoNode-GeoExplorer.js" %}"></script>
+<script type="text/javascript" src="{% static "geonode/js/utils/thumbnail.js" %}"></script>
 <script type="text/javascript">
 {% autoescape off %}
         var app;

diff --git a/geonode/client/templates/geoext/layers/layer_geoext_map_mini.html b/geonode/client/templates/geoext/layers/layer_geoext_map_mini.html
@@ -1,9 +1,10 @@
 {% include "geoexet/ext_header.html" %}
 {% include "geoexet/app_header.html" %}
 {% include "geoexet/geo_header_mini.html" %}
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/GeoNode-mixin.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/Geonode-CatalogueApiSearch.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/GeoNode-GeoExplorer.js"></script>
+{% load static from staticfiles %}
+<script type="text/javascript" src="{% static "geonode/js/extjs/GeoNode-mixin.js" %}"></script>
+<script type="text/javascript" src="{% static "geonode/js/extjs/Geonode-CatalogueApiSearch.js" %}"></script>
+<script type="text/javascript" src="{% static "geonode/js/extjs/GeoNode-GeoExplorer.js" %}"></script>
 <script type="text/javascript">
 {% autoescape off %}
         var app;

diff --git a/geonode/client/templates/geoext/maps/map_geoexplorer.js b/geonode/client/templates/geoext/maps/map_geoexplorer.js
@@ -1,11 +1,13 @@
 {% include "geoext/ext_header.html" %}
 {% include "geoext/app_header.html" %}
 {% include "geoext/geo_header.html" %}
-<link href="{{ STATIC_URL}}geonode/css/geoexplorer/map_geoexplorer.css" rel="stylesheet"/>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/GeoNode-mixin.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/Geonode-CatalogueApiSearch.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/GeoNode-GeoExplorer.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/utils/thumbnail.js"></script>
+{% load static from staticfiles %}
+
+<link href="{% static "geonode/css/geoexplorer/map_geoexplorer.css" %}" rel="stylesheet"/>
+<script type="text/javascript" src="{% static "geonode/js/extjs/GeoNode-mixin.js" %}"></script>
+<script type="text/javascript" src="{% static "geonode/js/extjs/Geonode-CatalogueApiSearch.js" %}"></script>
+<script type="text/javascript" src="{% static "geonode/js/extjs/GeoNode-GeoExplorer.js" %}"></script>
+<script type="text/javascript" src="{% static "geonode/js/utils/thumbnail.js" %}"></script>
 <script type="text/javascript">
 var app;
 Ext.onReady(function() {

diff --git a/geonode/client/templates/geoext/maps/map_geoexplorer_viewer.js b/geonode/client/templates/geoext/maps/map_geoexplorer_viewer.js
@@ -1,10 +1,12 @@
 {% include "geoext/ext_header.html" %}
 {% include "geoext/app_header.html" %}
 {% include "geoext/geo_header.html" %}
-<link href="{{ STATIC_URL}}geonode/css/geoexplorer/map_geoexplorer.css" rel="stylesheet"/>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/GeoNode-mixin.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/Geonode-CatalogueApiSearch.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/GeoNode-GeoExplorer.js"></script>
+{% load static from staticfiles %}
+
+<link href="{% static "geonode/css/geoexplorer/map_geoexplorer.css" %}" rel="stylesheet"/>
+<script type="text/javascript" src="{% static "geonode/js/extjs/GeoNode-mixin.js" %}"></script>
+<script type="text/javascript" src="{% static "geonode/js/extjs/Geonode-CatalogueApiSearch.js" %}"></script>
+<script type="text/javascript" src="{% static "geonode/js/extjs/GeoNode-GeoExplorer.js" %}"></script>
 <script type="text/javascript">
 var app;
 Ext.onReady(function() {

diff --git a/geonode/client/templates/geoext/maps/map_include.html b/geonode/client/templates/geoext/maps/map_include.html
@@ -1,10 +1,11 @@
 {% include "geoext/ext_header.html" %}
 {% include "geoext/app_header.html" %}
 {% include "geoext/geo_header.html" %}
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/GeoNode-mixin.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/Geonode-CatalogueApiSearch.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/GeoNode-GeoExplorer.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/utils/thumbnail.js"></script>
+{% load static from staticfiles %}
+<script type="text/javascript" src="{% static "geonode/js/extjs/GeoNode-mixin.js" %}"></script>
+<script type="text/javascript" src="{% static "geonode/js/extjs/Geonode-CatalogueApiSearch.js" %}"></script>
+<script type="text/javascript" src="{% static "geonode/js/extjs/GeoNode-GeoExplorer.js" %}"></script>
+<script type="text/javascript" src="{% static "geonode/js/utils/thumbnail.js" %}"></script>
 <script type="text/javascript">
 var app;
 Ext.onReady(function() {

diff --git a/geonode/client/templates/geoext/maps/map_sdk.js b/geonode/client/templates/geoext/maps/map_sdk.js
@@ -1,11 +1,13 @@
 {% include 'geoext/ext_header.html' %}
 {% include 'geoext/sdk_header.html' %}
+{% load static from staticfiles %}
+
 <style type="text/css">
 .map-title-header {
     margin-right: 10px;
 }
 </style>
-<script type="text/javascript" src="{{ STATIC_URL}}geonode/js/extjs/GeoNode-GeoExplorer.js"></script>
+<script type="text/javascript" src="{% static "geonode/js/extjs/GeoNode-GeoExplorer.js" %}"></script>
 <script type="text/javascript">
 var app;
 Ext.onReady(function() {