blabber.im - удалён. Добавлена рекомендация Conv6ations. Клиент для Windows был изменён на UWPX.

Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/fedi/pulls/29

LICENSE

@@ -1,3 +1,34 @@
+<<<<<<< HEAD
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
+
+    the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
+    moral rights retained by the original author(s) and/or performer(s);
+    publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
+    rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
+    rights protecting the extraction, dissemination, use and reuse of data in a Work;
+    database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
+    other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+    No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
+    Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
+    Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
+    Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
+
+=======
 
 No Copyright
 
@@ -13,3 +44,4 @@ Other Information
     When using or citing the work, you should not imply endorsement by the author or the affirmer.
 
 
+>>>>>>> a19e52fdda20a0ca982e320488476bb040014981

README.md

@@ -1,3 +1,8 @@
-# switching-remastered
+# Fedi.life
+Введение в федеративные сети для жертв Фкантактика и Faceboogle. Интерфейс упрощён, тексты нарезаны блоками. "Многабукаф" выведено на отдельную страницу. 
+
+# Тривиальные Технологии
+
+Сайт создаётся со стремленеим соответствовать Манифесту Тривиальных Технологий: https://phreedom.club/~tolstoevsky/tt/landing.html
+
 
-Адаптация под responsive design, тексты переписываются под обладателей клипового мышления.

coc.html

@@ -1,36 +1,87 @@
 <!DOCTYPE HTML>
 <html>
 
-        <head>
+
+        <head profile="https://fedi.life">
+        <link rel="icon" 
+              type="image/png" 
+              href="favicon.png" />
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>Устав Федерации</title>
+        <title>У вас всегда есть выбор! — Мессенджеры</title>
         <meta name="viewport" content="width=device-width, initial-scale=1">
-	<link rel="stylesheet" href="css/base.css">
-        <link rel="stylesheet" href="css/menu.css">
-        <link rel="stylesheet" href="css/popup.css">
-	<script src="js/popup.js"></script>
-	<script src="js/menu.js"></script>
-	</head>
-        <body>
-		<div class="topnav" id="rtopnav">
-		<a href="index.html">Главная</a>
-		<a href="mail.html">Почта</a>
-		<a href="im.html">Мессенджеры</a>
-		<a href="social.html">Соцсети</a>
-		<a href="search.html">Поисковики</a>
-		<div class="dropdown">
-		    <button class="dropbtn">Ещё
-		      <i class="fa fa-caret-down"></i>
-		    </button>
-		    <div class="dropdown-content">
-			<a href="extra.html" class="active">Документы и агитматериалы</a>
-			<a href="info.html">Подробнее</a>
-		    </div>
-		</div>
-		<a href="javascript:void(0);" style="font-size:15px;" class="icon" onclick="dropme()">☰</a>
-		</div>
-
+ <link rel="stylesheet" href="css/picnic.min.css">
+        <style>aside a.top {
+         font-size: 0;
+         position: fixed;
+         bottom: 0;
+         font-weight: bold;
+         width: 180px;
+         padding: .6em 0;
+         margin-bottom: 0;
+         border-radius: .3em .3em 0 0;
+         transition: all .3s ease;
+         }
+         aside a.top.visible {
+         font-size: 1em;
+         }
+         aside .links a.button {
+         text-align: left;
+         }
+         @media all and (max-width: 1000px) {
+         aside a.pseudo.top {
+         background: rgba(255, 255, 255, .8);
+         width: 100%;
+         left: 0;
+         text-align: center;
+         z-index: 100;
+         }
+         }
+         .documentation article > h2 {
+         margin: -2em 0 .6em;
+         padding: 3em 0 0;
+         line-height: 1;
+         }
+         .documentation article > h3 {
+         margin-bottom: .6em;
+         }
+         .documentation aside h2 {
+         margin-top: 0;
+         padding: 1.25em 0;
+         line-height: 1;
+         }
+         .documentation aside a.pseudo {
+         color: #0074D9;
+         margin: 0;
+         }
+         .documentation > section {
+         background: #fff;
+         text-align: left;
+         width: 90%;
+         max-width: 960px;
+         margin: 0 auto;
+         padding: 80px 0 0;
+         }
+         .documentation article > h1 {
+         margin: 0;
+         padding: 0.6em 0;
+         font-size: 2em;
+         line-height: 1.5;
+         }
+         .documentation aside a.button {
+         display: block;
+         }
+         .documentation pre[class*="language-"] {
+         margin-top: 10px;
+         margin-bottom: 40px;
+         }
+         .documentation .index pre {
+         margin: 0;
+         font-size: .9em;
+         }
+      </style>
+</head>
+<body>
 		<div class="textblock">
 			<h2>Рекомендованные практики для пользоваетелей</h2>
 			<p>
