try to fix html/css lists(ul/ol)

This commit is contained in:
creme 2020-01-19 21:10:18 +01:00
parent a9edf8d52a
commit 9298e8d27a
Signed by: creme
GPG Key ID: C147C3B7FBDF08D0
10 changed files with 153 additions and 160 deletions

View File

@ -15,7 +15,7 @@ include '../header.php';
<div id="main">
<div class="block_head">
<h1><em>chat</em></h1>
<pre>
<pre class="bottom">
envs.net has two chat options. we can be reached via irc and matrix.
<strong>rules / guidelines</strong>
@ -52,6 +52,7 @@ channel
<pre>
channel <strong>#envs</strong> on
<code>irc.tilde.chat:6697</code>
</pre>
<table>
<tr><th class="tw25"></th> <th></th></tr>

View File

@ -32,18 +32,18 @@ Hang out in <strong>#meta</strong> the tilde general channel. =)
<strong>note</strong> you must register with <code>nickserv</code> to talk in <code>#meta</code>:
<code>/msg nickserv register &lt;password&gt; &lt;email&gt;</code>
</pre>
<br />
<h3>&#35; here are some options to connect</h3>
<pre>
<br />
<ul>
<li><code>weechat</code> (<em>when logged in with ssh</em>) / <code>irssi</code> (<em>needs to configure</em>)</li>
<li><code><a href="https://znc.envs.net/" target="_blank">znc</a></code> - please contact <a href="https://envs.net/~creme/">creme</a> (via irc/matrix or email) to request an account,<br />then log in with your email password and configure as needed.</li>
<li>run <code>webirc</code> to register your thelounge account for <a href="https://webirc.envs.net/" target="_blank">our webchat</a><br /><em>note that thelounge does not authenticate with your shell/mail password.</em></li>
<li>any other client that you like: connect to our node at <code>irc.tilde.chat:6697</code> with ssl</li>
<li><code>weechat</code> (<em>when logged in with ssh</em>) / <code>irssi</code> (<em>needs to configure</em>)</li>
<li><code><a href="https://znc.envs.net/" target="_blank">znc</a></code> - please contact <a href="https://envs.net/~creme/">creme</a> (via irc/matrix or email) to request an account,<br />then log in with your email password and configure as needed.</li>
<li>run <code>webirc</code> to register your thelounge account for <a href="https://webirc.envs.net/" target="_blank">our webchat</a><br /><em>note that thelounge does not authenticate with your shell/mail password.</em></li>
<li>any other client that you like: connect to our node at <code>irc.tilde.chat:6697</code> with ssl</li>
</ul>
</pre>
<br />
<h3>&#35; znc (irc bouncer)</h3>
<pre>
@ -63,29 +63,30 @@ weechat introduced <a href="https://weechat.org/files/doc/stable/weechat_user.en
offer per-user relay access.
<code><em>username.envs.net/weechat</em></code> is configured to proxy to the default unix relay
socket location (<code>~/.weechat/relay_socket</code>). to get started using it, follow these steps:
<ol>
<li>in weechat:</li>
<ul class="sublist">
<li><code>/relay add unix.weechat %h/relay_socket</code></li>
<li><code>/set relay.network.password mysupersecretpassword</code></li>
</ul>
<li>at your shell:</li>
<ul class="sublist">
<li><code>chmod o+rw ~/.weechat/relay_socket</code> - <em>this allows nginx to connect to your socket on your behalf</em></li>
</ul>
<li>in your relay client:</li>
<ul class="sublist">
<li>weechat-android:</li>
<ul class="sublist">
<li>connection type: websocket (ssl)</li>
<li>websocket path: weechat</li>
<li>relay host: username.envs.net</li>
<li>relay port: 443</li>
<li>your relay supersecretpassword</li>
</ul>
</ul>
</ol>
</pre>
<br />
<ol>
<li>in weechat:</li>
<ul>
<li><code>/relay add unix.weechat %h/relay_socket</code></li>
<li><code>/set relay.network.password mysupersecretpassword</code></li>
</ul>
<li>at your shell:</li>
<ul>
<li><code>chmod o+rw ~/.weechat/relay_socket</code> - <em>this allows nginx to connect to your socket on your behalf</em></li>
</ul>
<li>in your relay client:</li>
<ul>
<li>weechat-android:</li>
<ul>
<li>connection type: websocket (ssl)</li>
<li>websocket path: weechat</li>
<li>relay host: username.envs.net</li>
<li>relay port: 443</li>
<li>your relay supersecretpassword</li>
</ul>
</ul>
</ol>
</div>

