moving the leaflet and google map dependency to the new management index file

diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html
index 62b74ea..b686df5 100644 (file)
--- a/views/admin/manageDashboard/index.html
+++ b/views/admin/manageDashboard/index.html
@@ -1,5 +1,13 @@
 
 <div id="glm-manage-member-dashboard">
+    {if $settings.selected_map_interface == 1}
+        <link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.3/dist/leaflet.css" integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ==" crossorigin=""/>
+        <script src="https://unpkg.com/leaflet@1.3.3/dist/leaflet.js" integrity="sha512-tAGcCfR4Sc5ZP5ZoVz0quoZDYX5aCtEm/eu1KhSLj2c9eFrylXZknQYmxUssFaVJKvvc0dJQixhGjG2yXWiV9Q==" crossorigin=""></script>
+    {/if}
+    {if $settings.selected_map_interface == 2}
+        <script src="//maps.googleapis.com/maps/api/js?&key={$settings.google_maps_api_key}"></script>
+        <script type="text/javascript">var enableDraggable = true;</script>
+    {/if}   
     <!-- <pre>{ $terms|@print_r}</pre> -->
     <div id="add-new-member"><i class="material-icons">add</i>{$terms.term_member_cap}</div>
     {include file='admin/manageDashboard/adminSearch/searchHeader.html'}

diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index 1a66a22..baf5b4d 100755 (executable)
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -1,13 +1,6 @@
 {include file='admin/member/header.html'}
 
-    {if $settings.selected_map_interface == 1}
-        <link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.3/dist/leaflet.css" integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ==" crossorigin=""/>
-        <script src="https://unpkg.com/leaflet@1.3.3/dist/leaflet.js" integrity="sha512-tAGcCfR4Sc5ZP5ZoVz0quoZDYX5aCtEm/eu1KhSLj2c9eFrylXZknQYmxUssFaVJKvvc0dJQixhGjG2yXWiV9Q==" crossorigin=""></script>
-    {/if}
-    {if $settings.selected_map_interface == 2}
-        <script src="//maps.googleapis.com/maps/api/js?&key={$settings.google_maps_api_key}"></script>
-        <script type="text/javascript">var enableDraggable = true;</script>
-    {/if}   
+   
 
     <!--[if lt IE 9]>
       <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>

diff --git a/views/admin/member/memberInfo/editProfileAddress.html b/views/admin/member/memberInfo/editProfileAddress.html
index f958d0d..8ed8148 100755 (executable)
--- a/views/admin/member/memberInfo/editProfileAddress.html
+++ b/views/admin/member/memberInfo/editProfileAddress.html
@@ -148,21 +148,20 @@
             /*
              * Map operations
              */
-
+       
             var startLat = $('#glmLat').val();
             var startLon = $('#glmLng').val();
             var defZoom = Number({$settings.maps_default_zoom});
 
     {if $settings.selected_map_interface == 1}
-
             /*
              *  Leaflet Map
              *  API reference: https://leafletjs.com/reference-1.3.2.html
              */
 
-
+         
             function initMap() {
-
+                
                  var leafletMap = L.map('LeafletMapContainer').setView([startLat, startLon], defZoom);
                  //var leafletTileServer = '{$settings.leaflet_tile_server}' + {literal}'{z}/{x}/{y}.png'{/literal};
                  var leafletTileServer = '{$settings.leaflet_tile_server}/{$settings.leaflet_tile_server_key}/' + {literal}'{z}/{x}/{y}.png'{/literal};
@@ -409,13 +408,9 @@
 
     {/if}
 
-
-            $(window).load(function(){
-                initMap();
-              });
-
-
-        });
+        initMap();
+     
+    });
     </script>