Commit 310dd469 authored by dmorley's avatar dmorley
Browse files

cleanup map view

parent c4e3274b
Pipeline #6596 passed with stages
in 40 seconds
...@@ -27,6 +27,7 @@ $serverlocation = c('serverlocation'); ...@@ -27,6 +27,7 @@ $serverlocation = c('serverlocation');
echo '<a href="#" class="m-1 btn btn-sm bg-blue text-white wizardstart" data-featherlight-variant="table-responsive" data-featherlight="wizard.php?page=1">Use wizard</a>'; echo '<a href="#" class="m-1 btn btn-sm bg-blue text-white wizardstart" data-featherlight-variant="table-responsive" data-featherlight="wizard.php?page=1">Use wizard</a>';
} else { } else {
echo '<a href="go.php' . $softwaren . '" class="m-1 btn btn-sm bg-blue text-white">Auto pick</a>'; echo '<a href="go.php' . $softwaren . '" class="m-1 btn btn-sm bg-blue text-white">Auto pick</a>';
echo '<a href="/map" class="m-1 btn btn-sm bg-blue text-white">Use Map</a>';
} }
?> ?>
</div> </div>
......
...@@ -43,7 +43,7 @@ $subdomain = join('.', explode('.', $_SERVER['HTTP_HOST'], -2)); ...@@ -43,7 +43,7 @@ $subdomain = join('.', explode('.', $_SERVER['HTTP_HOST'], -2));
try { try {
if (!empty($subdomain)) { if (!empty($subdomain)) {
$pods = R::getAll(" $pods = R::getAll("
SELECT domain, signup, name, lat, long, softwarename, uptime_alltime, total_users SELECT domain, signup, name, lat, long, softwarename, uptime_alltime, total_users, monthsmonitored
FROM pods FROM pods
WHERE long != '' WHERE long != ''
AND lat != '' AND lat != ''
...@@ -53,7 +53,7 @@ try { ...@@ -53,7 +53,7 @@ try {
", [PodStatus::RECHECK, $subdomain]); ", [PodStatus::RECHECK, $subdomain]);
} else { } else {
$pods = R::getAll(" $pods = R::getAll("
SELECT domain, signup, name, lat, long, softwarename, uptime_alltime, total_users SELECT domain, signup, name, lat, long, softwarename, uptime_alltime, total_users, monthsmonitored
FROM pods FROM pods
WHERE long != '' WHERE long != ''
AND lat != '' AND lat != ''
...@@ -89,7 +89,7 @@ try { ...@@ -89,7 +89,7 @@ try {
'type': 'Feature', 'type': 'Feature',
'id': '1', 'id': '1',
'properties' : { 'properties' : {
'html': '<a href="/go.php?domain={$pod['domain']}">{$pod_name}</a><a href="/{$pod['domain']}"><span style="font-size: 1.4em; opacity: 0.2;" class="fa fa-info-circle align-top pl-3"></span></a><br>Software: {$pod['softwarename']}<br> Open Signup: {$signup}<br> Users: {$pod['total_users']}<br> Uptime: {$pod['uptime_alltime']}%' 'html': '<a href="/go.php?domain={$pod['domain']}">{$pod_name}</a><a href="/{$pod['domain']}"><span style="font-size: 1.4em; opacity: 0.2;" class="fa fa-info-circle align-top pl-3"></span></a><br>Software: {$pod['softwarename']}<br> Open Signup: {$signup}<br> Months Monitored: {$pod['monthsmonitored']} <br> Users: {$pod['total_users']}<br> Uptime: {$pod['uptime_alltime']}%'
}, },
'geometry': { 'geometry': {
'type': 'Point', 'type': 'Point',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment