Merge remote-tracking branch 'upstream/2022.12-rc' into diaspora-reshare

[friendica.git] / view / templates / auto_request.tpl

diff --git a/view/templates/auto_request.tpl b/view/templates/auto_request.tpl
index 84039fa4fd79d51c3d107fe5b55aa1769df9c448..0cfe584d5a5f62312f8480cd2d2ddd9548aa91fa 100644 (file)
--- a/view/templates/auto_request.tpl
+++ b/view/templates/auto_request.tpl
@@ -2,44 +2,26 @@
 
 {{if !$myaddr}}
 <p id="dfrn-request-intro">
-       {{$page_desc}}
+       {{$page_desc nofilter}}
 </p>
-<ul id="dfrn-request-networks">
-       <li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li>
-       <li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
-       <li><a href="https://gnu.io/social/" title="{{$statusnet}}">{{$statusnet}}</a></li>
-</ul>
 <p>
        {{$invite_desc nofilter}}
 </p>
-<p>
-       {{$desc nofilter}}
-</p>
-{{/if}}
-
-<form action="{{$request|default:"dfrn_request/$nickname"}}" method="post">
-{{if $photo}}
-       <img src="{{$photo}}" alt="" id="dfrn-request-photo">
 {{/if}}
 
-       <dl>
+<form action="{{$action}}" method="post">
 {{if $url}}
+       <dl>
                <dt>{{$url_label}}</dt>
                <dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd>
-{{/if}}
-{{if $location}}
-               <dt>{{$location_label}}</dt>
-               <dd>{{$location}}</dd>
+       </dl>
 {{/if}}
 {{if $keywords}}
+       <dl>
                <dt>{{$keywords_label}}</dt>
                <dd>{{$keywords}}</dd>
-{{/if}}
-{{if $about}}
-               <dt>{{$about_label}}</dt>
-               <dd>{{$about nofilter}}</dd>
-{{/if}}
        </dl>
+{{/if}}
 
        <div id="dfrn-request-url-wrapper">
                <label id="dfrn-url-label" for="dfrn-url">{{$your_address}}</label>
@@ -49,9 +31,7 @@
 {{else}}
                <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}">
 {{/if}}
-{{if $url}}
                <input type="hidden" name="url" id="url" value="{{$url}}">
-{{/if}}
                <div id="dfrn-request-url-end"></div>
        </div>