change to google maps

system/lan/english.json

@@ -953,5 +953,8 @@
     "Last_Name": "Last Name",
     "Not_Working_with_Freeradius_Mysql": "Not Working with Freeradius Mysql",
     "Radius_Rest_Interim_Update": "Radius Rest Interim-Update",
-    "in_minutes__leave_0_to_disable_this_feature_": "in minutes, leave 0 to disable this feature."
+    "in_minutes__leave_0_to_disable_this_feature_": "in minutes, leave 0 to disable this feature.",
+    "Check_if_Router_Online_": "Check if Router Online?",
+    "To_check_whether_the_Router_is_online_or_not__please_visit_the_following_page": "To check whether the Router is online or not, please visit the following page",
+    "Cek_Now": "Cek Now"
 }

ui/ui/customers-add.tpl

@@ -290,10 +290,8 @@
 
         function setupMap(lat, lon) {
             var map = L.map('map').setView([lat, lon], 13);
-            L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', {
+            L.tileLayer('https://{s}.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&s=Ga', {
-            attribution:
+            subdomains: ['mt0', 'mt1', 'mt2', 'mt3'],
-                'SIMITA',
-                subdomains: 'abcd',
                 maxZoom: 20
         }).addTo(map);
         var marker = L.marker([lat, lon]).addTo(map);

ui/ui/customers-edit.tpl

@@ -300,10 +300,8 @@
 
         function setupMap(lat, lon) {
             var map = L.map('map').setView([lat, lon], 13);
-            L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', {
+            L.tileLayer('https://{s}.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&s=Ga', {
-            attribution:
+            subdomains: ['mt0', 'mt1', 'mt2', 'mt3'],
-                '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
-                subdomains: 'abcd',
                 maxZoom: 20
         }).addTo(map);
         var marker = L.marker([lat, lon]).addTo(map);

ui/ui/customers-map.tpl

@@ -40,10 +40,8 @@
 
             var customers = {/literal}{$customers|json_encode}{literal};
 
-            L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', {
+                L.tileLayer('https://{s}.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&s=Ga', {
-            attribution:
+            subdomains: ['mt0', 'mt1', 'mt2', 'mt3'],
-                '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
-                subdomains: 'abcd',
                 maxZoom: 20
             }).addTo(map);
 

ui/ui/customers-view.tpl

@@ -283,10 +283,8 @@
         <script>
             function setupMap(lat, lon) {
                 var map = L.map('map').setView([lat, lon], 17);
-                L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', {
+                L.tileLayer('https://{s}.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&s=Ga', {
-                attribution:
+            subdomains: ['mt0', 'mt1', 'mt2', 'mt3'],
-                    '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
-                    subdomains: 'abcd',
                 maxZoom: 20
             }).addTo(map);
             var marker = L.marker([lat, lon]).addTo(map);

ui/ui/routers-edit.tpl

@@ -114,10 +114,8 @@
 
         function setupMap(lat, lon) {
             var map = L.map('map').setView([lat, lon], 13);
-            L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', {
+            L.tileLayer('https://{s}.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&s=Ga', {
-                attribution:
+            subdomains: ['mt0', 'mt1', 'mt2', 'mt3'],
-                    '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
-                    subdomains: 'abcd',
                 maxZoom: 20
             }).addTo(map);
             circle = L.circle([lat, lon], 5, {

ui/ui/routers-maps.tpl

@@ -7,8 +7,7 @@
         <div class="input-group-addon">
             <span class="fa fa-search"></span>
         </div>
-        <input type="text" name="name" class="form-control" value="{$name}"
+        <input type="text" name="name" class="form-control" value="{$name}" placeholder="{Lang::T('Search')}...">
-            placeholder="{Lang::T('Search')}...">
         <div class="input-group-btn">
             <button class="btn btn-success" type="submit">{Lang::T('Search')}</button>
         </div>
@@ -40,10 +39,8 @@
 
             var routers = {/literal}{$d|json_encode}{literal};
 
-            L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', {
+            L.tileLayer('https://{s}.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&s=Ga', {
-            attribution:
+            subdomains: ['mt0', 'mt1', 'mt2', 'mt3'],
-                '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
-                subdomains: 'abcd',
                 maxZoom: 20
         }).addTo(map);
 
@@ -59,13 +56,13 @@
             "<a href='https://www.google.com/maps/dir//" + coordinates + "' target='maps'>Get Direction</a><br>";
 
             // Add marker to map
-                if(router.enabled == 1){
+            if (router.enabled == 1) {
-                    var circle = L.circle(coordinates.split(","), router.coverage*1, {
+                var circle = L.circle(coordinates.split(","), router.coverage * 1, {
                     color: 'blue',
                     fillOpacity: 0.1
                 }).addTo(map);
-                }else{
+            } else {
-                    var circle = L.circle(coordinates.split(","), router.coverage*1, {
+                var circle = L.circle(coordinates.split(","), router.coverage * 1, {
                     color: 'red',
                     fillOpacity: 0.1
                 }).addTo(map);