@@ -161,23 +212,12 @@
 
 		</div>
 
-<p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
-  <a rel="license"
-     href="http://creativecommons.org/publicdomain/zero/1.0/">
-    <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
-  </a>
-  <br />
-  To the extent possible under law,
-  <a rel="dct:publisher"
-     href="https://rawtext.club/~tolstoevsky">
-    <span property="dct:title">Tolstoevsky</span></a>
-  has waived all copyright and related or neighboring rights to
-  <span property="dct:title">Fedi Life</span>.
-This work is published from:
-<span property="vcard:Country" datatype="dct:ISO3166"
-      content="RU" about="https://rawtext.club/~tolstoevsky">
-  Russian Federation</span>.
-</p>
+	<section>
+	<hr>
+	<center>
+		<a href="https://phreedom.club/~tolstoevsky"><img src="images/ava-min.png" width=32px></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/~tolstoevsky/tt/landing.html">Trivial Technology</a> in mind.
+	</center>
+	</section>
 
 	</body>
 </html>

extra.html

@@ -88,14 +88,15 @@
           <input id="bmenub" type="checkbox" class="show">
           <label for="bmenub" class="burger pseudo button">меню</label>
 
-          <div class="menu">
-                <a href="mail.html" class="pseudo button">Почта</a>
-                <a href="im.html" class="pseudo button">Мессенджеры</a>
-                <a href="social.html" class="pseudo button">Соцсети</a>
-                <a href="search.html" class="pseudo button">Поиск</a>
-                <a href="extra.html" class="pseudo button">Допматериалы</a>
-                <a href="info.html" class="pseudo button">Подробнее</a>
-          </div>
+               <div class="menu">
+         <a href="im.html" class="pseudo button">Мессенджеры</a>
+         <a href="social.html" class="pseudo button">Соцсети</a>
+         <a href="mail.html" class="pseudo button">Почта</a>
+         <a href="search.html" class="pseudo button">Поиск</a>
+         <a href="extra.html" class="pseudo button">Допматериалы</a>
+         <a href="info.html" class="pseudo button">Подробнее</a>
+       </div>
+
         </nav>
 
         <main id="home" class="documentation">
@@ -162,9 +163,11 @@
 			<p>
 
 			<div>
-				<img src="images/thumb1.png" width=15% max-width=100% style="float:left;">
-				<img src="images/thumb2.png" width=15% max-width=100% style="float:left; margin:1%;">
-				<img src="images/transport.png" width=15% max-width=100% style="float:left; margin:1%;">
+				<a href="files/agit.zip">
+				<img alt="Скачать архив материалов" src="images/thumb1.png" width=15% max-width=100% style="float:left;">
+				<img  alt="Скачать архив материалов" src="images/thumb2.png" width=15% max-width=100% style="float:left; margin:1%;">
+				<img  alt="Скачать архив материалов" src="images/transport.png" width=15% max-width=100% style="float:left; margin:1%;">
+				</a>
 				Вы можете помочь распространению информации о свободных альтернативах централизованным сервисам,
                                 дав ссылку на этот сайт, либо распечатав и распространив листовки
                                 (не исключаем, что одна из них и привела вас сюда). Вливайтесь в ряды просветителей,
@@ -178,31 +181,12 @@
 	</article>
 </section>
 </main>
-        <section>
-        <hr>
-        <center>
-                <a href="https://rawtext.club/~tolstoevsky"><img src="banner.gif"></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>
-                <p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
-  <a rel="license"
-     href="http://creativecommons.org/publicdomain/zero/1.0/">
-    <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
-  </a>
-  <br />
-  To the extent possible under law,
-  <a rel="dct:publisher"
-     href="https://rawtext.club/~tolstoevsky">
-    <span property="dct:title">Tolstoevsky</span></a>
-  has waived all copyright and related or neighboring rights to
-  <span property="dct:title">Fedi Life</span>.
-This work is published from:
-<span property="vcard:Country" datatype="dct:ISO3166"
-      content="RU" about="https://rawtext.club/~tolstoevsky">
-  Russian Federation</span>.
-</p>
-        </center>
-        </section>
-	
-	
+	<section>
+	<hr>
+	<center>
+		<a href="https://phreedom.club/~tolstoevsky"><img src="images/ava-min.png" width=32px></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/~tolstoevsky/tt/landing.html">Trivial Technology</a> in mind.
+	</center>
+	</section>
 	</body>
 </html>
 

i/css/i.css

