X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftemplates%2Facl_selector.tpl;h=f1943cf3f687510caade1956a8a87c4dab5c365d;hb=cad8748105c2c64bdfa07c6d11d52c5be30dda5f;hp=a5929900b3bece5e24227f0a282d10676f441694;hpb=74cc9d00fa4f8b831f325776b765590fccb7f801;p=friendica.git

diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl
index a5929900b3..f1943cf3f6 100644
--- a/view/templates/acl_selector.tpl
+++ b/view/templates/acl_selector.tpl
@@ -1,18 +1,15 @@
 <div id="acl-wrapper">
-	<div class="panel-group" id="visibility-accordion" role="tablist" aria-multiselectable="true">
+	<div class="panel-group" id="visibility-accordion-{{$input_group_id}}" role="tablist" aria-multiselectable="true">
 		<div class="panel panel-success">
-			<label class="panel-heading{{if $visibility != 'public'}} collapsed{{/if}}" id="visibility-public-heading" aria-expanded="{{if $visibility == 'public'}}true{{else}}false{{/if}}">
-				<input type="radio" name="visibility" id="visibility-public" value="public" tabindex="14" {{if $visibility == 'public'}}checked{{/if}}>
+			<label class="panel-heading{{if $visibility != 'public'}} collapsed{{/if}}" id="visibility-public-heading-{{$input_group_id}}" aria-expanded="{{if $visibility == 'public'}}true{{else}}false{{/if}}">
+				<input type="radio" name="{{$input_names.visibility}}" id="visibility-public-{{$input_group_id}}" value="public" tabindex="14" {{if $visibility == 'public'}}checked{{/if}}>
 				<i class="fa fa-globe"></i> {{$public_title}}
 			</label>
-			<fieldset id="visibility-public-panel" class="panel-collapse collapse{{if $visibility == 'public'}} in{{/if}}" role="tabpanel" aria-labelledby="visibility-public-heading" {{if $visibility != 'public'}}disabled{{/if}}>
+			<fieldset id="visibility-public-panel-{{$input_group_id}}" class="panel-collapse collapse{{if $visibility == 'public'}} in{{/if}}" role="tabpanel" aria-labelledby="visibility-public-heading-{{$input_group_id}}" {{if $visibility != 'public'}}disabled{{/if}}>
 				<div class="panel-body">
 					<p>{{$public_desc}}</p>
 	                {{if $for_federation}}
-		                {{if $user_hidewall}}
-			                <h4>{{$jotnets_summary}}</h4>
-	                        {{$jotnets_disabled_label}}
-		                {{elseif $jotnets_fields}}
+		                {{if $jotnets_fields}}
 		                    {{if $jotnets_fields|count < 3}}
 								<div class="profile-jot-net">
 		                    {{else}}
@@ -39,26 +36,26 @@
 			</fieldset>
 		</div>
 		<div class="panel panel-info">
-			<label class="panel-heading{{if $visibility != 'custom'}} collapsed{{/if}}" id="visibility-custom-heading" aria-expanded="{{if $visibility == 'custom'}}true{{else}}false{{/if}}">
-				<input type="radio" name="visibility" id="visibility-custom" value="custom" tabindex="15" {{if $visibility == 'custom'}}checked{{/if}}>
+			<label class="panel-heading{{if $visibility != 'custom'}} collapsed{{/if}}" id="visibility-custom-heading-{{$input_group_id}}" aria-expanded="{{if $visibility == 'custom'}}true{{else}}false{{/if}}">
+				<input type="radio" name="{{$input_names.visibility}}" id="visibility-custom-{{$input_group_id}}" value="custom" tabindex="15" {{if $visibility == 'custom'}}checked{{/if}}>
 				<i class="fa fa-lock"></i> {{$custom_title}}
 			</label>
