Merge pull request 'dev=>master' (#14) from dev into master

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Reviewed-on: #14
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEtc05MZLusZ0H5UyXhZWj+PLOG3QFAmEdX2QACgkQhZWj+PLO
G3S/gw/9EdeN0rhsXbYyKFAmIeevnZQ8vdPrmjyotEDEmh7YAFnV8tvOXuDsxPkP
N3RW9F708/+NY67fhvGV56c2SXJbGw6P9MStvIuc2VJ125napmB6IKeU9EDg8DZI
JvbMO4DyxtUsT0MimdqRdLvqkAQldEQM4DZiILLR4doF1DLCHD6fcPYTMgUWNye+
aWypdUsRUkUui3qYyTF4f2hrkjpRi7Q4OxkNppLzzKaKaVqgEgOBTb5hn2pQ8RiU
Bv7RGZ1jPATrYmDRTnMy4se9THFmIyBZDcWg1w7NsitBJaeEKTWoTLEvL7dWTiAw
Ni5llkFqswXhi3zzHeznpNKtU4mKfT/pOSPclXv4X43lEX/86eprujms0Ed4Ohmj
Rg7jpDIxS824xFOw368u/j/YzMxx37YjeTyxwE5whczNnZArfaHQ/cejUWmThcR3
SpleuuyeAVwBprf5BeMPiVj4fI4lS75DmF8GIfb5uguheuyp7QuGVTbD/z5W1mtl
bqToLCEjTuHo5x2rldBCCMMD32kohBfu53BhA6K5092igGN9uvBBWtkmWNvb+G9i
zguh7AoZTkCSPr0vfDB75DockVFed3dG7mt1eoUM94CeauqKWFzWRHz3XEpkZ2VK
cHBgTejcNm5gih3C1+PscN7kW/8RYwICzTxoBXlkXwKbpvAq4gk=
=uzR7
-----END PGP SIGNATURE-----
master
joe 1 year ago
commit 3813b9e395
  1. 6
      blog/index.php
  2. 4
      index.php
  3. 10
      privacy.php
  4. 2
      sedulcni/footer.php
  5. 5
      styles.css

@ -18,12 +18,12 @@
while($row = $stmt->fetch()){
echo '<div class="post-preview">';
echo '<h1><a href="'.$row['postSlug'].'">'.$row['postTitle'].'</a></h1>';
echo '<p class="post-date">Posted on '.date('jS M Y H:i:s', strtotime($row['postDate'])).'</p>';
echo '<p class="post-date">Posted on '.date('jS M Y', strtotime($row['postDate'])).'</p>';
echo '<div class="post-description">'.$row['postDesc'].'</div>';
echo '<p><a href="'.$row['postSlug'].'">Read More</a></p>';
echo '<svg height="10" width="100%">';
echo '<line x1="0" y1="0" x2="960" y2="0" />';
echo '</svg>';
echo '<div class="post-description">'.$row['postDesc'].'</div>';
echo '<p><a href="'.$row['postSlug'].'">Read More</a></p>';
echo '</div>';
}

@ -19,11 +19,11 @@
<h2><a href="https://searx.thisisjoes.site/">Searx</a></h2>
<p>A customizable metasearch engine. Choose how your search works and which engines it uses.
Does not keep logs or track users. <a href="https://github.com/asciimoo/searx">Source</a></p>
<h2><a href="https://riot.thisisjoes.site/">Matrix</a></h2>
<h2><a href="https://element.thisisjoes.site/">Matrix</a></h2>
<p>A federated real-time communications network. Send text with
markdown support, make voice and video calls, and create communities.
<a href="https://github.com/matrix-org/synapse">Source</a>(Server)
<a href="https://github.com/vector-im/riot-web">Source</a>(Web-client)
<a href="https://github.com/vector-im/element-web">Source</a>(Web-client)
</p>
<h2><a href="https://social.thisisjoes.site/">Mastodon</a></h2>
<p>A federated micro-blogging network. Share with and follow users from all

@ -5,8 +5,10 @@
require($_SERVER['DOCUMENT_ROOT'] .'/sedulcni/head.php'); ?>
<body<?php require($_SERVER['DOCUMENT_ROOT'] .'/sedulcni/fromPhotos.php'); ?>>
<div class="wrapper">
<?php require($_SERVER['DOCUMENT_ROOT'] .'/sedulcni/header.php'); ?>
<?php require('sedulcni/nav.php'); ?>
<div class="header-container">
<?php require($_SERVER['DOCUMENT_ROOT'] .'/sedulcni/header.php'); ?>
<?php require($_SERVER['DOCUMENT_ROOT'] .'/sedulcni/nav.php'); ?>
</div>
<div class="content" id="content" role="main">
<h1>Let's Talk About Privacy!</h1>
<p>On this website there are no ads or third-party trackers, but I do use analytics software called <i><a href="https://matomo.org">Matomo</a></i>.</p>
@ -15,7 +17,7 @@
<p>I use <i>Matomo</i> to learn how visitors like you use my site. My goal is to use this data to improve my site.</p>
<p>The data I collect is very basic. It includes the following:</p>
<ul>
<li>The IP address you're connecting to my site from. (After 24 hours this is anonymized.<sup><a href="#Note_1">1</a></sup>)</li>
<li>The IP address you're connecting to my site from. (After 6 hours this is anonymized.<sup><a href="#Note_1">1</a></sup>)</li>
<li>The pages on my site you visit and which links on those pages you click on.</li>
<li>The browser you're using. (e.g. <i>Chrome</i> or <i>Firefox</i>)</li>
<li>The type of device you're using. (e.g. phone or desktop)</li>
@ -33,7 +35,7 @@
></iframe>
<p>Notes:</p>
<ol>
<li id="Note_1">Every 24 hours a script on my server removes the last two octets from every IP address in my server's log
<li id="Note_1">Every 6 hours a script on my server removes the last two octets from every IP address in my server's log
before it is compressed and archived. For example, "172.16.24.5" becomes "172.16.xxx.xxx".</li>
<li id="Note_2">Unchecking this box will set a cookie on your device which tells <i>Matomo</i> not to track
anything at all about your visits to my site.</li>

@ -23,5 +23,5 @@
<img alt="Privacy" src="/img/core/privacy-opt.png">
</picture>
</a>
<!-- Version 2.5.1 -->
<!-- Version 2.5.4 -->
</div>

@ -244,9 +244,8 @@ a.new::after {
margin-left: -1.2em;
}
.post-preview {
height: 180px;
padding: 0 0 5px 0;
.aside .post-preview {
padding: 0 0 10px 0;
}
.row {

Loading…
Cancel
Save