@@ -18,7 +18,7 @@ h3 {
 }
 
 a {
-	color: #1b8250;
+	color: #1863a1;
 }
 
 li {
@@ -31,16 +31,16 @@ li {
 }
 
 .btn-primary {
-	background: #43a047;
+	background: #ef6c00;
 	color: #f2f2f2;
 }
 .btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary {
-	background: #388e3c;
-	color: #000000;
+	background: #fb8c00;
+	color: #fff;
 	box-shadow: none;
 }
 .btn-primary:active, .btn-primary.active {
-	background: #2e7d32;
+	background: #ef6c00;
 	box-shadow: none;
 }
 .text-center {
@@ -50,3 +50,13 @@ li {
 	font-size: 0.9em;
 	color: #444;
 }
+.qrcode {
+	padding: 20px 5px 5px 5px;
+	width: 42.5%;
+	height: 100%;
+	margin: auto;
+}
+img {
+	width: 100%;
+	height: auto;
+}

i/index.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<html>
+<head>
   <meta charset="utf-8">
   <meta content="IE=edge" http-equiv="X-UA-Compatible">
   <meta content="width=device-width, initial-scale=1, user-scalable=0" name="viewport">
@@ -12,20 +12,20 @@
   <div class="main">
     <noscript><h3>Вам нужен JavaScript для принятия этого приглашения.</h3></noscript>
     <h3 class="text-center" id="heading"></h3>
-    <p class="text-center"><a class="btn btn-primary" id="button" href=""></a></p>
-    <input type="url" class="form-control text-center" id="url_in" readonly="readonly" value="">
+    <p class="text-center"><a class="btn btn-primary" id="button"></a></p>
+    <input type="url" class="form-control text-center" id="url_in" readonly/>
+    <div class="qrcode" id="qrcode"></div>
+
     <p class="hint text-center" id="clients"></p>
-    <p class="lead" id="recommend"></p>
+    <p class="lead text-center" id="recommend"></p>
 
-    <ul class="lead" id="client_list"></ul>
+    <p class="lead text-center" id="client_list"></p>
 
-    <p class="lead" id="checkfulllist"></p>
-    <a onclick=''><p class="lead" id="create" hidden></p></a>
-    <p class="lead" id="createhide" hidden></p>
-    <p class="hint" id="xmppis"></p>
+    <p class="lead text-center" id="checkfulllist"></p>
+    <p class="hint text-center" id="xmppis"></p>
   </div>
   <script src="js/i18n-text.js"></script>
   <script src="js/main.js"></script>
-
-
-</body></html>
+  <script src="js/qrcode.min.js"></script>
+</body>
+</html>

i/js/main.js

@@ -11,7 +11,7 @@
 	function show_clients(client_array) {
 		var list = document.getElementById('client_list');
 		for (var id = 0; id < client_array.length; id++) {
-			var item = document.createElement('li');
+			var item = document.createElement('p');
 			item.innerHTML = client_array[id];
 			list.appendChild(item);
 		}
@@ -52,12 +52,16 @@
 		}
 
 		// TODO: proper error checking / display / Creation of invitations
-		if (jid.search("@") <= 0) return {jid: jid, name: jid};
+		if (jid.search("@") <= 0) return {jid:jid, jid_encoded:jid, name: jid};
 
 		var name = jid.split("@")[0];
 		name = name.charAt(0).toUpperCase() + name.slice(1);
 
-		return {jid: jid, name: name};
+		var jid_parts = jid.split("?");
+		jid_parts[0] = encodeURIComponent(jid_parts[0]) // URL-encode the JID only
+		var jid_encoded = jid_parts.join("?");
+
+		return {jid: jid, jid_encoded: jid_encoded, name: name};
 	}
 
 	function translate_ui() {
@@ -68,18 +72,23 @@
 			document.getElementById(id).innerHTML = i18n.text(key_prefix + id, display_data);
 		});
 		// and agnostic
