Commit 0552a207 authored by dmorley's avatar dmorley

fix ux items

parent ad2932cc
body {
font-family: 'Helvetica', sans-serif;
font-weight: 400;
--black: #36364F;
--black: #0e0e0e;
--grey: #36454f;
--white: #f8f8ff;
}
......@@ -19,7 +19,7 @@ a {
}
.bg-blue {
background-color: var(--black);
background-color: var(--black) !important;
}
.main {
......
......@@ -41,7 +41,7 @@ try {
ORDER BY random()
LIMIT 1
', [$_software, PodStatus::UP, $hiddensoftwares, $country_code]);
$domain || die('no domains exist');
$domain || die('No domain is a match to your request, go back and manually find one that is a fit for you');
} elseif ($_software) {
$click = 'autoclick';
$domain = R::getCell('
......@@ -56,7 +56,7 @@ try {
ORDER BY random()
LIMIT 1
', [$_software, PodStatus::UP, $hiddensoftwares]);
$domain || die('no domains exist');
$domain || die('No domain is a match to your request, go back and manually find one that is a fit for you');
} elseif ($country_code) {
$click = 'autoclick';
$domain = R::getCell('
......@@ -71,7 +71,7 @@ try {
ORDER BY random()
LIMIT 1
', [PodStatus::UP, $hiddensoftwares, $country_code]);
$domain || die('no domains exist');
$domain || die('No domain is a match to your request, go back and manually find one that is a fit for you');
} else {
$click = 'autoclick';
$domain = R::getCell('
......@@ -85,7 +85,7 @@ try {
ORDER BY random()
LIMIT 1
', [PodStatus::UP, $hiddensoftwares]);
$domain || die('no domains exist');
$domain || die('No domain is a match to your request, go back and manually find one that is a fit for you');
}
$c = R::dispense('clicks');
......
......@@ -26,23 +26,23 @@ try {
die('Error in SQL query: ' . $e->getMessage());
}
$input = isset($_GET['input']) ? substr($_GET['input'], 1) : null;
$mapview = isset($_GET['mapview']) || $input === 'map';
$statsview = isset($_GET['statsview']) || $input === 'stats';
$podmin = isset($_GET['podmin']) || $input === 'podmin';
$podminedit = isset($_GET['podminedit']) || $input === 'podminedit';
$edit = isset($_GET['edit']) || $input === 'edit';
$add = isset($_GET['add']) || $input === 'add';
$gettoken = isset($_GET['gettoken']) || $input === 'gettoken';
$status = isset($_GET['status']) || $input === 'status';
$simpleview = !($mapview || $podmin || $podminedit || $statsview);
$fullview = false;
$subdomain = join('.', explode('.', $_SERVER['HTTP_HOST'], -2));
$input = isset($_GET['input']) ? substr($_GET['input'], 1) : null;
$mapview = isset($_GET['mapview']) || $input === 'map';
$statsview = isset($_GET['statsview']) || $input === 'stats';
$podmin = isset($_GET['podmin']) || $input === 'podmin';
$podminedit = isset($_GET['podminedit']) || $input === 'podminedit';
$edit = isset($_GET['edit']) || $input === 'edit';
$add = isset($_GET['add']) || $input === 'add';
$gettoken = isset($_GET['gettoken']) || $input === 'gettoken';
$status = isset($_GET['status']) || $input === 'status';
$simpleview = !($mapview || $podmin || $podminedit || $statsview);
$fullview = false;
$subdomain = join('.', explode('.', $_SERVER['HTTP_HOST'], -2));
$software_toggle = !empty($subdomain) ? $subdomain : 'Software';
$software = !empty($subdomain) ? ucwords($subdomain) : 'Open Source Social Network';
$softwarejs = !empty($subdomain) ? ucwords($subdomain) : '';
$softwaredb = !empty($subdomain) ? $subdomain : 'all';
$software_all = !empty($subdomain) ? ucwords($subdomain) : 'All';
$software = !empty($subdomain) ? ucwords($subdomain) : 'Open Source Social Network';
$softwarejs = !empty($subdomain) ? ucwords($subdomain) : '';
$softwaredb = !empty($subdomain) ? $subdomain : 'all';
$software_all = !empty($subdomain) ? ucwords($subdomain) : 'All';
?>
<!doctype html>
......@@ -50,7 +50,7 @@ $software_all = !empty($subdomain) ? ucwords($subdomain) : 'All';
<head>
<meta charset="utf-8">
<title><?php echo $software ?> Pod Uptime Status</title>
<meta name="keywords" content="diaspora, <?php echo $input ?>, federated pods, Poduptime, fediverse, federated network, friendica, hubzilla, open source social, open source social network"/>
<meta name="keywords" content="diaspora, federated pods, Poduptime, fediverse, federated network, friendica, hubzilla, open source social, open source social network"/>
<meta name="description" content="<?php echo $software ?> Pod <?php echo $input ?> Live Status. Find a <?php echo $software ?> pod to sign up for, rate pods, find one close to you!"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
......@@ -60,7 +60,7 @@ $software_all = !empty($subdomain) ? ucwords($subdomain) : 'All';
<link rel="stylesheet" href="node_modules/tablesorter/dist/css/theme.bootstrap_4.min.css"/>
<link rel="stylesheet" href="node_modules/fork-awesome/css/fork-awesome.min.css"/>
<meta property="og:url" content="https://<?php echo $_SERVER['HTTP_HOST'] ?>/<?php echo $input ?>"/>
<meta property="og:title" content="<?php echo $software ?> Pod <?php echo $input ?> Finder"/>
<meta property="og:title" content="<?php echo $software ?> Pod Finder"/>
<meta property="og:type" content="website"/>
<meta property="og:description" content="<?php echo $software ?> Live Status. Find a ?php echo $software ?> pod to sign up for, rate pods, find one close to you!"/>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=yes">
......@@ -87,8 +87,12 @@ $navs = [
?>
<header>
<nav class="navbar navbar-expand-lg">
<nav class="navbar navbar-expand-lg navbar-dark">
<a class="navbar-brand white" href="#"><?php echo c('title') ?></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarTogglerDemo02" aria-controls="navbarTogglerDemo02" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarTogglerDemo02">
<ul class="navbar-nav">
<li class="nav-item active">
<a class="white nav-link" href="/">Table</a>
......@@ -135,6 +139,7 @@ $navs = [
</div>
</li>
</ul>
</div>
</nav>
</header>
<main role="main">
......@@ -168,11 +173,11 @@ $navs = [
<footer class="ml-3 text-muted mt-3">
<medium>
<div class="float-left">
<a href="/status">Data refreshed <?php echo Carbon::createFromFormat('Y-m-d H:i:s.u', getMeta('pods_updated', 'date_created'))->diffForHumans(); ?></a>
<a href="/status">Updated <?php echo Carbon::createFromFormat('Y-m-d H:i:s.u', getMeta('pods_updated', 'date_created'))->diffForHumans(); ?></a>
</div>
<?php
if (c('serverad')) {
echo "<div class='float-md-right mr-sm-3'><a href='" . c('serveradurl') . "'>" . c('serverad') . "</a></div>";
echo "<div class='float-right mr-sm-3'><a href='" . c('serveradurl') . "'>" . c('serverad') . "</a></div>";
}
$csoftwares = c('softwares');
foreach ($csoftwares as $csoftware => $details) {
......
......@@ -56,11 +56,8 @@ $table
$.get('tabledata.php?software=' + software, function (html) {
$('table tbody').append(html);
$('table').trigger('update', [true]);
$('.loadingtable').slideToggle('fast');
//if (software) {
// columns[3] = software;
// $('table').trigger('search', [columns]);
//}
$('.loadingtable').slideToggle('slow');
$('[data-toggle="tooltip"]').tooltip();
})
$('[data-toggle="tooltip"]').tooltip();
});
......@@ -73,7 +73,7 @@ $serverlocation = c('serverlocation');
<th data-priority="1" class="columnSelector-disable"><div data-toggle="tooltip" title="A pod is a site for you to set up your account.">Pod</div></th>
<th class="columnSelector-false"><div>Name</div></th>
<th class="columnSelector-false"><div data-toggle="tooltip" title="Version of software this pod runs">Version</div></th>
<th data-priority="1" class="filter-select"><div data-toggle="tooltip" title="Type of software this pod runs">Software</div></th>
<th class="columnSelector-false filter-select"><div data-toggle="tooltip" title="Type of software this pod runs">Software</div></th>
<th class="columnSelector-false filter-match" data-priority="4"><div data-toggle="tooltip" title="Protocols this pod supports.">Protocols</div></th>
<th data-priority="1"><div data-toggle="tooltip" title="Percent of the time the pod is online.">Uptime</div></th>
<th class="columnSelector-false filter-select"><div data-toggle="tooltip" title="Does this pod offer ipv6 connection.">IPv6</div></th>
......@@ -89,7 +89,7 @@ $serverlocation = c('serverlocation');
<th class="columnSelector-false"><div data-toggle="tooltip" title="System Score on a 100 point scale.">Score</div></th>
<th class="columnSelector-false filter-select"><div data-toggle="tooltip" title="System Status.">Status</div></th>
<th class="columnSelector-false filter-select"><div data-toggle="tooltip" title="Does this domain use DNSSEC.">DNSSEC</div></th>
<th class="filter-select" data-priority="1"><div data-toggle="tooltip" title="Pod location, based on IP Geolocation." data-placeholder="Try: <?php echo $country_code ?: 'US'; ?>">Country</div></th>
<th class="filter-select" data-priority="2"><div data-toggle="tooltip" title="Pod location, based on IP Geolocation." data-placeholder="Try: <?php echo $country_code ?: 'US'; ?>">Country</div></th>
<th class="columnSelector-false" data-priority="5"><div data-toggle="tooltip" title="Pod City, based on IP Geolocation.">City</div></th>
<th class="columnSelector-false" data-priority="5"><div data-toggle="tooltip" title="Pod State, based on IP Geolocation.">State</div></th>
<th class="columnSelector-false filter-select"><div data-toggle="tooltip" title="Pod language detected from their main page text.">Language</div></th>
......
......@@ -51,9 +51,9 @@ foreach ($pods as $pod) {
$tip = "{$pod['domain']} last checked {$last_podcheck} ago, over the last {$humanmonitored} uptime was {$pod['uptime_alltime']}%";
if (($_COOKIE['domain'] ?? null) === $pod['domain']) {
echo '<tr><td title="This is the last pod you visited from this site. ' . $tip . '" data-placement="right" data-toggle="tooltip" class="bg-blue"><a class="text-white url" target="_pod" href="/go.php?domain=' . $pod['domain'] . '">' . idn_to_utf8($pod['domain']) . '</a></td>';
echo '<tr><td title="This is the last pod you visited from this site. ' . $tip . '" data-placement="bottom" data-toggle="tooltip" class="bg-blue"><a class="text-white url" target="_pod" href="/go.php?domain=' . $pod['domain'] . '">' . idn_to_utf8($pod['domain']) . '</a></td>';
} else {
echo '<tr><td data-placement="right" title="' . $tip . '" data-toggle="tooltip"><a class="url" target="_pod" href="/go.php?domain=' . $pod['domain'] . '">' . idn_to_utf8($pod['domain']) . '</a></td>';
echo '<tr><td data-placement="bottom" title="' . $tip . '" data-toggle="tooltip"><a class="url" target="_pod" href="/go.php?domain=' . $pod['domain'] . '">' . idn_to_utf8($pod['domain']) . '</a></td>';
}
if ($pod['shortversion'] > $pod['masterversion']) {
......
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