View File

@ -33,23 +33,27 @@ an open network for secure, decentralized communication.
<pre>
schema:
&nbsp;&nbsp;<code>&lt;tag&gt;&lt;id&gt;:&lt;instance&gt;</code>
</pre>
<br />
<ul>
<li>user, which begin with tag <code>@</code></li>
<li>chat-rooms (channel), which begin with tag <code>#</code></li>
<li>communities (aka teams and groups), which begin with tag <code>+</code></li>
<li>user, which begin with tag <code>@</code></li>
<li>chat-rooms (channel), which begin with tag <code>#</code></li>
<li>communities (aka teams and groups), which begin with tag <code>+</code></li>
</ul>
example:
<br />
<pre>example:</pre>
<ul>
<li>user creme: <code>@creme:envs.net</code></li>
<li>envs room: <code>#envs:envs.net</code></li>
<li>envs group: <code>+envs:envs.net</code></li>
<li>user creme: <code>@creme:envs.net</code></li>
<li>envs room: <code>#envs:envs.net</code></li>
<li>envs group: <code>+envs:envs.net</code></li>
</ul>
<pre>
there's a convenient site, <a href="https://matrix.to" target="_blank">matrix.to</a>, which will
allow you to create urls linking to specific entities. when you visit these pages, you'll see links
to communicate with those entities. If you enter <code>+envs:envs.net</code> on <code>matrix.to</code>, you'll
get the URL <a href="https://matrix.to/#/+envs:envs.net" target="_blank">https://matrix.to/#/+envs:envs.net</a>.
</pre>
<br />
<h3>&#35; matrix client software</h3>
<pre>
@ -70,8 +74,7 @@ an extended client overview can be found at: <a href="https://matrix.org/clients
<div id="sidebar">
<div class="block">
<pre>
group
<pre>group
<code>+envs:envs.net</code>
channel

View File