-		['clients', 'recommend', 'checkfulllist', 'xmppis', 'create', 'createhide'].forEach(function(id) {
+		['clients', 'recommend', 'checkfulllist', 'xmppis'].forEach(function(id) {
 			document.getElementById(id).innerHTML = i18n.text(id, display_data);
 		});
 	}
 
 	function rehash() {
 		display_data = load_hash();
-		document.getElementById('button').href = "xmpp:" + display_data.jid;
+		document.getElementById('button').href = "xmpp:" + display_data.jid_encoded;
 		document.getElementById('url_in').value = "xmpp:" + display_data.jid;
 		translate_ui();
 	}
 
+	function createQR() {
+		display_data = load_hash();
+		new QRCode(document.getElementById("qrcode"), "xmpp:" + display_data.jid);
+	}
+
 	function load_done() {
 		if (initialized) return;
 		initialized = true;
@@ -96,13 +105,15 @@
 			load_clients("json/clients_Android.json")
 		}
 		else if (navigator.userAgent.indexOf("Linux") >= 0)  {
-			load_clients("json/clients_Linux.json")
+			load_clients("json/clients_Linux.json");
+			createQR();
 		}
                 else if (navigator.userAgent.indexOf("iPhone") >= 0)  {
                         load_clients("json/clients_iOS.json")
                 }
 		else {
-			load_clients("json/clients_Windows.json")
+			load_clients("json/clients_Windows.json");
+			createQR();
 		}
 
 		window.addEventListener("hashchange", rehash, false);

i/json/clients_Android.json

@@ -1,4 +1,3 @@
 [
-    "<strong><a href=\"https://f-droid.org/repo/eu.sum7.conversations_399.apk\">Conv6ations</a></strong> - лучший на Android",
-    "Для удобства обновления приложения можно использовать строго безопасный каталог <strong><a href=\"https://f-droid.org/repo/eu.bubu1.fdroidclassic_1014.apk\">F-Droid</a></strong>"
+    "<a href=\"https://f-droid.org/repo/eu.sum7.conversations_42015.apk\"><img width=30% src=\"img/fdroid.png\"></a>"
 ]

i/json/clients_Windows.json

@@ -1,3 +1,3 @@
 [
-    "<strong><a href=\"https://conversejs.org/fullscreen.html\">ConverseJS</a></strong> - не требует установки"
+    "<strong><a href=\"https://github.com/UWPX/UWPX-Client/releases/download/v.0.35.1.0/UWPX-Installer.exe\">UWPX</a></strong> - практичный"
 ]

i/lang/ru.json

@@ -14,8 +14,7 @@
   "clients": "Чтобы это произошло, нужно использовать джаббер клиент.",
   "recommend": "Мы рекомендуем:",
   "checkfulllist": "Джаббер (XMPP) - это удобная и безопасная форма обмена сообщениями. Cвободный выбор клиента и сервера для связи со всеми.",
-  "xmppis": "Основано на <a href='https://i.kaidan.im/'>i.kaidan.im</a> / <a href='https://git.macaw.me/Tolstoevsky/switching/src/branch/master/i'>switching</a>",
+  "xmppis": "<a href='https://git.macaw.me/Tolstoevsky/fedi/src/branch/master/i'>Исходный код</a>",
   "create": "Хотите создать своё приглашение?",
-  "createhide": "t3st",
   "":""
 }

im.html

@@ -92,10 +92,11 @@
           <input id="bmenub" type="checkbox" class="show">
           <label for="bmenub" class="burger pseudo button">меню</label>
 
-               <div class="menu">
-         <a href="mail.html" class="pseudo button">Почта</a>
+  
+       <div class="menu">
          <a href="im.html" class="pseudo button">Мессенджеры</a>
          <a href="social.html" class="pseudo button">Соцсети</a>
+         <a href="mail.html" class="pseudo button">Почта</a>
          <a href="search.html" class="pseudo button">Поиск</a>
          <a href="extra.html" class="pseudo button">Допматериалы</a>
          <a href="info.html" class="pseudo button">Подробнее</a>
@@ -146,8 +147,9 @@
                                   <label class="pseudo button toggle" for="tab-2">Приложения</label>
 
                                         <div class="row">
-                                        <div><center><a class="button" href="https://xmpp.netwhood.online">Network Neighborhood</a></button>
-					<a class="button" href="https://blabber.im">Blabber</a></button>
+                                        <div><center><a class="button" href="https://404.city/">404.city</a>
+							<a class="button" href="https://www.shad0w.io/register.php">Shad0w</a>
+                    <a class="button" href="https://phreedom.club:5443/register/new">Phreedom club</a>
 
 					</center></div>
                                         <div><center><a class="button" href="https://conversejs.org/fullscreen.html">ConverseJS</a></button>
@@ -226,30 +228,12 @@
         </article>
 </section>
 </main>