-			<fieldset id="visibility-custom-panel" class="panel-collapse collapse{{if $visibility == 'custom'}} in{{/if}}" role="tabpanel" aria-labelledby="visibility-custom-heading" {{if $visibility != 'custom'}}disabled{{/if}}>
-				<input type="hidden" name="group_allow" value="{{$group_allow}}"/>
-				<input type="hidden" name="contact_allow" value="{{$contact_allow}}"/>
-				<input type="hidden" name="group_deny" value="{{$group_deny}}"/>
-				<input type="hidden" name="contact_deny" value="{{$contact_deny}}"/>
+			<fieldset id="visibility-custom-panel-{{$input_group_id}}" class="panel-collapse collapse{{if $visibility == 'custom'}} in{{/if}}" role="tabpanel" aria-labelledby="visibility-custom-heading-{{$input_group_id}}" {{if $visibility != 'custom'}}disabled{{/if}}>
+				<input type="hidden" name="{{$input_names.group_allow}}" value="{{$group_allow}}"/>
+				<input type="hidden" name="{{$input_names.contact_allow}}" value="{{$contact_allow}}"/>
+				<input type="hidden" name="{{$input_names.group_deny}}" value="{{$group_deny}}"/>
+				<input type="hidden" name="{{$input_names.contact_deny}}" value="{{$contact_deny}}"/>
 				<div class="panel-body">
 					<p>{{$custom_desc}}</p>
 
 					<div class="form-group">
-						<label for="acl_allow">{{$allow_label}}</label>
-						<input type="text" class="form-control input-lg" id="acl_allow">
+						<label for="acl_allow-{{$input_group_id}}">{{$allow_label}}</label>
+						<input type="text" class="form-control input-lg" id="acl_allow-{{$input_group_id}}">
 					</div>
 
 					<div class="form-group">
-						<label for="acl_deny">{{$deny_label}}</label>
-						<input type="text" class="form-control input-lg" id="acl_deny">
+						<label for="acl_deny-{{$input_group_id}}">{{$deny_label}}</label>
+						<input type="text" class="form-control input-lg" id="acl_deny-{{$input_group_id}}">
 					</div>
 				</div>
 			</fieldset>
@@ -68,29 +65,29 @@
 
 {{if $for_federation}}
 	<div class="form-group">
-		<label for="profile-jot-email" id="profile-jot-email-label">{{$emailcc}}</label>
-		<input type="text" name="emailcc" id="profile-jot-email" class="form-control" title="{{$emtitle}}" />
+		<label for="profile-jot-email" id="profile-jot-email-label-{{$input_group_id}}">{{$emailcc}}</label>
+		<input type="text" name="{{$input_names.emailcc}}" id="profile-jot-email-{{$input_group_id}}" class="form-control" title="{{$emtitle}}" />
 	</div>