@ -13,9 +13,9 @@ include 'header.php';
</div>
<div id="main" style="padding-bottom: 4em;">
<div class="block_head">
<div class="block">
<h1><em>code of conduct</em></h1>
<pre>
<pre class="bottom">
<strong>tl;dr</strong> learn by doing and helping. be excellent to each other. have fun!
</pre>
</div>
@ -33,8 +33,8 @@ positive experiences for everyone.
This applies to conversation in the any room in the matrix community (<a href="https://matrix.to/#/+envs:envs.net" target="_blank">+envs:envs.net</a>),
also in the irc channel (#evns) on irc.tilde.chat, commits and comments relating to any project in
<a href="https://github.com/envs-net" target="_blank">github</a>/<a href="https://git.envs.net/envs" target="_blank">gitea</a> spaces and as well as for any <a href="https://help.envs.net/#user-account-features" target="_blank">service</a> on envs.
</pre>
<br />
<h3 id="envs-mission">&#35; envs.net mission</h3>
<pre>
@ -45,36 +45,38 @@ profit-seeking, corporate-owned world of social media.
to that end, envs.net strives to be a radically inclusive community where people
of all backgrounds and all technological experience levels can come together to
learn, to teach, and to delight in one anothers creations.
</pre>
<br />
<h3 id="expected-behavior">&#35; expected behavior</h3>
<pre>
the following behaviors are expected and requested of all community members:
<ul>
<li>participate in an authentic and active way. in doing so, you contribute to
the health and longevity of this community.</li>
<li>exercise consideration and respect in your speech and actions.</li>
<li>attempt collaboration before conflict.</li>
<li>refrain from demeaning, discriminatory, or harassing behavior and speech.</li>
<li>be mindful of your surroundings and of your fellow participants.</li>
<li>teach when people need help. dont do it for them.</li>
</ul>
</pre>
<ul>
<li>participate in an authentic and active way. in doing so, you contribute to
the health and longevity of this community.</li>
<li>exercise consideration and respect in your speech and actions.</li>
<li>attempt collaboration before conflict.</li>
<li>refrain from demeaning, discriminatory, or harassing behavior and speech.</li>
<li>be mindful of your surroundings and of your fellow participants.</li>
<li>teach when people need help. dont do it for them.</li>
</ul>
<br />
<h3 id="unacceptable-behavior">&#35; unacceptable behavior</h3>
<pre>
the following behaviors are considered harassment and are unacceptable within our community:
<ul>
<li>violence, threats of violence or violent language directed against another person.</li>
<li>sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.</li>
<li>posting or displaying sexually explicit or violent material.</li>
<li>posting or threatening to post other peoples personally identifying information (“doxing”).</li>
<li>personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.</li>
<li>unwelcome sexual attention. this includes sexualized comments or jokes.</li>
<li>deliberate intimidation, stalking or following.</li>
</ul>
</pre>
<ul>
<li>violence, threats of violence or violent language directed against another person.</li>
<li>sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.</li>
<li>posting or displaying sexually explicit or violent material.</li>
<li>posting or threatening to post other peoples personally identifying information (“doxing”).</li>
<li>personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.</li>
<li>unwelcome sexual attention. this includes sexualized comments or jokes.</li>
<li>deliberate intimidation, stalking or following.</li>
</ul>
<br />
<h3 id="consequences-of-unacceptable-behavior">&#35; consequences of unacceptable behavior</h3>
<pre>
@ -85,54 +87,55 @@ if a community member engages in unacceptable behavior, the community organizers
may take any action they deem appropriate, up to and including a temporary ban
or permanent expulsion from envs.net without warning (meaning your account will
be terminated and all user data deleted).
</pre>
<br />
<h3 id="reporting-guidelines">&#35; reporting guidelines</h3>
<pre>
if you are subject to or witness unacceptable behavior, or have any other
concerns, please contact an admin (see info below).
additionally, help engaging with law enforcement is available.
</pre>
<br />
<h3 id="addressing-grievances">&#35; addressing grievances</h3>
<pre>
if you feel you have been falsely or unfairly accused of violating this code of conduct,
use the contact info below to send a concise description of your grievance.
</pre>
<br />
<h3 id="scope">&#35; scope</h3>
<pre>
we expect all envs.net members to abide by this code of conduct while:
<ul>
<li>engaging with other members</li>
<li>publishing content on envs.net</li>
</ul>
</pre>
<ul>
<li>engaging with other members</li>
<li>publishing content on envs.net</li>
</ul>
<br />
<h3 id="contact-info">&#35; contact info</h3>
<pre>
envs.net admins:
&gt; you can also send a mail to <a href="mailto:sudoers@envs.net">sudoers@envs.net</a> to make sure we all get it.
<ul>
<li><a href="https://envs.net/~creme/">~creme</a>:</li>
<ul class="sublist">
<li><a href="mailto:creme@envs.net">creme@envs.net</a></li>
<li>on irc <code>/query creme hello</code></li>
<li>on matrix <a href="https://matrix.envs.net/_matrix/client/#/user/@creme:envs.net" target="_blank"><code>@creme:envs.net</code></a></li>
</ul>
</ul>
</pre>
<ul>
<li><a href="https://envs.net/~creme/">~creme</a>:</li>
<ul class="sublist">
<li><a href="mailto:creme@envs.net">creme@envs.net</a></li>
<li>on irc <code>/query creme hello</code></li>
<li>on matrix <a href="https://matrix.envs.net/_matrix/client/#/user/@creme:envs.net" target="_blank"><code>@creme:envs.net</code></a></li>
</ul>
</ul>
<br />
<h3 id="license-and-attribution">&#35; license and attribution</h3>
<pre>
this code of conduct is based on <a href="http://citizencodeofconduct.org/" target="_blank">citizencodeofconduct.org</a> and <a href="http://tilde.town/wiki/conduct.html" target="_blank">tilde.town coc</a>
under the terms of the <a href="http://creativecommons.org/licenses/by-sa/3.0/" target="_blank">creative commons attribution-sharealike license</a>.
</pre>
<br />
<h3 id="tos">&#35; terms of service</h3>
<pre>
please also see the <a href="/tos/">terms of service</a>.

View File

@ -69,13 +69,17 @@ code {
}
pre {
margin-bottom: 1em;
margin-bottom: 0;
padding: 0;
}
pre.clean {
margin: 0;
padding: 0;
}
pre.bottom {
margin-bottom: 1em;
padding: 0;
}
pre.banner {
line-height: 1.2em;
margin-bottom: 1em;
@ -86,34 +90,29 @@ pre.banner {
h1, h2, h3, h4, h5, h6 {
display: block;
line-height: 0;
margin: 0.8em 0 0 0;
padding: 0 0 0.4em 0;
margin: 0;
padding: 0.8em 0 0.4em 0;
}
ol, ul {
margin: 1em 0 -2.2em 0;
padding: 0 0 0 2.5em;
}
ol.alert, ul.alert {
margin: 0 0 -2.5em 0;
padding: 0 0 0 2.5em;
margin: 0;
padding: 0 0 0.5em 2.5em;
}
.ol.sublist, ul.sublist {
margin: -1.5em 0 -1.5em 0;
margin: 0;
padding: 0 0 0 2.5em;
}
.ol.userlist, ul.userlist {
list-style-type: none;
margin: 0 0 -3.5em 0;
padding: 0 0 0 1em;
margin: 0;
padding: 1em 0 1em 1.2em;
}
li {
margin: -1.5em 0 0 0;
margin: 0 0 0 0;
padding: 0;
}
@ -206,12 +205,6 @@ button:hover {
margin: 0.8em 0 1em 0;
padding: 0.8em 0 0.8em 4em;
}
/* use when content starts with a headline */
.block_head {
border-left: solid 4px #e5e5e5;
margin: 0.8em 0 2em 0;
padding: 0.8em 0 0.8em 4em;
}
.button_back {
float: left;

View File

@ -95,7 +95,7 @@ follow us in the <a href="/chat">chat</a> and let's start talking.
<tr><td>conntracks:</td> <td><?=$conntracks?></td></tr>
</table>
<p></p>
<pre>
<pre class="bottom">
<em>more infos about the system and the installed packages can
you find on the <a href="/sysinfo/">sysinfo page</a>.</em>
</pre>
@ -179,7 +179,7 @@ you find on the <a href="/sysinfo/">sysinfo page</a>.</em>
<!-- USERS -->
<div class="block">
<pre>
<pre class="bottom">
<strong><i class="fa fa-users fa-fw" aria-hidden="true"></i> USERS</strong>
<small>online: <?=$online_users?> &#124; total: <?=$total_users?></small>
</pre>
@ -197,17 +197,15 @@ you find on the <a href="/sysinfo/">sysinfo page</a>.</em>
<p></p>
<details><summary class="menu">user list</summary><small>&gt; <a href="/users/">list all users</a></small>
<pre>
<ul class="userlist">
<?php
foreach ($user_info->data->users as $user => $value) {
if ($user_info->data->users->$user->website != '') {
echo "<li><a rel=\"$user\" target=\"_blank\" href=\"/~$user\">&#126;$user</a></li>\n";
echo "\t<li><a rel=\"$user\" target=\"_blank\" href=\"/~$user\">&#126;$user</a></li>\n";
}
}
?>
</ul>
</pre>
</details>
</div>
<!-- END USERS -->

View File

@ -21,8 +21,8 @@ include 'header.php';
<pre>
envs.net takes privacy seriously and, as such, remains committed
to being in compliance with the GDPR, which took effect may 25, 2018.
</pre>
<br />
<h3>&#35; what data do we collect from you?</h3>
<pre>
@ -31,21 +31,21 @@ you sign in to the system from in accordance with technical requirements.
we also store whatever data you create or maintain in your home directory
from your envs.net account.
</pre>
<br />
<h3>&#35; how long do we retain data?</h3>
<pre>
your email address is retained only long enough to process your account creation
and notify you of that completion. IPs are retained for a maximum of 30 days.
</pre>
<br />
<h3>&#35; how can i request a copy of my data?</h3>
<pre>
you can submit a request by email to <a href="mailto:sudoers@envs.net">sudoers&#64;envs.net</a>.
</pre>
<br />
<h3>&#35; how can i request removal of my information?</h3>
<pre>

View File

@ -126,11 +126,9 @@ please send an email to <a href="mailto:hostmaster@envs.net">hostmaster&#64;envs
?>
<div class="alert">
<h3><i class="fa fa-exclamation-triangle fa-fw" aria-hidden="true"></i> notice:</h3>
<pre>
<ul class="alert">
<?=$message?>
<ul>
<?=$message?>
</ul>
</pre>
</div>
<?php
}

View File

@ -21,20 +21,20 @@ include 'header.php';
<pre>
the following offences will result in a service ban.
here are some things that we don't allow:
<ul>
<li>anything illegal or harmful</li>
<li>promoting racial, ethnic, religious, political & other forms of bigotry</li>
<li>deliberately defacing the accounts of other users</li>
<li>deliberately trying to disrupt envs.net's server</li>
<li>using envs.net for disrupting other servers</li>
<li>using envs.net to impersonate other websites and businesses for criminal purposes</li>
<li>distributing pornography of any genre and medium (especially child pornography)</li>
<li>distributing content that defames any individual</li>
<li>outgoing net- and portscanning is prohibited on envs.net</li>
<li>hosting your backups</li>
<li>mining cryptocurrencies</li>
</ul>
</pre>
<ul>
<li>anything illegal or harmful</li>
<li>promoting racial, ethnic, religious, political & other forms of bigotry</li>
<li>deliberately defacing the accounts of other users</li>
<li>deliberately trying to disrupt envs.net's server</li>
<li>using envs.net for disrupting other servers</li>
<li>using envs.net to impersonate other websites and businesses for criminal purposes</li>
<li>distributing pornography of any genre and medium (especially child pornography)</li>
<li>distributing content that defames any individual</li>
<li>outgoing net- and portscanning is prohibited on envs.net</li>
<li>hosting your backups</li>
<li>mining cryptocurrencies</li>
</ul>
<div class="block">
<h1><em>resource usage</em></h1>
@ -44,12 +44,12 @@ here are some things that we don't allow:
<pre>
please make sure to not run anything that would disrupt other users.
there are a few limits set on your accounts:
<ul>
<li>200 process/threads at a time</li>
<li>soft 1024mb/hard 1536mb limit on storage</li>
<li>250mb limit on mailbox storage</li>
</ul>
</pre>
<ul>
<li>200 process/threads at a time</li>
<li>soft 1024mb/hard 1536mb limit on storage</li>
<li>250mb limit on mailbox storage</li>
</ul>
</div>
<?php include 'footer.php'; ?>

View File

@ -1,53 +1,49 @@
<?php
$title = "envs.net | users";
$desc = "envs.net | full user list";
$title = "envs.net | users";
$desc = "envs.net | full user list";
// json files
$user_info = json_decode(file_get_contents('/var/www/envs.net/users_info.json'));
// json files
$user_info = json_decode(file_get_contents('/var/www/envs.net/users_info.json'));
// users
$online_users = str_replace(PHP_EOL, '', shell_exec("online-users"));
$total_users = $user_info->data->info->user_count;
// users
$online_users = str_replace(PHP_EOL, '', shell_exec("online-users"));
$total_users = $user_info->data->info->user_count;
include 'header.php';
?>
<body id="body" class="dark-mode">
<div>
<body id="body" class="dark-mode">
<div>
<div class="button_back">
<pre class="clean"><strong><a href="/">&lt; back</a></strong></pre>
</div>
<div class="button_back">
<pre class="clean"><strong><a href="/">&lt; back</a></strong></pre>
</div>
<div id="main" style="padding-bottom: 2em;">
<div id="main" style="padding-bottom: 2em;">
<div class="block">
<h1><em>full user list</em></h1>
<pre>
<small>online: <?=$online_users?> &#124; total: <?=$total_users?></small>
</pre>
<pre><small>online: <?=$online_users?> &#124; total: <?=$total_users?></small></pre>
<table>
<tr><th class="tw20"></th> <th></th></tr>
<tr onclick="window.location='/users_info.json';">
<td><small><i class="fa fa-info-circle fa-fw" aria-hidden="true"></i></small></td> <td><small><a href="/users_info.json">users_info.json</a></small></td>
</tr>
<tr onclick="window.location='/user_updates/';">
<td><small><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i></small></td> <td><small><a href="/user_updates/">recently updates</a></small></td>
</tr>
<tr><th class="tw20"></th> <th></th></tr>
<tr onclick="window.location='/users_info.json';">
<td><small><i class="fa fa-info-circle fa-fw" aria-hidden="true"></i></small></td> <td><small><a href="/users_info.json">users_info.json</a></small></td>
</tr>
<tr onclick="window.location='/user_updates/';">
<td><small><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i></small></td> <td><small><a href="/user_updates/">recently updates</a></small></td>
</tr>
</table>
</div>
<p></p>
<pre>
here's a full list of users (including those who haven't updated their page from the default).
<pre>here's a full list of users (including those who haven't updated their page from the default).</pre>
<ul>
<?php
foreach ($user_info->data->users as $user => $value) {
echo "<li><a rel=\"$user\" target=\"_blank\" href=\"/~$user\">&#126;$user</a></li>\n";
}
foreach ($user_info->data->users as $user => $value) {
echo "\t<li><a rel=\"$user\" target=\"_blank\" href=\"/~$user\">&#126;$user</a></li>\n";
}
?>
</ul>
</pre>
</div>
</div>
<?php include 'footer.php'; ?>