-        <section>
-        <hr>
-        <center>
-                <a href="https://rawtext.club/~tolstoevsky"><img src="banner.gif"></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>
-                <p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
-  <a rel="license"
-     href="http://creativecommons.org/publicdomain/zero/1.0/">
-    <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
-  </a>
-  <br />
-  To the extent possible under law,
-  <a rel="dct:publisher"
-     href="https://rawtext.club/~tolstoevsky">
-    <span property="dct:title">Tolstoevsky</span></a>
-  has waived all copyright and related or neighboring rights to
-  <span property="dct:title">Fedi Life</span>.
-This work is published from:
-<span property="vcard:Country" datatype="dct:ISO3166"
-      content="RU" about="https://rawtext.club/~tolstoevsky">
-  Russian Federation</span>.
-</p>
-        </center>
-        </section>
-
+	<section>
+	<hr>
+	<center>
+		<a href="https://phreedom.club/~tolstoevsky"><img src="images/ava-min.png" width=32px></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/~tolstoevsky/tt/landing.html">Trivial Technology</a> in mind.
+	</center>
+	</section>
 	</body>
 </html>
 				

index.html

@@ -95,9 +95,9 @@
 	  <label for="bmenub" class="burger pseudo button">меню</label>
 
 	  <div class="menu">
-		<a href="mail.html" class="pseudo button">Почта</a>
-		<a href="im.html" class="pseudo button">Мессенджеры</a>
+    	<a href="im.html" class="pseudo button">Мессенджеры</a>
 		<a href="social.html" class="pseudo button">Соцсети</a>
+		<a href="mail.html" class="pseudo button">Почта</a>
 		<a href="search.html" class="pseudo button">Поиск</a>
 		<a href="extra.html" class="pseudo button">Допматериалы</a>
 		<a href="info.html" class="pseudo button">Подробнее</a>
@@ -151,7 +151,7 @@
 
 			<header>Ну ладно. Что дальше?</header>
 			<p>Просто попробуйте свободную альтернативу</p>
-			<p>Все неэтичные сервисы, работющие против вас, можно легко заменить на свободные аналоги, которые зачастую намного удобнее и функциональнее. Ознакомьтесь с примерами ниже.</p>
+			<p>Все неэтичные сервисы, работающие против вас, можно легко заменить на свободные аналоги, которые зачастую намного удобнее и функциональнее. Ознакомьтесь с примерами ниже.</p>
 		</article>
 			<article class="card four-fifth-1000">
 			<header>Twitter</header>
@@ -222,24 +222,7 @@
 	<section>
 	<hr>
 	<center>
-		<a href="https://rawtext.club/~tolstoevsky"><img src="banner.gif"></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a> 
-        <p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
-  <a rel="license"
-     href="http://creativecommons.org/publicdomain/zero/1.0/">
-    <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
-  </a>
-  <br />
-  To the extent possible under law,
-  <a rel="dct:publisher"
-     href="https://rawtext.club/~tolstoevsky">
-    <span property="dct:title">Tolstoevsky</span></a>
-  has waived all copyright and related or neighboring rights to
-  <span property="dct:title">Fedi Life</span>.
-This work is published from:
-<span property="vcard:Country" datatype="dct:ISO3166"
-      content="RU" about="https://rawtext.club/~tolstoevsky">
-  Russian Federation</span>.
-</p>
+		<a href="https://phreedom.club/~tolstoevsky"><img src="images/ava-min.png" width=32px></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/~tolstoevsky/tt/landing.html">Trivial Technology</a> in mind.
 	</center>
 	</section>
 	</body>

info.html

@@ -107,14 +107,15 @@
           <input id="bmenub" type="checkbox" class="show">
           <label for="bmenub" class="burger pseudo button">меню</label>
 
-             <div class="menu">
-         <a href="mail.html" class="pseudo button">Почта</a>
+       <div class="menu">
          <a href="im.html" class="pseudo button">Мессенджеры</a>
          <a href="social.html" class="pseudo button">Соцсети</a>
+         <a href="mail.html" class="pseudo button">Почта</a>
          <a href="search.html" class="pseudo button">Поиск</a>
          <a href="extra.html" class="pseudo button">Допматериалы</a>
          <a href="info.html" class="pseudo button">Подробнее</a>
        </div>
+          
 
         </nav>
 
@@ -241,39 +242,21 @@
                                             Вливайтесь!
                                         </p>
 
-					<h3>И немного истории:</h3>
+					<h3>И немного документалистики:</h3>
 <div class="wrap-element">
-<iframe class="wrapped-iframe" sandbox="allow-same-origin allow-scripts" src="https://open.tube/videos/embed/f3b7659c-6352-4e65-82fd-7a4125c9dfbf" frameborder="0" allowfullscreen></iframe>
+<iframe class="wrapped-iframe" sandbox="allow-same-origin allow-scripts" src="https://v.phreedom.club/videos/watch/57ab6e06-0634-41f1-93ec-b1eeacfc4019" frameborder="0" allowfullscreen></iframe>
 </div>
 	</span>
 	</article>
         </article>
 </section>
 </main>
