Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

9 files changed, 12 insertions, 11 deletions

diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php
index 50756c654..60cb39277 100644
--- a/Zotlabs/Module/Admin/Site.php
+++ b/Zotlabs/Module/Admin/Site.php
@@ -29,7 +29,7 @@ class Site {
 		$maximagesize		=	((x($_POST,'maximagesize'))		? intval(trim($_POST['maximagesize']))				:  0);
 
 		$register_policy	=	((x($_POST,'register_policy'))	? intval(trim($_POST['register_policy']))	:  0);
-
+		$minimum_age           = ((x($_POST,'minimum_age'))          ? intval(trim($_POST['minimum_age']))    : 13);
 		$access_policy	=	((x($_POST,'access_policy'))	? intval(trim($_POST['access_policy']))	:  0);
 		$invite_only	= ((x($_POST,'invite_only'))		? True	: False);
 		$abandon_days	=	((x($_POST,'abandon_days'))	    ? intval(trim($_POST['abandon_days']))	    :  0);
@@ -127,6 +127,7 @@ class Site {
 		set_config('system','maximagesize', $maximagesize);
 
 		set_config('system','register_policy', $register_policy);
+		set_config('system','minimum_age', $minimum_age);
 		set_config('system','invitation_only', $invite_only);
 		set_config('system','access_policy', $access_policy);
 		set_config('system','account_abandon_days', $abandon_days);
@@ -303,6 +304,7 @@ class Site {
 			'$maximagesize'		=> array('maximagesize', t("Maximum image size"), intval(get_config('system','maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
 			'$register_policy'	=> array('register_policy', t("Does this site allow new member registration?"), get_config('system','register_policy'), "", $register_choices),
 			'$invite_only'		=> array('invite_only', t("Invitation only"), get_config('system','invitation_only'), t("Only allow new member registrations with an invitation code. Above register policy must be set to Yes.")),
+			'$minimum_age'		=> array('minimum_age', t("Minimum age"), (x(get_config('system','minimum_age'))?get_config('system','minimum_age'):13), t("Minimum age (in years) for who may register on this site.")),
 			'$access_policy'	=> array('access_policy', t("Which best describes the types of account offered by this hub?"), get_config('system','access_policy'), "This is displayed on the public server site list.", $access_choices),
 			'$register_text'	=> array('register_text', t("Register text"), htmlspecialchars(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")),
 			'$frontpage'	=> array('frontpage', t("Site homepage to show visitors (default: login box)"), get_config('system','frontpage'), t("example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file.")),
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index e0511b0d3..8288886cd 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -866,7 +866,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 			$o .= replace_macros($tpl, [
 				'$header'         => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])),
 				'$autoperms'      => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no),
-				'$permcat'        => [ 'permcat', t('Permission role'), '', '',$permcats ],
+				'$permcat'        => [ 'permcat', t('Permission role'), '', '<span class="loading invisible">' . t('Loading') . '<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span></span>',$permcats ],
 				'$permcat_new'    => t('Add permission role'),
 				'$permcat_enable' => feature_enabled(local_channel(),'permcats'),
 				'$addr'           => $contact['xchan_addr'],
diff --git a/Zotlabs/Module/Defperms.php b/Zotlabs/Module/Defperms.php
index 9214331e4..422333a50 100644
--- a/Zotlabs/Module/Defperms.php
+++ b/Zotlabs/Module/Defperms.php
@@ -237,7 +237,7 @@ class Defperms extends \Zotlabs\Web\Controller {
 			$o .= replace_macros($tpl, [
 				'$header'         => t('Connection Default Permissions'),
 				'$autoperms'      => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('If enabled, connection requests will be approved without your interaction'), $yes_no),
-				'$permcat'        => [ 'permcat', t('Permission role'), '', '',$permcats ],
+				'$permcat'        => [ 'permcat', t('Permission role'), '', '<span class="loading invisible">' . t('Loading') . '<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span></span>',$permcats ],
 				'$permcat_new'    => t('Add permission role'),
 				'$permcat_enable' => feature_enabled(local_channel(),'permcats'),
 				'$section'        => $section,
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index 7100e0d07..34e9a3b21 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -19,7 +19,7 @@ $(document).ready(function() {
 
 
 	$('#id_permcat').change(function() {
-		$('.loading-role-rotator').spin(true);
+		$('.loading').toggleClass('invisible');
 		var permName = $('#id_permcat').val();
 		loadAbookRole(permName);
 	});
@@ -128,7 +128,7 @@ function loadAbookRole(name) {
 			if(this.value)
 				$('#me_id_perms_' + this.name).attr('checked','checked');
 		});
-		$('.loading-role-rotator').spin(false);
+		$('.loading').toggleClass('invisible');
 	});
 }
 
diff --git a/view/js/mod_defperms.js b/view/js/mod_defperms.js
index c89142579..18ebe268e 100644
--- a/view/js/mod_defperms.js
+++ b/view/js/mod_defperms.js
@@ -1,7 +1,7 @@
 $(document).ready(function() {
 
 	$('#id_permcat').change(function() {
-		$('.loading-role-rotator').show();
+		$('.loading').toggleClass('invisible');
 		var permName = $('#id_permcat').val();
 		loadConnectionRole(permName);
 	});
@@ -25,7 +25,7 @@ function loadConnectionRole(name) {
 			if(this.value)
 				$('#id_perms_' + this.name).attr('checked','checked');
 		});
-		$('.loading-role-rotator').hide();
+		$('.loading').toggleClass('invisible');
 	});
 }
 
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index f9faa3d5c..d3392c748 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -19,7 +19,7 @@ $(document).ready(function() {
 	});
 
 	$('#id_permcat_list').change(function() {
-		$('.loading-role-rotator').spin(true);
+		$('.loading').toggleClass('invisible');
 		var permName = $('#id_permcat').val();
 		loadPermcat(permName);
 	});
@@ -172,7 +172,7 @@ function loadPermcat(name) {
 			if(this.value)
 				$('#me_id_perms_' + this.name).attr('checked','checked');
 		});
-		$('.loading-role-rotator').spin(false);
+		$('.loading').toggleClass('invisible');
 	});
 }
 
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 13b94a560..81c182e1b 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -485,7 +485,6 @@
 						</div>
 
 						{{if $permcat_enable}}
-						<div class="loading-role-rotator"></div>
 						<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
 						{{include file="field_select.tpl" field=$permcat}}
 						{{/if}}
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 2b4e8c9f9..97c14b6e3 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -70,6 +70,7 @@
 	{{include file="field_input.tpl" field=$register_text}}
 	{{include file="field_select.tpl" field=$register_policy}}
 	{{include file="field_checkbox.tpl" field=$invite_only}}
+	{{include file="field_input.tpl" field=$minimum_age}}
 	{{include file="field_select.tpl" field=$access_policy}}
 	{{include file="field_input.tpl" field=$location}}
 	{{include file="field_input.tpl" field=$sellpage}}
diff --git a/view/tpl/defperms.tpl b/view/tpl/defperms.tpl
index f4a711957..5273ee91b 100755
--- a/view/tpl/defperms.tpl
+++ b/view/tpl/defperms.tpl
@@ -17,7 +17,6 @@
 						<p>{{$permnote_self}}</p>
 						</div>
 						{{if $permcat_enable}}
-						<div class="loading-role-rotator spinner-wrapper"></div>
 						<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
 						{{include file="field_select.tpl" field=$permcat}}
 						{{/if}}