Merge branch 'dev' of https://framagit.org/kostikov/core into dev

13 files changed, 258 insertions, 158 deletions

diff --git a/view/en/register_verify_member.tpl b/view/en/register_verify_member.tpl
index 5db51a2e2..926efbd11 100644
--- a/view/en/register_verify_member.tpl
+++ b/view/en/register_verify_member.tpl
@@ -10,15 +10,15 @@ Login with the password you chose at registration.
 
 We need to verify your email address in order to give you full access.
 
-Your validation code is
+Your validation token is
 
 {{$hash}}
 
-
-{{if $due}}{{$due}}{{/if}} 
-
+{{if $timeframe}}
+This token is valid from {{$timeframe.0}} UTC until {{$timeframe.1}} UTC
 
 
+{{/if}} 
 If you registered this account, please enter the validation code when requested or visit the following link:
 
 {{$siteurl}}/regate/{{$mail}}
@@ -26,11 +26,10 @@ If you registered this account, please enter the validation code when requested
 
 To deny the request and remove the account, please visit:
 
-
 {{$siteurl}}/regate/{{$mail}}{{if $ko}}/{{$ko}}{{/if}} 
 
 
-Thank you.
+Thank you!
 
 
 --
diff --git a/view/js/mod_register.js b/view/js/mod_register.js
index 1b61e2b3d..1fc5ad2fa 100644
--- a/view/js/mod_register.js
+++ b/view/js/mod_register.js
@@ -1,30 +1,44 @@
 $(document).ready(function() {
 
-	// set in Module
-	//typeof(window.tao) == 'undefined' ? window.tao = {} : '';
-	//tao.zar = { vsn: '2.0.0', form: {}, msg: {} };
-	//tao.zar.patano = /^d[0-9]{6}$/;
-	//tao.zar.patema = /^[a-z0-9.-]{2,64}@[a-z0-9.-]{4,32}\.[a-z]{2,12}$/;
+	typeof(window.tao) == 'undefined' ? window.tao = {} : '';
+	tao.zar = { vsn: '2.0.0', form: {}, msg: {} };
+	tao.zar.patano = /^d[0-9]{5,10}$/;
+	tao.zar.patema = /^[a-z0-9.-]{1,64}@[a-z0-9.-]{2,32}\.[a-z]{2,12}$/;
 
-	$('#zar014').click( function () { $('#zar015').toggle(); });
+	$('.register_date').each( function () {
+		var date = new Date($(this).data('utc'));
+		$(this).html(date.toLocaleString(undefined, {weekday: 'short', hour: 'numeric', minute: 'numeric'}));
+	});
+
+	$('#zar014').click( function () {
+		$('#zar015').toggle();
+	});
+
+	$('#id_invite_code').blur(function() {
+		if($('#id_invite_code').val() === '')
+			return;
+
+		$('#invite-spinner').show();
+		var zreg_invite = $('#id_invite_code').val();
+		$.get('register/invite_check.json?f=&invite_code=' + encodeURIComponent(zreg_invite),function(data) {
+			if(!data.error) {
+				$('#register-form input, #register-form button').removeAttr('disabled');
+				// email is always mandatory if using invite code
+				$('#help_email').removeClass('text-muted').addClass('text-danger').html(aStr['email_required']);
+			}
+			$('#invite-spinner').hide();
+		});
+	});
 
 	$('#id_email').change(function() {
 		tao.zar.form.email = $('#id_email').val();
-		if (tao.zar.patano.test(tao.zar.form.email) == true ) {
-			//ano
+
+		if (tao.zar.patema.test(tao.zar.form.email) == false ) {
+			$('#help_email').removeClass('text-muted').addClass('text-danger').html(aStr['email_not_valid']);
 		} else {
-			if (tao.zar.patema.test(tao.zar.form.email) == false ) {
-				$('#help_email').removeClass('text-muted').addClass('text-danger').html(tao.zar.msg.ZAR0239E);
-				zFormError('#help_email',true);
-			} else {
-				$.get('register/email_check.json?f=&email=' + encodeURIComponent(tao.zar.form.email), function(data) {
+			$.get('register/email_check.json?f=&email=' + encodeURIComponent(tao.zar.form.email), function(data) {
 				$('#help_email').removeClass('text-muted').addClass('text-danger').html(data.message);
-				zFormError('#help_email',data.error);
-				});
-			}
-		}
-		if ($('#id_email').val().length > 0) {
-			$('#newchannel-submit-button').removeAttr('disabled');
+			});
 		}
 	});
 
@@ -40,6 +54,7 @@ $(document).ready(function() {
 			$('#id_password2').val().length > 0 ? $('#id_password2').trigger('change') : '';
 		}
 	});
+
 	$('#id_password2').change(function() {
 		if($('#id_password').val() != $('#id_password2').val()) {
 			$('#help_password2').removeClass('text-muted').addClass('text-danger').html(aStr.pwnomatch);
@@ -53,7 +68,10 @@ $(document).ready(function() {
 	});
 
 	$('#id_name').blur(function() {
-		$('#name-spinner').show();
+		if($('#id_name').val() == '')
+			return;
+
+		$('#name-spinner').fadeIn();
 		var zreg_name = $('#id_name').val();
 		$.get('new_channel/autofill.json?f=&name=' + encodeURIComponent(zreg_name),function(data) {
 			$('#id_nickname').val(data);
@@ -61,11 +79,16 @@ $(document).ready(function() {
 				$('#help_name').html('');
 				zFormError('#help_name',data.error);
 			}
-			$('#name-spinner').hide();
+			$('#name-spinner').fadeOut();
 		});
 	});
+
 	$('#id_nickname').blur(function() {
-		$('#nick-spinner').show();
+		if($('#id_name').val() == '')
+			return;
+
+		$('#nick-spinner').fadeIn();
+		$('#nick-hub').fadeOut();
 		var zreg_nick = $('#id_nickname').val();
 		$.get('new_channel/checkaddr.json?f=&nick=' + encodeURIComponent(zreg_nick),function(data) {
 			$('#id_nickname').val(data);
@@ -73,13 +96,13 @@ $(document).ready(function() {
 				$('#help_nickname').html('');
 				zFormError('#help_nickname',data.error);
 			}
-			$('#nick-spinner').hide();
+			$('#nick-spinner').fadeOut();
+			$('#nick-hub').fadeIn();
 		});
 	});
 
-	//$("buttom[name='submit']").submit((function() {
 	$('#register-form').submit(function(e) {
-		if ( $('.zform-error').length > 0 ) {
+		if ($('.zform-error').length > 0) {
 			e.preventDefault();
 			return false;
 		}
diff --git a/view/pl/hmessages.mo b/view/pl/hmessages.mo
index b94d7683b..def287722 100644
--- a/view/pl/hmessages.mo
+++ b/view/pl/hmessages.mo
diff --git a/view/pl/hmessages.po b/view/pl/hmessages.po
index c62d465d0..c1484a3e8 100644
--- a/view/pl/hmessages.po
+++ b/view/pl/hmessages.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-04-04 00:39+0200\n"
-"PO-Revision-Date: 2021-04-05 16:20+0200\n"
+"PO-Revision-Date: 2021-04-16 16:25+0200\n"
 "Last-Translator: Andrzej Budziński <astabski@gmail.com>\n"
 "Language-Team: \n"
 "Language: pl\n"
@@ -5332,11 +5332,11 @@ msgstr "On"
 #: ../../Zotlabs/Module/Admin/Features.php:56
 #, php-format
 msgid "Lock feature %s"
-msgstr "Blokuj funkcję %s"
+msgstr "Blokuj możliwość %s"
 
 #: ../../Zotlabs/Module/Admin/Features.php:64
 msgid "Manage Additional Features"
-msgstr "Zarządzaj dodatkowymi funkcjami"
+msgstr "Zarządzaj dodatkowymi możliwościami"
 
 #: ../../Zotlabs/Module/Admin/Queue.php:35
 msgid "Queue Statistics"
@@ -6163,7 +6163,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Site.php:351
 msgid "Expiration period in days for imported (grid/network) content"
-msgstr "Okres ważności w dniach dla zaimportowanej treści (siatki/sieci)"
+msgstr "Okres ważności w dniach dla zaimportowanej treści (sieci)"
 
 #: ../../Zotlabs/Module/Admin/Site.php:351
 msgid "0 for no expiration of imported content"
@@ -8884,7 +8884,7 @@ msgstr "Zaproszenie"
 
 #: ../../Zotlabs/Lib/Apps.php:358 ../../Zotlabs/Widget/Admin.php:26
 msgid "Features"
-msgstr "Funkcje"
+msgstr "Możliwości"
 
 #: ../../Zotlabs/Lib/Apps.php:359
 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:69
@@ -10024,7 +10024,7 @@ msgstr "Admin"
 
 #: ../../Zotlabs/Widget/Admin.php:56
 msgid "Addon Features"
-msgstr "Funkcje dodatkowe"
+msgstr "Dodatkowe możliwości"
 
 #: ../../Zotlabs/Widget/Chatroom_list.php:20
 msgid "Overview"
@@ -11007,7 +11007,7 @@ msgstr "Udostępnij osobistą chmurę tagów na stronie swojego kanału"
 
 #: ../../include/features.php:124 ../../include/features.php:359
 msgid "Use blog/list mode"
-msgstr "Użyj trybu bloga/listy"
+msgstr "Użyj trybu blog/list"
 
 #: ../../include/features.php:125 ../../include/features.php:360
 msgid "Comments will be displayed separately"
@@ -11033,11 +11033,11 @@ msgstr "Reakcje emoji"
 
 #: ../../include/features.php:159
 msgid "Add emoji reaction ability to posts"
-msgstr "Dodaj możliwość reakcji emoji do wpisów"
+msgstr "Dodaje możliwość wstawiania reakcji emoji we wpisach"
 
 #: ../../include/features.php:166
 msgid "Dislike Posts"
-msgstr "Nielubienie wpisów"
+msgstr "Nielubienie wpisu"
 
 #: ../../include/features.php:167
 msgid "Ability to dislike posts/comments"
@@ -11045,7 +11045,7 @@ msgstr "Możliwość oznaczania wpisów i komentarzy jako nielubiane"
 
 #: ../../include/features.php:174
 msgid "Star Posts"
-msgstr "Wyróżnianie wpisów"
+msgstr "Wyróżnienie wpisu"
 
 #: ../../include/features.php:175
 msgid "Ability to mark special posts with a star indicator"
@@ -11088,8 +11088,8 @@ msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
 msgstr ""
-"Dołączaj duże miniatury zdjęć (1024px) do wpisów. Jeśli nie jest to "
-"włączone, będzie można używać małych miniatur (640 px)"
+"Możliwość zamieszczania dużych miniatur zdjęć (1024px) we wpisach. Jeśli nie "
+"jest to włączone, można używać tylko małych miniatur (640 px)"
 
 #: ../../include/features.php:227
 msgid "Even More Encryption"
@@ -11239,11 +11239,11 @@ msgstr "Profile zaawansowane"
 
 #: ../../include/features.php:388
 msgid "Additional profile sections and selections"
-msgstr "Dodatkowe sekcje profilu i pól wyborów"
+msgstr "Dodatkowe sekcje i pola wyboru profilu"
 
 #: ../../include/features.php:395
 msgid "Profile Import/Export"
-msgstr "Import/Export profilu"
+msgstr "Import/Eksport profilu"
 
 #: ../../include/features.php:396
 msgid "Save and load profile details across sites/channels"
@@ -13801,7 +13801,7 @@ msgstr "Narzędzia koszyka do zamówień i płatności"
 
 #: ../../extend/addon/hubzilla-addons/cart/cart.php:1545
 msgid "You must be logged into the Grid to shop."
-msgstr "Aby robić zakupy, musisz być zalogowany do Siatki."
+msgstr "Aby robić zakupy, musisz być zalogowany do sieci."
 
 #: ../../extend/addon/hubzilla-addons/cart/cart.php:1578
 #: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:409
@@ -16290,7 +16290,7 @@ msgid ""
 msgstr ""
 "Przykłady: &quot;aplikacje&quot;, &quot;sieć?f=&gid=37&quot; (kolekcja "
 "prywatności), &quot;kanał&quot; lub &quot;powiadomienie/system&quot; "
-"(pozostaw puste dla domyślnej stony sieci (siatki)."
+"(pozostaw puste dla domyślnej strony sieci."
 
 #: ../../extend/addon/hubzilla-addons/startpage/Mod_Startpage.php:70
 msgid "Startpage"
diff --git a/view/pl/hstrings.php b/view/pl/hstrings.php
index 0c1fd2cbd..ae6a4a447 100644
--- a/view/pl/hstrings.php
+++ b/view/pl/hstrings.php
@@ -1038,8 +1038,8 @@ App::$strings["Selected accounts will be deleted!\\n\\nEverything these accounts
 App::$strings["The account {0} will be deleted!\\n\\nEverything this account has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Konto {0} zostanie usuniete!\\n\\nWszystko co opublikowano z tego konta na tym serwisie zostanie bezpowrotnie usunięte!\\n\\nCzy na pewno usunąć?";
 App::$strings["Off"] = "Off";
 App::$strings["On"] = "On";
-App::$strings["Lock feature %s"] = "Blokuj funkcję %s";
-App::$strings["Manage Additional Features"] = "Zarządzaj dodatkowymi funkcjami";
+App::$strings["Lock feature %s"] = "Blokuj możliwość %s";
+App::$strings["Manage Additional Features"] = "Zarządzaj dodatkowymi możliwościami";
 App::$strings["Queue Statistics"] = "Statystyki kolejki";
 App::$strings["Total Entries"] = "Ogółem wpisów";
 App::$strings["Priority"] = "Priorytet";
@@ -1212,7 +1212,7 @@ App::$strings["Path to ImageMagick convert program"] = "Ścieżka do programu ko
 App::$strings["If set, use this program to generate photo thumbnails for huge images ( > 4000 pixels in either dimension), otherwise memory exhaustion may occur. Example: /usr/bin/convert"] = "Jeśli jest ustawiona, użyj tego programu do generowania miniatur zdjęć dla dużych obrazów (> 4000 pikseli w każdym wymiarze), w przeciwnym razie może wystąpić wyczerpanie pamięci. Przykład: /usr/bin/convert";
 App::$strings["Maximum Load Average"] = "Maksymalne średnie obciążenie";
 App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maksymalne obciążenie systemu przed odroczeniem procesów dostarczania i odpytywania - domyślnie 50.";
-App::$strings["Expiration period in days for imported (grid/network) content"] = "Okres ważności w dniach dla zaimportowanej treści (siatki/sieci)";
+App::$strings["Expiration period in days for imported (grid/network) content"] = "Okres ważności w dniach dla zaimportowanej treści (sieci)";
 App::$strings["0 for no expiration of imported content"] = "0 dla braku wygaśnięcia zaimportowanej treści";
 App::$strings["Do not expire any posts which have comments less than this many days ago"] = "Nie wygaszaj żadnych wpisów, które mają komentarze z datami mniejszymi niż ta wartość dni od teraz";
 App::$strings["Public servers: Optional landing (marketing) webpage for new registrants"] = "Serwery publiczne: opcjonalna strona lądowania (marketingowa) dla nowych rejestrujących";
@@ -1809,7 +1809,7 @@ App::$strings["Probe"] = "Sonda";
 App::$strings["Suggest"] = "Prpozycja";
 App::$strings["Random Channel"] = "Losowy kanał";
 App::$strings["Invite"] = "Zaproszenie";
-App::$strings["Features"] = "Funkcje";
+App::$strings["Features"] = "Możliwości";
 App::$strings["Language"] = "Język";
 App::$strings["Profile Photo"] = "Zdjęcie profilowe";
 App::$strings["Profiles"] = "Profile";
@@ -2063,7 +2063,7 @@ App::$strings["Member registrations waiting for confirmation"] = "Rejestracja cz
 App::$strings["Inspect queue"] = "Sprawdź kolejkę";
 App::$strings["DB updates"] = "Aktualizacje bazy danych";
 App::$strings["Admin"] = "Admin";
-App::$strings["Addon Features"] = "Funkcje dodatkowe";
+App::$strings["Addon Features"] = "Dodatkowe możliwości";
 App::$strings["Overview"] = "Przegląd";
 App::$strings["App Collections"] = "Kolekcja aplikacji";
 App::$strings["Installed apps"] = "Zainstalowane aplikacje";
@@ -2326,16 +2326,16 @@ App::$strings["Search by Date"] = "Wyszukaj po dacie";
 App::$strings["Ability to select posts by date ranges"] = "Możliwość wyboru wpisów według zakresów dat";
 App::$strings["Tag Cloud"] = "Chmura tagów";
 App::$strings["Provide a personal tag cloud on your channel page"] = "Udostępnij osobistą chmurę tagów na stronie swojego kanału";
-App::$strings["Use blog/list mode"] = "Użyj trybu bloga/listy";
+App::$strings["Use blog/list mode"] = "Użyj trybu blog/list";
 App::$strings["Comments will be displayed separately"] = "Komentarze będą wyświetlane osobno";
 App::$strings["Connection Filtering"] = "Filtrowanie połączeń";
 App::$strings["Filter incoming posts from connections based on keywords/content"] = "Filtruj przychodzące wpisy z połączeń, na podstawie słów kluczowych lub treści";
 App::$strings["Conversation"] = "Rozmowa";
 App::$strings["Emoji Reactions"] = "Reakcje emoji";
-App::$strings["Add emoji reaction ability to posts"] = "Dodaj możliwość reakcji emoji do wpisów";
-App::$strings["Dislike Posts"] = "Nielubienie wpisów";
+App::$strings["Add emoji reaction ability to posts"] = "Dodaje możliwość wstawiania reakcji emoji we wpisach";
+App::$strings["Dislike Posts"] = "Nielubienie wpisu";
 App::$strings["Ability to dislike posts/comments"] = "Możliwość oznaczania wpisów i komentarzy jako nielubiane";
-App::$strings["Star Posts"] = "Wyróżnianie wpisów";
+App::$strings["Star Posts"] = "Wyróżnienie wpisu";
 App::$strings["Ability to mark special posts with a star indicator"] = "Możliwość oznaczania wyróżnionych wpisów wskaźnikiem gwiazdki";
 App::$strings["Reply on comment"] = "Odpowiedanie na komentarze";
 App::$strings["Ability to reply on selected comment"] = "Możliwość udzielenia odpowiedzi na wybrany komentarz";
@@ -2345,7 +2345,7 @@ App::$strings["Editor"] = "Edytor";
 App::$strings["Post Categories"] = "Kategorie wpisów";
 App::$strings["Add categories to your posts"] = "Dodawanie kategori do swoich wpisów";
 App::$strings["Large Photos"] = "Duże zdjęcia";
-App::$strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Dołączaj duże miniatury zdjęć (1024px) do wpisów. Jeśli nie jest to włączone, będzie można używać małych miniatur (640 px)";
+App::$strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Możliwość zamieszczania dużych miniatur zdjęć (1024px) we wpisach. Jeśli nie jest to włączone, można używać tylko małych miniatur (640 px)";
 App::$strings["Even More Encryption"] = "Jeszcze więcej szyfrowania";
 App::$strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Zezwalaj na opcjonalne pełne (e2e) szyfrowanie treści  za pomocą wspólnego tajnego klucza";
 App::$strings["Disable Comments"] = "Wyłączanie komentarzy";
@@ -2378,8 +2378,8 @@ App::$strings["Ability to display only posts that you've interacted on"] = "Moż
 App::$strings["Photo Location"] = "Lokalizacja zdjęcia";
 App::$strings["If location data is available on uploaded photos, link this to a map."] = "Jeśli dane lokalizacji są dostępne na przesłanych zdjęciach, połącz je z mapą.";
 App::$strings["Advanced Profiles"] = "Profile zaawansowane";
-App::$strings["Additional profile sections and selections"] = "Dodatkowe sekcje profilu i pól wyborów";
-App::$strings["Profile Import/Export"] = "Import/Export profilu";
+App::$strings["Additional profile sections and selections"] = "Dodatkowe sekcje i pola wyboru profilu";
+App::$strings["Profile Import/Export"] = "Import/Eksport profilu";
 App::$strings["Save and load profile details across sites/channels"] = "Zapisz i wczytaj szczegóły profilu z różnych witryn i  kanałów";
 App::$strings["Multiple Profiles"] = "Wiele profili";
 App::$strings["Ability to create multiple profiles"] = "Możliwość tworzenia wielu profili";
@@ -3006,7 +3006,7 @@ App::$strings["Cart Settings"] = "Ustawienia koszyka";
 App::$strings["Shop"] = "Sklep";
 App::$strings["Order Not Found"] = "Nie znaleziono zamówienia";
 App::$strings["Cart utilities for orders and payments"] = "Narzędzia koszyka do zamówień i płatności";
-App::$strings["You must be logged into the Grid to shop."] = "Aby robić zakupy, musisz być zalogowany do Siatki.";
+App::$strings["You must be logged into the Grid to shop."] = "Aby robić zakupy, musisz być zalogowany do sieci.";
 App::$strings["Order not found."] = "Nie znaleziono zamówienia.";
 App::$strings["Access denied."] = "Dostęp zabroniony.";
 App::$strings["No Order Found"] = "Nie znaleziono zamówienia";
@@ -3542,7 +3542,7 @@ App::$strings["Fuzzy Location"] = "Zamazywanie Lokalizacji";
 App::$strings["Startpage App"] = "Aplikacja Strona początkowa";
 App::$strings["Set a preferred page to load on login from home page"] = "Ustaw preferowaną stronę do załadowania przy logowaniu ze strony głównej";
 App::$strings["Page to load after login"] = "Strona do załadowania po zalogowaniu";
-App::$strings["Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave blank for default network page (grid)."] = "Przykłady: &quot;aplikacje&quot;, &quot;sieć?f=&gid=37&quot; (kolekcja prywatności), &quot;kanał&quot; lub &quot;powiadomienie/system&quot; (pozostaw puste dla domyślnej stony sieci (siatki).";
+App::$strings["Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave blank for default network page (grid)."] = "Przykłady: &quot;aplikacje&quot;, &quot;sieć?f=&gid=37&quot; (kolekcja prywatności), &quot;kanał&quot; lub &quot;powiadomienie/system&quot; (pozostaw puste dla domyślnej strony sieci.";
 App::$strings["Startpage"] = "Strona początkowa";
 App::$strings["Focus (Hubzilla default)"] = "Fokus (domyślny w Hubzilla)";
 App::$strings["Theme settings"] = "Ustawienia motywu";
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 7e7f33d8e..5f469eb7b 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -780,7 +780,7 @@ div.jGrowl div.info {
 }
 #jGrowl.top-right {
 	top: 4.5rem;
-	right: 15px;
+	right: .25rem;
 }
 
 div.jGrowl div.jGrowl-notification {
@@ -1328,6 +1328,14 @@ img.mail-conv-sender-photo {
 	border-bottom: 3px solid $comment_item_colour;
 }
 
+.section-content-success-wrapper {
+	padding: 21px 10px;
+	color: #155724;
+	background-color: #d4edda;
+	border-bottom: 3px solid $comment_item_colour;
+	text-align: center;
+}
+
 .section-content-info-wrapper {
 	padding: 21px 10px;
 	color: #0c5460;
@@ -1351,7 +1359,8 @@ img.mail-conv-sender-photo {
 	border-bottom: 3px solid $comment_item_colour;
 	text-align: center;
 }
-
+.section-content-tools-wrapper .section-content-success-wrapper,
+.section-content-wrapper .section-content-success-wrapper,
 .section-content-tools-wrapper .section-content-info-wrapper,
 .section-content-wrapper .section-content-info-wrapper,
 .section-content-tools-wrapper .section-content-warning-wrapper,
diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl
index 9c78dbe54..490468e79 100644
--- a/view/tpl/admin_accounts.tpl
+++ b/view/tpl/admin_accounts.tpl
@@ -5,8 +5,8 @@
 		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
 
 		<h3>{{$h_pending}}</h3>
-		{{if $debug}}<div>{{$debug}}</div>{{/if}}
-		{{if $pending}}
+			{{if $debug}}<div>{{$debug}}</div>{{/if}}
+			{{if $pending}}
 			<table id="pending">
 				<thead>
 				<tr>
@@ -16,16 +16,13 @@
 				</tr>
 				</thead>
 				<tbody>
-			{{foreach $pending as $n => $u}}
-				<tr class="zebra zebra{{$u.reg_z}}">
-					<td class="created">{{$u.reg_created}}<br>{{$u.reg_n}}
-						</td>
-
-					<td class="status">{{$u.status}}</td>
-
-					<td class="created">{{$u.reg_startup}}<br>{{$u.reg_expires}}</td>
-					<td class="email">{{$u.reg_did2}}</td>
-					<td class="email">{{$u.reg_email}}<br>{{$u.reg_atip}}</td>
+				{{foreach $pending as $n => $u}}
+				<tr class="">
+					<td class="text-nowrap">{{$u.reg_created}}</td>
+					<td class="text-break">{{$u.reg_did2}}</td>
+					<td class="text-break">{{$u.reg_email}}</td>
+					<td class="">{{$u.reg_atip}}</td>
+					<td class="">{{$u.reg_atip_n}}</td>
 					<td class="checkbox_bulkedit"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$n}}" name="pending[]" value="{{$n}}"></td>
 					<td class="tools">
 						<a id="zara_{{$n}}" {{* href="{{$baseurl}}/regmod/allow/{{$n}}" *}} class="zar2s zara btn btn-default btn-xs" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
@@ -33,7 +30,10 @@
 						<span id="zarreax_{{$n}}" class="zarreax"></span>
 					</td>
 				</tr>
-			{{/foreach}}
+				<tr>
+					<td colspan="7"><strong>{{$msg}}:</strong> {{$u.msg}}</td>
+				</tr>
+				{{/foreach}}
 				</tbody>
 			</table>
 			{{* before, alternate:
@@ -43,12 +43,12 @@
 			*}}
 			<div class="selectall">
 				<a id="zar2sat" class="btn btn-sm btn-primary" href="javascript:;">{{$sel_tall}}</a>
-				<a id="zar2aas" class="zar2xas btn btn-sm btn-success" href="javascript:;"><i class="fa fa-check"></i> {{$sel_aprv}}</a> 
-				<a id="zar2das" class="zar2xas btn btn-sm btn-danger" href="javascript:;"><i class="fa fa-close"></i> {{$sel_deny}}</a> 
+				<a id="zar2aas" class="zar2xas btn btn-sm btn-success" href="javascript:;"><i class="fa fa-check"></i> {{$sel_aprv}}</a>
+				<a id="zar2das" class="zar2xas btn btn-sm btn-danger" href="javascript:;"><i class="fa fa-close"></i> {{$sel_deny}}</a>
 			</div>
-		{{else}}
+			{{else}}
 			<p>{{$no_pending}}</p>
-		{{/if}}
+			{{/if}}
 
 
 		<h3>{{$h_users}}</h3>
@@ -84,13 +84,13 @@
 				{{/foreach}}
 				</tbody>
 			</table>
-		
+
 			<div class="selectall"><a id="zarckbxtoggle" href="javascript:;">{{$select_all}}</a></div>
-		{{* 
+		{{*
 			<div class="selectall"><a href="#" onclick="return toggle_selectall('users_ckbx');">{{$select_all}}</a></div>
 		*}}
 			<div class="submit">
-                <input type="submit" name="page_accounts_block" class="btn btn-primary" value="{{$block}}/{{$unblock}}" /> 
+                <input type="submit" name="page_accounts_block" class="btn btn-primary" value="{{$block}}/{{$unblock}}" />
                 <input type="submit" name="page_accounts_delete" class="btn btn-primary" onclick="return confirm_delete_multi()" value="{{$delete}}" />
             </div>
 		{{else}}
@@ -98,7 +98,7 @@
 		{{/if}}
 	</form>
 </div>
-{{* 
+{{*
 	COMMENTS for this template:
 	hilmar, 2020.01
 	script placed at the end
@@ -119,17 +119,17 @@
   	tao.zar = { vsn: '2.0.0', c2s: {}, t: {} };
   	{{$tao}}
   	$('#adminpage').on( 'click', '#zar2sat', function() {
-		$('input.pending_ckbx:checkbox').each( function() { this.checked = ! this.checked; });		
+		$('input.pending_ckbx:checkbox').each( function() { this.checked = ! this.checked; });
   	});
   	$('#adminpage').on( 'click', '.zar2xas', function() {
   	 	tao.zar.c2s.x = $(this).attr('id').substr(4,1);
-		$('input.pending_ckbx:checkbox:checked').each( function() { 
-			//if (this.checked) 
+		$('input.pending_ckbx:checkbox:checked').each( function() {
+			//if (this.checked)
 			// take the underscore with to prevent numeric 0 headdage
 			tao.zar.c2s.n = $(this).attr('id').substr(10);
     		$('#zarreax'+tao.zar.c2s.n).html(tao.zar.zarax);
     		zarCSC();
-		});		
+		});
   	});
   	$('.zar2s').click( function() {
     	tao.zar.c2s.ix=$(this).attr('id');
@@ -142,12 +142,12 @@
 
   	function zarCSC() {
   		$.ajax({
-      		type: 'POST', url: 'admin/accounts', 
+      		type: 'POST', url: 'admin/accounts',
       		data: {
         		zarat: tao.zar.c2s.n,
         		zardo: tao.zar.c2s.x,
         		zarse: tao.zar.zarar[(tao.zar.c2s.n).substr(1)],
-        		form_security_token: $("input[name='form_security_token']").val() 
+        		form_security_token: $("input[name='form_security_token']").val()
       		}
     	}).done( function(r) {
       		tao.zar.r = JSON.parse(r);
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index b6fd2348d..5d51932eb 100644
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -36,7 +36,7 @@
 	{{** include file="field_checkbox.tpl" field=$register_wo_email **}}
 	{{include file="register_duty.tpl" field=$register_duty}}
 	{{include file="field_input.tpl" field=$register_perday}}
-	{{** include file="field_input.tpl" field=$register_sameip **}}
+	{{include file="field_input.tpl" field=$register_sameip}}
 	{{$reg_delay}}
 	{{$reg_expire}}
 	{{include file="field_checkbox.tpl" field=$reg_autochannel}}
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index 291d78fb2..8f05165f1 100644
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -69,8 +69,11 @@
 		'allday' : "{{$allday}}",
 
 		// mod cloud
+		'download_info' : "{{$download_info}}",
 
-		'download_info' : "{{$download_info}}"
+		// mod register
+		'email_not_valid' : "{{$email_not_valid}}",
+		'email_required' : "{{$email_required}}"
 
 	};
 
diff --git a/view/tpl/regate.tpl b/view/tpl/regate.tpl
index 04a9df1de..b9239ee46 100644
--- a/view/tpl/regate.tpl
+++ b/view/tpl/regate.tpl
@@ -1,27 +1,38 @@
-<h2>{{$title}}</h2>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		{{if $now}}
+		<div class="section-content-danger-wrapper">
+			<div class="h3">{{$now}}</div>
+		</div>
+		{{else}}
+		<div class="section-content-info-wrapper">
+			{{$desc}} {{$id}}
+			<div class="h3">{{$pin}}</div>
+		</div>
 
-<h3>{{$now}}</h3>
+		<form action="regate/{{$did2}}" method="post">
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+			{{include file="field_input.tpl" field=[$acpin.0,$acpin.1,"","","",$atform]}}
 
-<div class="descriptive-paragraph" style="font-size: 1.2em;"><p>{{$desc}}</p></div>
+			<div class="pull-right submit-wrapper">
+				<button type="submit" name="submit" class="btn btn-primary" {{$atform}}>{{$submit}}</button>
+			</div>
 
-<form action="regate/{{$did2}}" method="post">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-{{include file="field_input.tpl" field=[$acpin.0,$acpin.1,"","","",$atform]}}
+			{{if $resend}}
+			<div class="resend-email" >
+				<button type="submit" name="resend" class="btn btn-warning" {{$atform}}>{{$resend}}</button>
+			</div>
+			{{/if}}
 
-<div class="pull-right submit-wrapper">
-	<button type="submit" name="submit" class="btn btn-primary"{{$atform}}>{{$submit}}</button>
+		</form>
+		{{/if}}
+		<div class="clearfix"></div>
+	</div>
 </div>
-
-{{if $resend > ''}}
-<div class="resend-email" >
-	<button type="submit" name="resend" class="btn btn-warning"{{$atform}}>{{$resend}}</button>
-</div>
-{{/if}}
-
-</form>
-<div class="clear"></div>
 <script>
-	var week_days = ['Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'];
 	$('.register_date').each( function () {
 		var date = new Date($(this).data('utc'));
 		$(this).html(date.toLocaleString(undefined, {weekday: 'short', hour: 'numeric', minute: 'numeric'}));
diff --git a/view/tpl/regate_post.tpl b/view/tpl/regate_post.tpl
new file mode 100644
index 000000000..eccea9084
--- /dev/null
+++ b/view/tpl/regate_post.tpl
@@ -0,0 +1,16 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		<div class="section-content-success-wrapper">
+			<div class="h3"><i class="fa fa-check"></i> {{$strings.0}}</div>
+		</div>
+		<div class="section-content-warning-wrapper">
+			{{$strings.2}}
+		</div>
+		<div class="section-content-info-wrapper">
+			<div class="h3">{{$strings.1}} {{$id}}</div>
+		</div>
+	</div>
+</div>
diff --git a/view/tpl/regate_pre.tpl b/view/tpl/regate_pre.tpl
new file mode 100644
index 000000000..7596f6846
--- /dev/null
+++ b/view/tpl/regate_pre.tpl
@@ -0,0 +1,64 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		{{if $now}}
+		<div class="section-content-danger-wrapper">
+			<div class="h3">{{$now}}</div>
+		</div>
+		{{else}}
+		<div class="section-content-warning-wrapper">
+			{{$strings.0}}
+			<div id="countdown" class="h3"></div>
+		</div>
+		<div class="section-content-info-wrapper">
+			{{$strings.1}} {{$id}}
+			<div class="h3">{{$pin}}</div>
+		</div>
+		<div class="d-none">
+			{{$strings.2}}<br>
+			<span id="register_start" data-utc="{{$regdelay}}" class="register_date">
+				{{$regdelay}}
+			</span>
+			&nbsp;&dash;&nbsp; 
+			<span data-utc="{{$regexpire}}" class="register_date">
+				{{$regexpire}}
+			</span>
+		</div>
+		{{/if}}
+	</div>
+</div>
+
+<script>
+	$('.register_date').each( function () {
+		var date = new Date($(this).data('utc'));
+		$(this).html(date.toLocaleString(undefined, {weekday: 'short', hour: 'numeric', minute: 'numeric'}));
+	});
+
+	var date = '{{$countdown}}';
+	date = date !== '' ? date : $('#register_start').data('utc');
+
+	if(date) {
+		doCountDown(date, 'countdown');
+		var x = setInterval(doCountDown, 1000, date, 'countdown');
+	}
+
+	function doCountDown(date, id) {
+		var countDownDate = new Date(date).getTime();
+		var now = new Date().getTime();
+		var distance = countDownDate - now;
+		var days = Math.floor(distance / (1000 * 60 * 60 * 24));
+		var hours = Math.floor((distance % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+		var minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60));
+		var seconds = Math.floor((distance % (1000 * 60)) / 1000);
+
+		document.getElementById(id).innerHTML = days + "d " + hours + "h "+ minutes + "m " + seconds + "s ";
+
+		if (distance < 0) {
+			clearInterval(x);
+			document.getElementById(id).innerHTML = 'Reloading...';
+			window.location.reload();
+		}
+	}
+</script>
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index d6f70d118..8e1530eb4 100644
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -5,9 +5,13 @@
 	<div class="section-content-wrapper">
 		<form action="register" method="post" id="register-form">
 			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-			{{if $reg_is || $other_sites || $now || $msg}}
-			<div class="section-content-warning-wrapper">
+			{{if $now}}
+			<div class="section-content-danger-wrapper">
 				<div class="h3">{{$now}}</div>
+			</div>
+			{{/if}}
+			{{if $reg_is || $other_sites || $msg}}
+			<div class="section-content-warning-wrapper">
 				<div id="register-desc" class="descriptive-paragraph">{{$msg}}</div>
 				<div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div>
 				<div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div>
@@ -19,69 +23,40 @@
 			</div>
 			{{/if}}
 
-			{{if $auto_create}}
-			{{if $default_role}}
-			<input type="hidden" name="permissions_role" value="{{$default_role}}" />
-			{{else}}
-			<div class="section-content-info-wrapper">
-			{{$help_role}}
+			{{if $invitations}}
+			<a id="zar014" href="javascript:;" style="display: inline-block;">{{$haveivc}}</a>
+			<div id="zar015" style="display: none;">
+				<div class="position-relative">
+					<div id="invite-spinner" class="spinner-wrapper position-absolute" style="top: 2.5rem; right: 0.5rem;"><div class="spinner s"></div></div>
+					{{include file="field_input.tpl" field=[$invite_code.0,$invite_code.1,"","",""]}}
+				</div>
 			</div>
-			{{include file="field_select_grouped.tpl" field=$role}}
 			{{/if}}
 
+			{{if $auto_create}}
 			<div class="position-relative">
-				<div id="name-spinner" class="spinner-wrapper position-absolute" style="top: 2.5rem; right: 0.5rem;"><div class="spinner s"></div></div>
-				{{include file="field_input.tpl" field=[$name.0,$name.1,"","","",$atform]}}
+				<div id="name-spinner" class="spinner-wrapper position-absolute" style="top: 2.5rem; right: 0.75rem;"><div class="spinner s"></div></div>
+				{{include file="field_input.tpl" field=$name}}
 			</div>
 			<div class="position-relative">
-				<div id="nick-spinner" class="spinner-wrapper position-absolute" style="top: 2.5rem; right: 0.5rem;"><div class="spinner s"></div></div>
-				{{include file="field_input.tpl" field=[$nickname.0,$nickname.1,"","","",$atform]}}
+				<div id="nick-hub" class="position-absolute" style="top: 2.3rem; right: 0.75rem;"><span class="text-muted">{{$nickhub}}</span></div>
+				<div id="nick-spinner" class="spinner-wrapper position-absolute" style="top: 2.5rem; right: 0.75rem;"><div class="spinner s"></div></div>
+				{{include file="field_input.tpl" field=$nickname}}
 			</div>
 			{{/if}}
-
-			<div>
-			{{if $invitations}}
-				<a id="zar014" href="javascript:;" style="display: inline-block;">{{$haveivc}}</a>
-				<div id="zar015" style="display: none;">
-				{{include file="field_input.tpl" field=[$invite_code.0,$invite_code.1,"","",""]}}
-				</div>
-			{{/if}}
-
 			{{include file="field_input.tpl" field=$email}}
-			</div>
-
 			{{include file="field_password.tpl" field=$pass1}}
-
 			{{include file="field_password.tpl" field=$pass2}}
-
-
+			{{if $reg_is}}
+			{{include file="field_textarea.tpl" field=$register_msg}}
+			{{/if}}
 			{{if $enable_tos}}
-			{{include file="field_checkbox.tpl" field=[$tos.0,$tos.1,"","","",$atform]}}
+			{{include file="field_checkbox.tpl" field=$tos}}
 			{{else}}
 			<input type="hidden" name="tos" value="1" />
 			{{/if}}
-
 			<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}" {{$atform}}>{{$submit}}</button>
 			<div id="register-submit-end" class="register-field-end"></div>
 		</form>
 	</div>
 </div>
-{{* 
-	COMMENTS for this template:
-	hilmar, 2020.02
-*}}
-<script>
-	$('head').append(
-	  '<style> '+
- 	 '  .zuiqmid  { font-weight: normal; font-family: monospace; }'+
- 	 '  .zuirise  { font-weight: bold; font-size: 100%; color: red; }'+
-	  '</style>');
-
-	{{$tao}}
-
-	var week_days = ['Monday', 'Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'];
-	$('.register_date').each( function () {
-		var date = new Date($(this).data('utc'));
-		$(this).html(date.toLocaleString(undefined, {weekday: 'short', hour: 'numeric', minute: 'numeric'}));
-	});
-</script>