diff --git a/css/bootstrap.min.css b/css/bootstrap.min.css index cf2274a91871a77f723d9563da3c6332c49b60fc..039f6042834ef0fba7d58fcb45b925ec4a75657a 100644 --- a/css/bootstrap.min.css +++ b/css/bootstrap.min.css @@ -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;} diff --git a/css/newstyle.css b/css/newstyle.css index 87aea3eeb1117cc55cdab55cbc5d2375e7b00b77..91599d93c6cbf045e03b3cbeee09a25c06cac6e9 100644 --- a/css/newstyle.css +++ b/css/newstyle.css @@ -37,4 +37,5 @@ background-position: 0 -792px; } #wordpress { background-position: 0 -656px; +position: absolute; } diff --git a/db/pull.php b/db/pull.php index a25987ef2df15c5c0545a86fe7702052b7eb95a9..329e699f8499095b427d3e0553b7b90804cd77b4 100644 --- a/db/pull.php +++ b/db/pull.php @@ -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); diff --git a/index.php b/index.php index 97751d7af652942a34febf2264a6337d0bafceca..a38ef10162e868a3749d5e8ce4de91f61b968778 100644 --- a/index.php +++ b/index.php @@ -26,14 +26,14 @@ if ($detect->isMobile()) {echo ''
-
+

Diaspora Hosted Pods

-
+
-
+
Flattr this
@@ -51,20 +51,6 @@ if ($detect->isMobile()) {echo ''
-
-
- - - - -
- -
diff --git a/js/podup.js b/js/podup.js index 647e34c82a598813c92e0171c885afd1b34dc107..7d70b84ed6f1e913acd2874c62c406aa13df8ee3 100644 --- a/js/podup.js +++ b/js/podup.js @@ -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); diff --git a/show.php b/show.php index 219bc7a95c4a42bbfa6ce9a8cefe6b95c06e77dc..5a442fad3de048d6c2d9cee0f1b25d4263ce4bb8 100644 --- a/show.php +++ b/show.php @@ -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 "";} if ($row["service_wordpress"] == "t") {echo "";} echo "\n"; +if ($tt == 5) { +echo << + + + + + +EOF; +} } pg_free_result($result); pg_close($dbh);