-        <section>
-        <hr>
-        <center>
-                <a href="https://rawtext.club/~tolstoevsky"><img src="banner.gif"></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>
-                <p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
-  <a rel="license"
-     href="http://creativecommons.org/publicdomain/zero/1.0/">
-    <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
-  </a>
-  <br />
-  To the extent possible under law,
-  <a rel="dct:publisher"
-     href="https://rawtext.club/~tolstoevsky">
-    <span property="dct:title">Tolstoevsky</span></a>
-  has waived all copyright and related or neighboring rights to
-  <span property="dct:title">Fedi Life</span>.
-This work is published from:
-<span property="vcard:Country" datatype="dct:ISO3166"
-      content="RU" about="https://rawtext.club/~tolstoevsky">
-  Russian Federation</span>.
-</p>
-        </center>
-        </section>
-			
+	<section>
+	<hr>
+	<center>
+		<a href="https://phreedom.club/~tolstoevsky"><img src="images/ava-min.png" width=32px></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/~tolstoevsky/tt/landing.html">Trivial Technology</a> in mind.
+	</center>
+	</section>
 
 
 	</body>

mail.html

@@ -92,15 +92,15 @@
           <input id="bmenub" type="checkbox" class="show">
           <label for="bmenub" class="burger pseudo button">меню</label>
 
-                   <div class="menu">
-         <a href="mail.html" class="pseudo button">Почта</a>
+       <div class="menu">
          <a href="im.html" class="pseudo button">Мессенджеры</a>
          <a href="social.html" class="pseudo button">Соцсети</a>
+         <a href="mail.html" class="pseudo button">Почта</a>
          <a href="search.html" class="pseudo button">Поиск</a>
          <a href="extra.html" class="pseudo button">Допматериалы</a>
          <a href="info.html" class="pseudo button">Подробнее</a>
        </div>
-
+          
         </nav>
 
         <main id="home" class="documentation">
@@ -151,9 +151,9 @@
 				</center>
 
 	</article>
- <article class="card four-fifth-1000">
-        <header>Tutanota</header>
-          <center><label for="modal_tn"><img src="images/tutanota_w.png" width="80%"></label> </center>
+<article class="card four-fifth-1000">
+        <header>Disroot</header>
+          <center><label for="modal_tn"><img src="images/disroot.png" width="80%"></label> </center>
                                 <div class="modal">
                                   <input id="modal_tn" type="checkbox" />
                                   <label for="modal_tn" class="overlay"></label>
@@ -163,46 +163,36 @@
                                         <label for="modal_tn" class="close">&times;</label>
                                     </header>
                                         <section class="content">
-                                        <img src="images/tutanota_w.png" width="100%">
+                                        <img src="images/disroot.png" width="100%">
                                         </section>
                                    </article>
                                 </div>
 	
 
 				<span>
-					Сервис, расположенный в Германии, без рекламы и с фокусом на приватность.
-					Позволяет надёжно шифровать даже сообщения, отправляемые пользователям других сервисов,
-					и пользователям, не умеющим настраивать шифрование.
-					Базовая учётная запись бесплатна, за деньги можно получить больше места и возможностей.<br>
-                                        
+                Сервис категории "всё в одном", существующий на пожертвования пользователей. Серверы расположены в Нидерландах. Собирает минимально необходимое для работы количество данных. Помимо почты предоставляет множество других сервисов — поисковик, мессенджер, сервер соцсети Diaspora, облачное хранилище и другие. Замеченный минус — для регистрации нужно уже иметь почтовый ящик в другом месте (подойдут, впрочем, и временные).
 				</span>
 				<center>
 				<div class="tabs two">
                                   <input id='tab-11' type='radio' name='tabgroupC' checked />
                                   <label class="pseudo button toggle" for="tab-11">Где зарегистрироваться</label>
                                   <input id='tab-21' type='radio' name='tabgroupC'>
-                                  <label class="pseudo button toggle" for="tab-21">Мобильные приложения</label>
+                                  <label class="pseudo button toggle" for="tab-21">Приложения</label>
 					<div class="row">
 					<div>
 					<center>
-						<a class="button" href="https://tutanota.com">Tutanota</a>
+						<a class="button" href="https://user.disroot.org/pwm/public/newuser/">Disroot</a>
 					</center>
 					</div>
