Merge branch '2021.03-rc' into copyright-2021

[friendica.git] / view / templates / item / compose.tpl

diff --git a/view/templates/item/compose.tpl b/view/templates/item/compose.tpl
index d18b1a2d36af1aa07ee09193ea7e6ee395d59ad0..8b7414fd6780694c4338786aa687b2789a36d87d 100644 (file)
--- a/view/templates/item/compose.tpl
+++ b/view/templates/item/compose.tpl
@@ -74,82 +74,18 @@
 
                        <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
 
-                       <input type="hidden" name="group_allow" value="{{$group_allow}}" {{if $visibility == 'public'}}disabled{{/if}}/>
-                       <input type="hidden" name="contact_allow" value="{{$contact_allow}}" {{if $visibility == 'public'}}disabled{{/if}}/>
-                       <input type="hidden" name="group_deny" value="{{$group_deny}}" {{if $visibility == 'public'}}disabled{{/if}}/>
-                       <input type="hidden" name="contact_deny" value="{{$contact_deny}}" {{if $visibility == 'public'}}disabled{{/if}}/>
 {{if $type == 'post'}}
-                       <h3>Visibility</h3>
-                       <div class="panel-group" id="visibility-accordion" role="tablist" aria-multiselectable="true">
-                               <div class="panel panel-success">
-                                       <div class="panel-heading" id="visibility-public-heading" role="button" data-toggle="collapse" data-parent="#visibility-accordion" href="#visibility-public-panel" aria-expanded="true" aria-controls="visibility-public-panel" tabindex="14">
-                                               <label>
-                                                       <input type="radio" name="visibility" id="visibility-public" value="public" {{if $visibility == 'public'}}checked{{/if}} style="display:none">
-                                                       <i class="fa fa-globe"></i> {{$public_title}}
-                                               </label>
-                                       </div>
-                                       <div id="visibility-public-panel" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="visibility-public-heading">
-                                               <div class="panel-body">
-                                                       <p>{{$public_desc}}</p>
-                    {{if $doesFederate && $jotnets_fields}}
-                        {{if $jotnets_fields|count < 3}}
-                                                       <div class="profile-jot-net">
-                        {{else}}
-                                                       <details class="profile-jot-net">
-                                                       <summary>{{$jotnets_summary}}</summary>
-                        {{/if}}
+                       <h3>{{$visibility_title}}</h3>
+                       {{$acl_selector nofilter}}
 
-                        {{foreach $jotnets_fields as $jotnets_field}}
-                            {{if $jotnets_field.type == 'checkbox'}}
-                                {{include file="field_checkbox.tpl" field=$jotnets_field.field}}
-                            {{elseif $jotnets_field.type == 'select'}}
-                                {{include file="field_select.tpl" field=$jotnets_field.field}}
-                            {{/if}}
-                        {{/foreach}}
-
-                        {{if $jotnets_fields|count >= 3}}
-                                                       </details>
-                        {{else}}
-                                                       </div>
-                        {{/if}}
-                    {{/if}}
-                                               </div>
-                                       </div>
-                               </div>
-                               <div class="panel panel-info">
-                                       <div class="panel-heading collapsed" id="visibility-custom-heading" role="button" data-toggle="collapse" data-parent="#visibility-accordion" href="#visibility-custom-panel" aria-expanded="true" aria-controls="visibility-custom-panel" tabindex="15">
-                                               <label>
-                                                       <input type="radio" name="visibility" id="visibility-custom" value="custom" {{if $visibility == 'custom'}}checked{{/if}} style="display:none">
-                                                       <i class="fa fa-lock"></i> {{$custom_title}}
-                                               </label>
-                                       </div>
-                                       <div id="visibility-custom-panel" class="panel-collapse collapse" role="tabpanel" aria-labelledby="visibility-custom-heading">
-                                               <div class="panel-body">
-                                                       <p>{{$custom_desc}}</p>
-
-                                                       <div class="form-group">
-                                                               <label for="acl_allow">Deliver to:</label>
-                                                               <input type="text" class="form-control input-lg" id="acl_allow">
-                                                       </div>
-
-                                                       <div class="form-group">
-                                                               <label for="acl_deny">Except to:</label>
-                                                               <input type="text" class="form-control input-lg" id="acl_deny">
-                                                       </div>
-                                               </div>
-                                       </div>
-                               </div>
-                       </div>
-        {{if $doesFederate}}
-                       <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}}" />
-                       </div>
-                       <div id="profile-jot-email-end"></div>
-               {{/if}}
                        <div class="jotplugins">
                                {{$jotplugins nofilter}}
                        </div>
+{{else}}
+                       <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}}"/>
 {{/if}}
                </form>
        </div>