Commit a537865e authored by dmorley's avatar dmorley

visual cleanup

parent 855b6534
......@@ -27,7 +27,7 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:
.container-fluid{position:relative;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";zoom:1;*display:inline;}
.container-fluid:after{clear:both;}
.container-fluid>.sidebar{float:right;width:160px;}
.container-fluid>.content{margin-left:2px;width:85%;}
.container-fluid>.content{margin-left:2px;}
a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#00438a;text-decoration:underline;}
.pull-right{float:right;}
.pull-left{float:left;}
......@@ -180,9 +180,11 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado
.form-stacked .inputs-list{margin-bottom:0;}.form-stacked .inputs-list li{padding-top:0;}.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;}
.form-stacked div.clearfix.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;}
.form-stacked .actions{margin-left:-20px;padding-left:20px;}
table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;*border-collapse:collapse;font-size:12px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}table th,table td{padding:10px 10px 9px;line-height:6px;text-align:left;}
table th{padding-top:9px;font-weight:bold;vertical-align:middle;border-bottom:1px solid #ddd;}
table td{vertical-align:top;}
table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;*border-collapse:collapse;font-size:12px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
table th,table td{padding:10px 10px 9px;text-align:left;}
table th{line-height:9px;padding-top:9px;font-weight:bold;vertical-align:middle;border-bottom:1px solid #ddd;}
table td{line-height:5px;vertical-align:top;}
table th+th,table td+td{border-left:1px solid #ddd;}
table tr+tr td{border-top:1px solid #ddd;}
table tbody tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
......
......@@ -37,4 +37,5 @@ background-position: 0 -792px;
}
#wordpress {
background-position: 0 -656px;
position: absolute;
}
......@@ -101,8 +101,8 @@ unset($xdver);
curl_setopt($chss, CURLOPT_URL, "https://".$domain."/statistics.json");
curl_setopt($chss, CURLOPT_POST, 0);
curl_setopt($chss, CURLOPT_HEADER, 1);
curl_setopt($chss, CURLOPT_CONNECTTIMEOUT, 15);
curl_setopt($chss, CURLOPT_TIMEOUT, 15);
curl_setopt($chss, CURLOPT_CONNECTTIMEOUT, 25);
curl_setopt($chss, CURLOPT_TIMEOUT, 25);
curl_setopt($chss, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($chss, CURLOPT_NOBODY, 0);
$outputssl = curl_exec($chss);
......@@ -112,8 +112,8 @@ unset($xdver);
curl_setopt($ch, CURLOPT_URL, "http://".$domain."/statistics.json");
curl_setopt($ch, CURLOPT_POST, 0);
curl_setopt($ch, CURLOPT_HEADER, 1);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
curl_setopt($ch, CURLOPT_TIMEOUT, 15);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 25);
curl_setopt($ch, CURLOPT_TIMEOUT, 25);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_NOBODY, 0);
$output = curl_exec($ch);
......
......@@ -26,14 +26,14 @@ if ($detect->isMobile()) {echo '<link rel="stylesheet" href="css/mobile.css" />'
<header>
<div class="page-header">
<div class="row">
<div class="span6">
<div class="span5">
<h2 id="title">
Diaspora Hosted Pods
</h2>
</div>
<div class="span3" style="margin-top:8px;">
<div class="span" style="margin-top:8px;">
</div>
<div class="span4" style="margin-top:8px;">
<div class="span2" style="margin-top:8px;">
<a href="http://flattr.com/thing/170048/Diaspora-Pod-Live-Uptime-watch" target="_blank"><img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a>
</div>
<div class="span2" style="margin-top:8px;">
......@@ -51,20 +51,6 @@ if ($detect->isMobile()) {echo '<link rel="stylesheet" href="css/mobile.css" />'
</div>
</header>
<div class="container-fluid">
<div class="sidebar">
<div class="adsense2">
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- podup3 -->
<ins class="adsbygoogle"
style="display:inline-block;width:160px;height:600px"
data-ad-client="ca-pub-3662181805557062"
data-ad-slot="3844961434"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
</div>
<a href="https://market.android.com/details?id=appinventor.ai_david_morley.DiasporaPoduptime"><img src="http://c807316.r16.cf2.rackcdn.com/android-dude128.png"></a>
</div>
<div class="content">
<div id="map" style="width:80%;height:500px;position:absolute;display:none"></div>
<div id="results">
......
......@@ -27,7 +27,8 @@ $.facebox.settings.loadingImage = 'http://c807316.r16.cf2.rackcdn.com/loading.gi
$('#add').click(function() {
$('#howto').show('slow'); $('#add').hide('slow');$('#results').hide('slow');
});
$("#myTable").tablesorter( {sortList: [[1,1], [2,1]]} );
// $("#myTable").tablesorter( {sortList: [[1,1], [2,1]]} );
$("#myTable").tablesorter();
$('#add').delay(8000).fadeIn(2000);
$('#others').delay(8000).fadeIn(2000);
//$('#buttonsy').delay(5550).slideDown(3330);
......
......@@ -27,9 +27,9 @@ $tt=0;
}
$hidden = isset($_GET['hidden'])?$_GET['hidden']:null;
if ($hidden == "true") {
$sql = "SELECT * FROM pods WHERE hidden <> 'no' ORDER BY Hgitdate DESC, uptimelast7 DESC";
$sql = "SELECT * FROM pods WHERE hidden <> 'no' ORDER BY active_users_halfyear DESC NULLS LAST, uptimelast7 DESC NULLS LAST";
} else {
$sql = "SELECT * FROM pods WHERE adminrating <> -1 AND hidden <> 'yes' ORDER BY Hgitdate DESC, uptimelast7 DESC";
$sql = "SELECT * FROM pods WHERE adminrating <> -1 AND hidden <> 'yes' ORDER BY active_users_halfyear DESC NULLS LAST, uptimelast7 DESC NULLS LAST";
}
$result = pg_query($dbh, $sql);
if (!$result) {
......@@ -95,6 +95,21 @@ echo "✪";
if ($row["service_tumblr"] == "t") {echo "<div id='tumblr' class='smlogo'></div>";}
if ($row["service_wordpress"] == "t") {echo "<div id='wordpress' class='smlogo'></div>";}
echo "</td></tr>\n";
if ($tt == 5) {
echo <<<EOF
<td colspan='12' style='padding-left:200px;'>
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- podup2015 -->
<ins class="adsbygoogle"
style="display:inline-block;width:728px;height:90px"
data-ad-client="ca-pub-3662181805557062"
data-ad-slot="2218925437"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
</td>
EOF;
}
}
pg_free_result($result);
pg_close($dbh);
......
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