-					<div><center>
-						<button class="pseudo">
-                                        <a href="https://play.google.com/store/apps/details?id=de.tutao.tutanota"><img src="images/google.png">Tutanota</a>
-						</button>
-						 <button class="pseudo">
-                                        <a href="https://f-droid.org/en/packages/de.tutao.tutanota/"><img class="logo" src="images/fdroid.png">Tutanota</a>
-						</button>
-						  <button class="pseudo">
-                                        <a href="https://itunes.apple.com/app/tutanota/id922429609"><IMG src="images/apple.png" width="24" height="24">Tutanota</a>
-						</button>
-					</center></div>
+                    <div><center>Любое приложение электронной почты, включая встроенные                                      
+                    </div>
+                    </center>
+
+
 					</div>
 				</div>
 				</center>
-			</article>
+</article> -->
 		 <article class="card four-fifth-1000">
 	          <header>Posteo</header>
           <center><label for="modal_po"><img src="images/posteo.jpg" width="80%"></label> </center>
@@ -279,30 +269,12 @@
 	</article>
 </section>
 </main>		
-        <section>
-        <hr>
-        <center>
-                <a href="https://rawtext.club/~tolstoevsky"><img src="banner.gif"></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>
-                <p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
-  <a rel="license"
-     href="http://creativecommons.org/publicdomain/zero/1.0/">
-    <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
-  </a>
-  <br />
-  To the extent possible under law,
-  <a rel="dct:publisher"
-     href="https://rawtext.club/~tolstoevsky">
-    <span property="dct:title">Tolstoevsky</span></a>
-  has waived all copyright and related or neighboring rights to
-  <span property="dct:title">Fedi Life</span>.
-This work is published from:
-<span property="vcard:Country" datatype="dct:ISO3166"
-      content="RU" about="https://rawtext.club/~tolstoevsky">
-  Russian Federation</span>.
-</p>
-        </center>
-        </section>
-
+ 	<section>
+ 	<hr>
+ 	<center>
+ 		<a href="https://phreedom.club/~tolstoevsky"><img src="images/ava-min.png" width=32px></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/~tolstoevsky/tt/landing.html">Trivial Technology</a> in mind.
+ 	</center>
+ 	</section>
 	</body>
 </html>
 

search.html

@@ -95,15 +95,15 @@
           <input id="bmenub" type="checkbox" class="show">
           <label for="bmenub" class="burger pseudo button">меню</label>
 
-               <div class="menu">
-         <a href="mail.html" class="pseudo button">Почта</a>
+       <div class="menu">
          <a href="im.html" class="pseudo button">Мессенджеры</a>
          <a href="social.html" class="pseudo button">Соцсети</a>
+         <a href="mail.html" class="pseudo button">Почта</a>
          <a href="search.html" class="pseudo button">Поиск</a>
          <a href="extra.html" class="pseudo button">Допматериалы</a>
          <a href="info.html" class="pseudo button">Подробнее</a>
        </div>
- 
+
         </nav>
 
         <main id="home" class="documentation">
@@ -119,7 +119,7 @@
 			получаемая вами информация в этих поисковых системах ограничена исключительно той, которую,
 			<b>по мнению поисковика</b> вы предпочтёте увидеть. Ваше личное мнение никого не волнует — как раз наоборот,
 			формируя поисковую выдачу должным образом, на ваше мнение очень легко повлиять. Таким образом, 
-			иснтрументы, создававшиеся для облегчения доступа к информации, превратились в инструменты
+			инструменты, создававшиеся для облегчения доступа к информации, превратились в инструменты
 			зомбирования и манипуляции. Ну и не забывайте о вездесущей рекламе, порой залезающей в весьма интимные
 			сферы вашей жизни.
 			</p>
@@ -169,7 +169,7 @@
 				желающему поднять свой поисковый сервер. Обычный же пользователь может выбрать из множества уже существующих.
 				Например, этих:
 				<ul>
-				<li><a href="https://a.searx.space/">a.searx.space</a></li>
+				<li><a href="https://search.fedi.life/">search.fedi.life</a></li>
 				<li><a href="https://searx.info">searx.info</a></li>
 				<li><a class="Button" href="https://searx.be">searx.be</a></li>
 				</ul>
@@ -264,30 +264,12 @@
 
 </section>
 </main>
-        <section>
-        <hr>
-        <center>
-                <a href="https://rawtext.club/~tolstoevsky"><img src="banner.gif"></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>
-                <p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
-  <a rel="license"
-     href="http://creativecommons.org/publicdomain/zero/1.0/">
-    <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
-  </a>
-  <br />
-  To the extent possible under law,
-  <a rel="dct:publisher"
-     href="https://rawtext.club/~tolstoevsky">
-    <span property="dct:title">Tolstoevsky</span></a>
-  has waived all copyright and related or neighboring rights to
-  <span property="dct:title">Fedi Life</span>.
-This work is published from:
-<span property="vcard:Country" datatype="dct:ISO3166"
-      content="RU" about="https://rawtext.club/~tolstoevsky">
-  Russian Federation</span>.
-</p>
-        </center>
-        </section>
-
+	<section>
+	<hr>
+	<center>
+		<a href="https://phreedom.club/~tolstoevsky"><img src="images/ava-min.png" width=32px></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/~tolstoevsky/tt/landing.html">Trivial Technology</a> in mind.
+	</center>
+	</section>
 
 	</body>
 </html>