-	<div id="profile-jot-email-end"></div>
+	<div id="profile-jot-email-end-{{$input_group_id}}"></div>
 {{/if}}
 </div>
 <script type="text/javascript">
 	$(function() {
-		let $acl_allow_input = $('#acl_allow');
-		let $contact_allow_input = $('[name=contact_allow]');
-		let $group_allow_input = $('[name=group_allow]');
-		let $acl_deny_input = $('#acl_deny');
-		let $contact_deny_input = $('[name=contact_deny]');
-		let $group_deny_input = $('[name=group_deny]');
-		let $visibility_public_panel = $('#visibility-public-panel');
-		let $visibility_custom_panel = $('#visibility-custom-panel');
-		let $visibility_public_radio = $('#visibility-public');
-		let $visibility_custom_radio = $('#visibility-custom');
+		let $acl_allow_input = $('#acl_allow-{{$input_group_id}}');
+		let $contact_allow_input = $('[name="{{$input_names.contact_allow}}"]');
+		let $group_allow_input = $('[name="{{$input_names.group_allow}}"]');
+		let $acl_deny_input = $('#acl_deny-{{$input_group_id}}');
+		let $contact_deny_input = $('[name="{{$input_names.contact_deny}}"]');
+		let $group_deny_input = $('[name="{{$input_names.group_deny}}"]');
+		let $visibility_public_panel = $('#visibility-public-panel-{{$input_group_id}}');
+		let $visibility_custom_panel = $('#visibility-custom-panel-{{$input_group_id}}');
+		let $visibility_public_radio = $('#visibility-public-{{$input_group_id}}');
+		let $visibility_custom_radio = $('#visibility-custom-{{$input_group_id}}');
 
 		// Frio specific
 		if ($.fn.collapse) {
-			$visibility_public_panel.collapse({parent: '#visibility-accordion', toggle: false});
-			$visibility_custom_panel.collapse({parent: '#visibility-accordion', toggle: false});
+			$visibility_public_panel.collapse({parent: '#visibility-accordion-{{$input_group_id}}', toggle: false});
+			$visibility_custom_panel.collapse({parent: '#visibility-accordion-{{$input_group_id}}', toggle: false});
 		}
 
 		$visibility_public_radio.on('change', function (e) {
@@ -101,13 +98,13 @@
 			$visibility_public_panel.prop('disabled', false);
 			$visibility_custom_panel.prop('disabled', true);
 
-			$('.profile-jot-net input[type=checkbox]').each(function() {
+			$('#visibility-public-panel-{{$input_group_id}} .profile-jot-net input[type=checkbox]').each(function() {
 				// Restores checkbox state if it had been saved
 				if ($(this).attr('data-checked') !== undefined) {
 					$(this).prop('checked', $(this).attr('data-checked') === 'true');
 				}
 			});
-			$('.profile-jot-net input').attr('disabled', false);
+			$('#visibility-public-panel-{{$input_group_id}} .profile-jot-net input').attr('disabled', false);
 		});
 
 		$visibility_custom_radio.on('change', function(e) {
@@ -118,13 +115,13 @@
 			$visibility_public_panel.prop('disabled', true);
 			$visibility_custom_panel.prop('disabled', false);
 
-			$('.profile-jot-net input[type=checkbox]').each(function() {
+			$('#visibility-public-panel-{{$input_group_id}} .profile-jot-net input[type=checkbox]').each(function() {
 				// Saves current checkbox state
 				$(this)
 					.attr('data-checked', $(this).prop('checked'))
 					.prop('checked', false);
 			});
-			$('.profile-jot-net input').attr('disabled', 'disabled');
+			$('#visibility-public-panel-{{$input_group_id}} .profile-jot-net input').attr('disabled', 'disabled');
 		});
 
 		// Custom visibility tags inputs
@@ -145,6 +142,15 @@
 			identify: function(obj) { return obj.type + '-' + obj.id.toString(); },
 			datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name', 'addr']),
 			queryTokenizer: Bloodhound.tokenizers.whitespace,
+			sorter: function (itemA, itemB) {
+				if (itemA.name === itemB.name) {
+					return 0;
+				} else if (itemA.name > itemB.name) {
+					return 1;
+				} else {
+					return -1;
+				}
+			},
 		});
 		acl.initialize();
 
@@ -224,9 +230,11 @@
 
 		// Anti-duplicate callback + acl fields value generation
 
-		$acl_allow_input.on('itemAdded', function (event) {
-			// Removes duplicate in the opposite acl box
-			$acl_deny_input.tagsinput('remove', event.item);
+		$acl_allow_input.on('itemAdded itemRemoved', function (event) {
+			if (event.type === 'itemAdded') {
+				// Removes duplicate in the opposite acl box
+				$acl_deny_input.tagsinput('remove', event.item);
+			}
 
 			// Update the real acl field
 			$group_allow_input.val('');
@@ -240,18 +248,20 @@
 			});
 		});
 
-		$acl_deny_input.on('itemAdded', function (event) {
-			// Removes duplicate in the opposite acl box
-			$acl_allow_input.tagsinput('remove', event.item);
+		$acl_deny_input.on('itemAdded itemRemoved', function (event) {
+			if (event.type === 'itemAdded') {
+				// Removes duplicate in the opposite acl box
+				$acl_allow_input.tagsinput('remove', event.item);
+			}
 
 			// Update the real acl field
 			$group_deny_input.val('');
 			$contact_deny_input.val('');
 			[].forEach.call($acl_deny_input.tagsinput('items'), function (item) {
 				if (item.type === 'group') {
-					$group_deny_input.val($group_allow_input.val() + ',' + item.id);
+					$group_deny_input.val($group_deny_input.val() + ',' + item.id);
 				} else {
-					$contact_deny_input.val($contact_allow_input.val() + ',' + item.id);
+					$contact_deny_input.val($contact_deny_input.val() + ',' + item.id);
 				}
 			});
 		});