[Refers #3775] Hard-coded urls to static-files and media-files

GeoNode · Oct 29, 2018 · 3663472 · 3663472
1 parent bd3bba5
commit 3663472
Show file tree

Hide file tree

Showing 31 changed files with 8,102 additions and 145 deletions.
diff --git a/geonode/base/templates/base/_resourcebase_snippet.html b/geonode/base/templates/base/_resourcebase_snippet.html
@@ -19,7 +19,7 @@
             <div class="col-xs-10">
               <p class="item-meta">
                   <span class="item-category">{{ item.category__gn_description }}</span><br>
-                  <span class="item-category" ng-if="item.group"><a href="/groups/group/{{ item.group }}/activity/"><i class="fa fa-group" aria-hidden="true" style="margin-right: 8px;"></i>{{ item.group_name }}</a><br></span>
+                  <span class="item-category" ng-if="item.group"><a href="{{ SITEURL }}groups/group/{{ item.group }}/activity/"><i class="fa fa-group" aria-hidden="true" style="margin-right: 8px;"></i>{{ item.group_name }}</a><br></span>
                   <span class="item-category" ng-if="item.has_time">
                     {% endverbatim %}
                     <i class="fa fa-clock-o" aria-hidden="true" style="margin-right: 8px;"></i>{% trans "Temporal Serie" %}<br>
@@ -63,7 +63,7 @@ <h4>
           <div class="row">
             <div class="col-lg-12 item-items">
               <ul class="list-inline">
-                <li><a href="/people/profile/{{ item.owner__username }}"><i class="fa fa-user"></i>{{ item.owner_name }}</a></li>
+                <li><a href="{{ SITEURL }}people/profile/{{ item.owner__username }}"><i class="fa fa-user"></i>{{ item.owner_name }}</a></li>
                 <li><a href="{{ item.detail_url }}#info"><i class="fa fa-calendar-o"></i>{{ item.date|date:'d MMM y' }}</a></li>
                 <li><a href="{{ item.detail_url }}"><i class="fa fa-eye"></i>{{ item.popular_count }}</a></li>
                 <li><a href="{{ item.detail_url }}#share"><i class="fa fa-share"></i>{{ item.share_count }}</a></li>
@@ -73,7 +73,7 @@ <h4>
                   <i class="fa fa-map-marker"></i>{% trans "Create a Map" %}</a>
                   {% verbatim %}
                 </li>
-                <li><a ng-if="item.detail_url.indexOf('/maps/') > -1" href="/maps/{{item.id}}/view">
+                <li><a ng-if="item.detail_url.indexOf('/maps/') > -1" href="{{ SITEURL }}maps/{{item.id}}/view">
                   {% endverbatim %}
                   <i class="fa fa-map-marker"></i>{% trans "View Map" %}</a>
                   {% verbatim %}

diff --git a/geonode/client/templates/worldmap/geo_header.html b/geonode/client/templates/worldmap/geo_header.html
@@ -19,6 +19,6 @@
 
 <script src="https://maps.googleapis.com/maps/api/js?key={% google_api_key %}" type="text/javascript"></script>
 
-<script type="text/javascript" src="/static/geonode/js/utils/thumbnail.js"></script>
+<script type="text/javascript" src="{% static 'geonode/js/utils/thumbnail.js' %}"></script>
 <script src="http://js.nicedit.com/nicEdit-latest.js" type="text/javascript"></script>
 <script type="text/javascript">bkLib.onDomLoaded(nicEditors.allTextAreas);</script>
diff --git a/geonode/client/templates/worldmap/geo_header_debug.html b/geonode/client/templates/worldmap/geo_header_debug.html
@@ -19,6 +19,6 @@
 
 <script src="https://maps.googleapis.com/maps/api/js?key={% google_api_key %}" type="text/javascript"></script>
 
-<script type="text/javascript" src="/static/geonode/js/utils/thumbnail.js"></script>
+<script type="text/javascript" src="{% static 'geonode/js/utils/thumbnail.js' %}"></script>
 <script src="http://js.nicedit.com/nicEdit-latest.js" type="text/javascript"></script>
 <script type="text/javascript">bkLib.onDomLoaded(nicEditors.allTextAreas);</script>
diff --git a/geonode/contrib/geogig/templates/_geogig_scripts.html b/geonode/contrib/geogig/templates/_geogig_scripts.html
@@ -24,7 +24,7 @@
   });
   angular.bootstrap(document, ['g']);
 