social.html

@@ -94,11 +94,10 @@
           <!-- responsive-->
           <input id="bmenub" type="checkbox" class="show">
           <label for="bmenub" class="burger pseudo button">menu</label>
-
        <div class="menu">
-         <a href="mail.html" class="pseudo button">Почта</a>
          <a href="im.html" class="pseudo button">Мессенджеры</a>
          <a href="social.html" class="pseudo button">Соцсети</a>
+         <a href="mail.html" class="pseudo button">Почта</a>
          <a href="search.html" class="pseudo button">Поиск</a>
          <a href="extra.html" class="pseudo button">Допматериалы</a>
          <a href="info.html" class="pseudo button">Подробнее</a>
@@ -157,8 +156,9 @@
                                         <div class="row">
                                         <div><center>
                                         <a class="button" href="https://mastodon.ml">Русский Мастодон</a></button>
-                                        <a class="button" href="https://quey.org">Quey</a></button>
-                                        <a class="button" href="https://lor.sh">LOR.sh</a></button>
+                              
+                                        <a class="button" href="https://zhub.link">zhub.link</a></button>
+                                        <a class="button" href="https://social.inex.rocks">Inex</a></button>
                                        <a class="button" href="https://mstdn.netwhood.online/">Network Neighborhood</a></button>
 
                                         </center></div>
@@ -277,9 +277,8 @@
 
                                         <div class="row">
                                         <div><center>
-                                        <a class="button" href="https://pxlfd.me">pxlfd.me</a></button>
-                                        <a class="button" href="https://pixelfed.tokyo">Tokyo</a></button>
-                                        <a class="button" href="https://pixelfed.se">Pixelfed.se</a></button>
+                                        <a class="button" href="https://beta.joinpixelfed.org/?openRegistration=true&albumSizeRange=3">Подбор сервера для регистрации</a></button>
+                                        
 
                                         </center></div>
                                         <div><center><a class="button" href="https://play.google.com/store/apps/details?id=app.fedilab.android"><img src="images/google.png">Fedilab (платно)</a></button><br>
@@ -338,10 +337,8 @@
 
                                         <div class="row">
                                         <div><center><a class="button" href="https://video.qoto.org">QOTO Peertube</a></button>
-                                        <a class="button" href="https://video.tedomum.net">video.tedomum.net</a></button>
                                         <a class="button" href="https://peertube.linuxrocks.online">peertube.linuxrocks.online</a></button>
-                                        <a class="button" href="https://share.tube">share.tube</a></button>
-
+                                        <a class="button" href="https://joinpeertube.org/instances#instances-list">Выбрать сервер для регистрации</a></button>
                                         </center></div>
                                         <div><center>
                                         <div><center><a class="button" href="https://play.google.com/store/apps/details?id=app.fedilab.
@@ -360,30 +357,12 @@ android"><img src="images/google.png">Fedilab (платно)</a></button><br>
         </article>
 </section>
 </main>
-        <section>
-        <hr>
-        <center>
-                <a href="https://rawtext.club/~tolstoevsky"><img src="banner.gif"></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>
-                <p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
-  <a rel="license"
-     href="http://creativecommons.org/publicdomain/zero/1.0/">
-    <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
-  </a>
-  <br />
-  To the extent possible under law,
-  <a rel="dct:publisher"
-     href="https://rawtext.club/~tolstoevsky">
-    <span property="dct:title">Tolstoevsky</span></a>
-  has waived all copyright and related or neighboring rights to
-  <span property="dct:title">Fedi Life</span>.
-This work is published from:
-<span property="vcard:Country" datatype="dct:ISO3166"
-      content="RU" about="https://rawtext.club/~tolstoevsky">
-  Russian Federation</span>.
-</p>
-        </center>
-        </section>
-
+ 	<section>
+ 	<hr>
+ 	<center>
+ 		<a href="https://phreedom.club/~tolstoevsky"><img src="images/ava-min.png" width=32px></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/~tolstoevsky/tt/landing.html">Trivial Technology</a> in mind.
+ 	</center>
+ 	</section>
 	</body>
 </html>