Skip to content

Poduptime
Poduptime
Commit 4212d85f authored by Armando Lüscher's avatar Armando Lüscher
Browse files
Options

Merge branch 'checkboxes' into 'develop' 

humanize y/n and make them easier drop downs

See merge request !202
parents 59e28696 ea0e6e6d
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 22 deletions
js/podup.js
View file @ 4212d85f
......@@ -38,7 +38,7 @@ $(document).ready(function () {
$('table').trigger('filterReset');
});
$('.columnsadvanced').on('click', function () {
$('table').trigger('refreshColumnSelector', ['columns', [1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 21, 22, 28]]);
$('table').trigger('refreshColumnSelector', ['columns', [2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 21, 22, 28]]);
$('#colSelect1').prop('checked', false);
$('.columnSelectorWrapper').show().css('display', 'inline-block');
$('.columnssimple').show().css('display', 'inline-block');
......@@ -57,7 +57,7 @@ $(document).ready(function () {
if (input) {
columns[0] = input;
}
columns[7] = 'Y';
columns[7] = 'Yes';
$('table').trigger('search', [columns]);
$('.pagerhidden').delay(900).show(200);
$('[data-toggle="tooltip"]').tooltip();
......
showfull.php
View file @ 4212d85f
......@@ -56,11 +56,11 @@ $country_code = $_SERVER['HTTP_CF_IPCOUNTRY'] ?? '';
<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 class="columnSelector-false" data-priority="3"><div data-toggle="tooltip" title="Type of software this pod runs">Software</div></th>
<th class="columnSelector-false filter-select" data-priority="3"><div data-toggle="tooltip" title="Type of software this pod runs">Software</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"><div data-toggle="tooltip" title="Does this pod offer ipv6 connection.">IPv6</div></th>
<th class="columnSelector-false filter-select"<div data-toggle="tooltip" title="Does this pod offer ipv6 connection.">IPv6</div></th>
<th class="columnSelector-false"><div data-toggle="tooltip" title="Average connection latency time in ms from Los Angeles.">Latency</div></th>
<th data-priority="2"><div data-toggle="tooltip" title="Does this pod allow new users.">Signups</div></th>
<th class="filter-select" data-priority="2"><div data-toggle="tooltip" title="Does this pod allow new users.">Signups</div></th>
<th data-priority="2" data-selector-name="Total Users"><div data-toggle="tooltip" title="Number of total users on this pod.">Users</div></th>
<th class="columnSelector-false" data-selector-name="Users last 6 months"><div data-toggle="tooltip" title="Number of users active last 6 months on this pod.">6m</div></th>
<th class="columnSelector-false" data-selector-name="Users last 1 month"><div data-toggle="tooltip" title="Number of users active last 1 month on this pod.">1m</div></th>
......@@ -69,18 +69,18 @@ $country_code = $_SERVER['HTTP_CF_IPCOUNTRY'] ?? '';
<th class="columnSelector-false"><div data-toggle="tooltip" title="How many months have we been watching this pod." data-placeholder="Try: ! 0">Months</div></th>
<th data-priority="6"><div data-toggle="tooltip" title="User rating for this pod.">Rating</div></th>
<th class="columnSelector-false"><div data-toggle="tooltip" title="System Score on a 100 point scale.">Score</div></th>
<th class="columnSelector-false"><div data-toggle="tooltip" title="System Status.">Status</div></th>
<th class="columnSelector-false"><div data-toggle="tooltip" title="Does this domain use DNSSEC.">DNSSEC</div></th>
<th 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="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="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"><div data-toggle="tooltip" title="Pod language detected from their main page text.">Language</div></th>
<th class="columnSelector-false filter-select"><div data-toggle="tooltip" title="Pod language detected from their main page text.">Language</div></th>
<th data-priority="3" data-selector-name="All Services"><div data-toggle="tooltip" title="External Social Networks this pod can post to." class="filter-false">Services</div></th>
<th class="columnSelector-false"><div data-toggle="tooltip" title="External post to Facebook.">Facebook</div></th>
<th class="columnSelector-false"><div data-toggle="tooltip" title="External post to Twitter.">Twitter</div></th>
<th class="columnSelector-false"><div data-toggle="tooltip" title="External post to Tumblr.">Tumblr</div></th>
<th class="columnSelector-false"><div data-toggle="tooltip" title="External post to Wordpress.">Wordpress</div></th>
<th class="columnSelector-false"><div data-toggle="tooltip" title="Supports Jabber/XMPP for chat.">XMPP</div></th>
<th class="columnSelector-false filter-select"><div data-toggle="tooltip" title="External post to Facebook.">Facebook</div></th>
<th class="columnSelector-false filter-select"><div data-toggle="tooltip" title="External post to Twitter.">Twitter</div></th>
<th class="columnSelector-false filter-select"><div data-toggle="tooltip" title="External post to Tumblr.">Tumblr</div></th>
<th class="columnSelector-false filter-select"><div data-toggle="tooltip" title="External post to Wordpress.">Wordpress</div></th>
<th class="columnSelector-false filter-select"><div data-toggle="tooltip" title="Supports Jabber/XMPP for chat.">XMPP</div></th>
<th data-priority="6" data-selector-name="Podmin Info"><div data-toggle="tooltip" title="Click for more information about this pod from the pod host (podmin).">Info</div></th>
</tr>
</thead>
......
tabledata.php
View file @ 4212d85f
......@@ -57,9 +57,9 @@ foreach ($pods as $pod) {
echo '<td class="' . $classver . '"><div title="' . $pre . ' version: ' . $pod['shortversion'] . ' master version is: ' . ($pod['masterversion'] ?: 'unknown') . '" data-toggle="tooltip">' . $version . '</div></td>';
echo '<td>' . $pod['softwarename'] . '</td>';
echo '<td><a href="#" data-featherlight-variant="table-responsive" data-featherlight="podstat-uptime.php?domain=' . $pod['domain'] . '">' . ($pod['uptime_alltime'] > 0 ? $pod['uptime_alltime'] . '%' : '') . '</a></td>';
echo '<td>' . ($pod['ipv6'] ? 'Y' : 'N') . '</td>';
echo '<td>' . ($pod['ipv6'] ? 'Yes' : 'No') . '</td>';
echo '<td>' . ($pod['latency'] > 0 ? $pod['latency'] : '') . '</td>';
echo '<td>' . ($pod['signup'] ? 'Y' : 'N') . '</td>';
echo '<td>' . ($pod['signup'] ? 'Yes' : 'No') . '</td>';
echo '<td><a href="#" data-featherlight-variant="table-responsive" data-featherlight="podstat-counts.php?domain=' . $pod['domain'] . '">' . ($pod['total_users'] > 0 ? $pod['total_users'] : '') . '</a></td>';
echo '<td>' . ($pod['active_users_halfyear'] > 0 ? $pod['active_users_halfyear'] : '') . '</td>';
echo '<td>' . ($pod['active_users_monthly'] > 0 ? $pod['active_users_monthly'] : '') . '</td>';
......@@ -69,7 +69,7 @@ foreach ($pods as $pod) {
echo '<td><a href="#" data-featherlight-variant="table-responsive" data-featherlight="rate.php?domain=' . $pod['domain'] . '">' . $pod['userrating'] . '</a></td>';
echo '<td><div>' . $pod['score'] . '</div></td>';
echo '<td><div>' . PodStatus::getKey((int) $pod['status']) . '</div></td>';
echo '<td>' . ($pod['dnssec'] ? 'Y' : 'N') . '</td>';
echo '<td>' . ($pod['dnssec'] ? 'Yes' : 'No') . '</td>';
if ($country_code === $pod['country']) {
echo '<td class="text-success" data-toggle="tooltip" title="Country: ' . ($pod['countryname'] ?? 'n/a') . ' City: ' . ($pod['city'] ?? 'n/a') . ' State: ' . ($pod['state'] ?? 'n/a') . '"><b>' . $pod['country'] . '</b></td>';
} else {
......@@ -85,11 +85,11 @@ foreach ($pods as $pod) {
$pod['service_wordpress'] && print '<div class="smlogo smlogo-wordpress" data-toggle="tooltip" title="Publish to WordPress"></div>';
$pod['service_xmpp'] && print '<div class="smlogo smlogo-xmpp"><img src="/images/icon-xmpp.png" width="16" height="16" data-toggle="tooltip" title="XMPP chat server" alt="XMPP chat server"></div>';
echo '</td>';
echo '<td>' . ($pod['service_facebook'] ? 'Y' : 'N') . '</td>';
echo '<td>' . ($pod['service_twitter'] ? 'Y' : 'N') . '</td>';
echo '<td>' . ($pod['service_tumblr'] ? 'Y' : 'N') . '</td>';
echo '<td>' . ($pod['service_wordpress'] ? 'Y' : 'N') . '</td>';
echo '<td>' . ($pod['service_xmpp'] ? 'Y' : 'N') . '</td>';
echo '<td>' . ($pod['service_facebook'] ? 'Yes' : 'No') . '</td>';
echo '<td>' . ($pod['service_twitter'] ? 'Yes' : 'No') . '</td>';
echo '<td>' . ($pod['service_tumblr'] ? 'Yes' : 'No') . '</td>';
echo '<td>' . ($pod['service_wordpress'] ? 'Yes' : 'No') . '</td>';
echo '<td>' . ($pod['service_xmpp'] ? 'Yes' : 'No') . '</td>';
$podmin_statement = htmlentities($pod['podmin_statement'] ?? '', ENT_QUOTES);
echo '<td>' . ($podmin_statement ? '<a href="#" data-featherlight="<p>' . $podmin_statement . '</p>">&#128172;</a>' : '&nbsp;') . '</td></tr>';
......
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