-  ZeroClipboard.config( { swfPath: '/static/lib/img/ZeroClipboard.swf' } );
+  ZeroClipboard.config( { swfPath: '{% static "lib/img/ZeroClipboard.swf" %}' } );
     var client = new ZeroClipboard( document.getElementById("copy-button") );
 
     client.on( 'ready', function( readyEvent ) {

diff --git a/geonode/contrib/monitoring/frontend/index.html b/geonode/contrib/monitoring/frontend/index.html
@@ -1,3 +1,4 @@
+{% load static from staticfiles %}
 
 <!DOCTYPE html>
 <html lang="en">
@@ -15,11 +16,11 @@
     <title>GeoNode Monitoring</title>
 
 
-        <link href="/static/lib/css/assets.min.css?v=2.7.dev20170627114636" rel="stylesheet"/>
+        <link href="{% static 'lib/css/assets.min.css' %}?v={{ VERSION }}" rel="stylesheet"/>
 
 
-      <link href="/static/geonode/css/ext-compatibility.css?v=2.7.dev20170627114636" rel="stylesheet" />
-      <link href="/static/geonode/css/base.css?v=2.7.dev20170627114636" rel="stylesheet" />
+      <link href="{% static 'geonode/css/ext-compatibility.css' %}?v={{ VERSION }}" rel="stylesheet" />
+      <link href="{% static 'geonode/css/base.css' %}?v={{ VERSION }}" 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>
 
 
@@ -35,7 +36,7 @@
         }
       </style>
     <![endif]-->
-    <link rel="search" type="application/opensearchdescription+xml" href="/catalogue/opensearch" title="GeoNode Search"/>
+    <link rel="search" type="application/opensearchdescription+xml" href="{{ SITEURL }}catalogue/opensearch" title="GeoNode Search"/>
   </head>
 
   <body class="monitoring">
@@ -47,138 +48,100 @@
 	      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
 	        <i class="fa fa-navicon fa-lg"></i>
 	      </button>
-	      <a class="navbar-brand" href="/">GeoNode</a>
+	      <a class="navbar-brand" href="{{ SITEURL }}">GeoNode</a>
 	    </div>
 	    <div id="navbar" class="navbar-collapse collapse">
 	      <ul class="nav navbar-nav toolbar">
 
 	        <li id="nav_layers">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Data<i class="fa fa-angle-down fa-lg"></i></a>
               <ul class="dropdown-menu">
-                <li><a href="/layers/">Layers</a></li>
-                <li><a href="/documents/">Documents</a></li>
-
+                <li><a href="{{ SITEURL }}layers/">Layers</a></li>
+                <li><a href="{{ SITEURL }}documents/">Documents</a></li>
               </ul>
             </li>
 	        <li id="nav_maps">
-
-              <a href="/maps/">Maps</a>
-
+              <a href="{{ SITEURL }}maps/">Maps</a>
             </li>
             <li>
 	          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About<i class="fa fa-angle-down fa-lg"></i></a>
               <ul class="dropdown-menu">
-                <li><a href="/people/">People</a></li>
-                <li><a href="/groups/">Groups</a></li>
-                <li><a href="/groups/categories/">Group Categories</a></li>
-
-
+                <li><a href="{{ SITEURL }}people/">People</a></li>
+                <li><a href="{{ SITEURL }}groups/">Groups</a></li>
+                <li><a href="{{ SITEURL }}groups/categories/">Group Categories</a></li>
               </ul>
             </li>
-
-
-
           </ul>
 	      <ul class="nav navbar-nav navbar-right">
             <li>
               <div class="search">
-                <form id="search" action="/search/" >
+                <form id="search" action="{{ SITEURL }}search/" >
                   <span class="fa fa-search"></span>
-
                   <input id="search_input" type="text" placeholder="Search" name="title__icontains">
-
                 </form>
               </div>
 	        </li>
-
-
 		      <li><a href="#" data-toggle="modal" data-target="#SigninModal" role="button" >Sign in </a></li>
-
             </ul>
           </div> <!--/.nav-collapse -->
         </div>
       </nav>
-
       <!-- End of Navbar -->
-
     <div class="alert alert-danger alert-dismissible" role="alert" id="ieflag" style="display:none">
       <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
       <h1>You are using an outdated browser that is not supported by GeoNode.</h1>
       <p>Please use a <strong>modern browser</strong> like Mozilla Firefox, Google Chrome or Safari.</p>
     </div>
-
   <div id="wrap">
-
     <div class="container">
       <div class="alert alert-warn" id="status-message" hidden="hidden">
     <a class="close" onclick="$('.alert').hide()">×</a>
     <strong><p id="status-message-text">Placeholder for status-message</p></strong>
     <p id="status-message-text-body">Placeholder for status-message-body</p>
 </div>
-
-
-
-
-
-
-
-
-
       <div class="row">
         <div class="col-md-8">
-
         </div>
         <div class="col-md-4">
-
-
         </div>
       </div>
-
     </div>
-
   </div>
-
   <div id="spinner">
   </div>
-
   <div id="monitoring">
   </div>
-
   <footer>
     <div class="container">
       <div class="row">
         <div class="col-md-2">
           <ul class="list-unstyled">
             <li>Data</li>
-            <li><a href="/layers/">Layers</a></li>
-            <li><a href="/documents/">Documents</a></li>
-
+            <li><a href="{{ SITEURL }}layers/">Layers</a></li>
+            <li><a href="{{ SITEURL }}documents/">Documents</a></li>
           </ul>
         </div>
         <div class="col-md-2">
           <ul class="list-unstyled">
             <li>Maps</li>
-            <li><a href="/maps/">Explore Maps</a></li>
-
+            <li><a href="{{ SITEURL }}maps/">Explore Maps</a></li>
           </ul>
         </div>
 		<div class="col-md-2">
           <ul class="list-unstyled">
             <li>About</li>
-            <li><a href="/people/">People</a></li>
-            <li><a href="/groups/">Groups</a></li>
+            <li><a href="{{ SITEURL }}people/">People</a></li>
+            <li><a href="{{ SITEURL }}groups/">Groups</a></li>
 
 
           </ul>
         </div>
         <div class="col-md-6 text-right">
           <ul class="list-unstyled">
-            <li>Powered by <a href="http://geonode.org">GeoNode</a> <em>version 2.7.dev20170627114636</em></li>
-            <li><a href="/developer/">Developers</a> | <a href="/about/">About</a><li>
+            <li>Powered by <a href="http://geonode.org">GeoNode</a> <em>version {{ VERSION }}</em></li>
+            <li><a href="{{ SITEURL }}developer/">Developers</a> | <a href="{{ SITEURL }}about/">About</a><li>
           </ul>
           <label class="hidden">Language</label>
-
-
           <form class="form-inline" action="/i18n/setlang/" method="post">
           <input type='hidden' name='csrfmiddlewaretoken' value='RkQFJyyuw8Jre2PwWXQBk55C8otvt9wM' />
             <select class="col-md-6 pull-right" name="language" onchange="javascript:form.submit()">
@@ -344,15 +307,10 @@ <h4 class="modal-title" id="myModalLabel">Sign in</h4>
         </div>
       </div>
     </div>
-
     <!-- End of Modal -->
-
-
-    <script src="/static/lib/js/assets.min.js?v=2.7.dev20170627114636"></script>
-
-    <script src="/static/geonode/js/utils/utils.js?v=2.7.dev20170627114636"></script>
-    <script src="/static/geonode/js/base/base.js?v=2.7.dev20170627114636"></script>
-
+    <script src="{% static 'lib/js/assets.min.js' %}?v={{ VERSION }}"></script>
+    <script src="{% static 'geonode/js/utils/utils.js' %}?v={{ VERSION }}"></script>
+    <script src="{% static 'geonode/js/base/base.js' %}?v={{ VERSION }}"></script>
 
 <script type="text/javascript">
 jQuery(function($) {
@@ -402,13 +360,13 @@ <h4 class="modal-title" id="myModalLabel">Sign in</h4>
 </script>
 
 
-    <script type="text/javascript" src="/static/autocomplete_light/django_admin.js"></script>
-    <script type="text/javascript" src="/static/autocomplete_light/autocomplete.js"></script>
-    <script type="text/javascript" src="/static/autocomplete_light/widget.js"></script>
-    <script type="text/javascript" src="/static/autocomplete_light/addanother.js"></script>
-    <script type="text/javascript" src="/static/autocomplete_light/text_widget.js"></script>
-    <script type="text/javascript" src="/static/autocomplete_light/remote.js"></script>
-    <link rel="stylesheet" type="text/css" href="/static/autocomplete_light/style.css" />
+    <script type="text/javascript" src="{% static 'autocomplete_light/django_admin.js' %}"></script>
+    <script type="text/javascript" src="{% static 'autocomplete_light/autocomplete.js' %}"></script>
+    <script type="text/javascript" src="{% static 'autocomplete_light/widget.js' %}"></script>
+    <script type="text/javascript" src="{% static 'autocomplete_light/addanother.js' %}"></script>
+    <script type="text/javascript" src="{% static 'autocomplete_light/text_widget.js' %}"></script>
+    <script type="text/javascript" src="{% static 'autocomplete_light/remote.js' %}"></script>
+    <link rel="stylesheet" type="text/css" href="{% static 'autocomplete_light/style.css' %}" />
     <script type="text/javascript">
         var autocomplete = $('#search_input').yourlabsAutocomplete({
             url: '/autocomplete/ResourceBaseAutocomplete/',
@@ -443,6 +401,6 @@ <h4 class="modal-title" id="myModalLabel">Sign in</h4>
         };
     </script>
     <script type="text/javascript" src="/lang.js"></script>
-    <script src="/static/monitoring/bundle.js"></script>
+    <script src="{% static 'monitoring/bundle.js' %}"></script>
   </body>
 </html>
diff --git a/geonode/contrib/monitoring/templates/monitoring/index.html b/geonode/contrib/monitoring/templates/monitoring/index.html
@@ -1,5 +1,6 @@
 {% extends "geonode_base.html" %}
 {% load i18n %}
+{% load static from staticfiles %}
 
 {% block title %} {% trans "Monitoring" %} - {{ block.super }} {% endblock %}
 
@@ -21,7 +22,7 @@
 <script type="text/javascript">
     $(document).ready(function() {
         $(document.body).append(
-          '<script src="/static/monitoring/bundle.js"'+ '>'+'</s'+'cript>'
+          '<script src="{% static "monitoring/bundle.js" %}"'+ '>'+'</s'+'cript>'
         );
     })
 </script>

diff --git a/geonode/layers/templates/layers/layer_detail.html b/geonode/layers/templates/layers/layer_detail.html
@@ -97,8 +97,8 @@ <h2 class="page-title">{{ resource.title|default:resource.alternate }}</h2>
                     <td>{% if feature.properties.time %}{{ feature.properties.time }}{% endif %}</td>
                     <!-- td>{% if feature.properties.elevation %}{{ feature.properties.elevation }}{% endif %}</td -->
                     <td>
-                        <a class="btn btn-xs" href="#" onclick="doPreview('{{ resource.service_typename }}', '{{ feature.id }}', '{{ granules.crs.properties.name }}', '{{ feature.geometry.coordinates }}', {% if feature.properties.time %}'{{ feature.properties.time }}'{% else %}null{% endif %});"><img alt="Granule Preview" title="Granule Preview" src="/static/lib/img/map_go.png"/></a>
-                        <a class="btn btn-xs" href="{% url "layer_granule_remove" feature.id resource.service_typename %}"><img alt="Granule Remove" title="Granule Remove" src="/static/lib/img/cancel-on.png"/></a>
+                        <a class="btn btn-xs" href="#" onclick="doPreview('{{ resource.service_typename }}', '{{ feature.id }}', '{{ granules.crs.properties.name }}', '{{ feature.geometry.coordinates }}', {% if feature.properties.time %}'{{ feature.properties.time }}'{% else %}null{% endif %});"><img alt="Granule Preview" title="Granule Preview" src="{% static 'lib/img/map_go.png' %}"/></a>
+                        <a class="btn btn-xs" href="{% url "layer_granule_remove" feature.id resource.service_typename %}"><img alt="Granule Remove" title="Granule Remove" src="{% static 'lib/img/cancel-on.png' %}"/></a>
                         <script language="Javascript">
                             function doPreview(layer_name, feature_id, srs, the_geom, time) {
                                 var map = app.mapPanel.map;

diff --git a/geonode/static/geonode/js/extjs/GeoNode-GeoExplorer.js b/geonode/static/geonode/js/extjs/GeoNode-GeoExplorer.js
@@ -938,8 +938,8 @@ GeoNode.Composer = window.GeoExplorer && Ext.extend(GeoExplorer.Composer, {
         // add catalog source
         config.sources['search'] = {
             ptype: "gxp_geonodeapicataloguesource",
-            restUrl: "/gs/rest",
-            url: "/api/layers/"
+            restUrl: siteUrl + "gs/rest",
+            url: siteUrl + "api/layers/"
         };
 
         config.tools.push({

diff --git a/geonode/static/geonode/js/extjs/GeoNode-mixin.js b/geonode/static/geonode/js/extjs/GeoNode-mixin.js
@@ -7,7 +7,6 @@ Ext.ns("GeoNode");
  *    an SDK app.
  */
 GeoNode.ComposerMixin = {
-
     /** private: method[checkLayerPermissions]
      *  :arg layerRecord: ``GeoExt.data.LayerRecord`` The currently selected layer.
      *  :arg layerTreeId: ``gxp.LayerTree`` or ``gxp.LayerManager`` The layer tree identifier.
@@ -41,7 +40,7 @@ GeoNode.ComposerMixin = {
                     layer.url.indexOf(app.localGeoServerBaseUrl.replace(app.urlPortRegEx, "$1/")) === 0)) {
                 Ext.Ajax.request({
                     /* TODO: use a template variable here if possible */
-                    url:"/gs/" + layer.params.LAYERS + "/edit-check",
+                    url: siteUrl + "gs/" + layer.params.LAYERS + "/edit-check",
                     method:"POST",
                     success:function (response) {
                         var result = Ext.decode(response.responseText);

diff --git a/geonode/static/geonode/js/search/cart.js b/geonode/static/geonode/js/search/cart.js
@@ -22,7 +22,7 @@
         for(var i=0; i<items.length; i++){
           params += 'layer=' + items[i].detail_url.split('/')[2] +'&';
         }
-        window.location = '/maps/new?' + params;
+        window.location = siteUrl + 'maps/new?' + params;
       }
 
       $scope.bulk_perms_submit = function(){
@@ -38,7 +38,7 @@
         $.ajax(
          {
            type: "POST",
-           url: "/security/bulk-permissions",
+           url: siteUrl + "security/bulk-permissions",
            data: {
              permissions: JSON.stringify(permissions),
              resources: selected_ids
@@ -67,16 +67,14 @@
     .directive('resourceCart', [function(){
       return {
         restrict: 'EA',
-        templateUrl: "/static/geonode/js/templates/cart.html",
+        templateUrl: siteUrl + "static/geonode/js/templates/cart.html",
         link: function($scope, $element){
           // Don't use isolateScope, but add to parent scope
           $scope.facetType = $element.attr("data-facet-type");
         }
       };
     }])
-
     .service('cart', function($cookies){
-
       this.init = function(){
         this.$cart = {
           items: this.fillCart()
@@ -106,7 +104,6 @@
             });
           }
         }
-
         return cartSession;
       };
 
@@ -115,7 +112,6 @@
       }
 
       this.addItem = function(item){
-
         if(!item.id && item.layer_identifier){
           item.id = item.layer_identifier;
         }

diff --git a/geonode/static/geonode/js/search/explore.js b/geonode/static/geonode/js/search/explore.js
@@ -1,7 +1,5 @@
 $(function() {
-
     // $(".datepicker").datetimepicker({autoclose:true});
-
     $("#slide-pane a.toggle-pane").click(function(e) {
         e.preventDefault();
         var span$ = $("#slide-pane").parents(".col-md-3");