Merge pull request #9703 from tobiasd/20201223-lng

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

diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl
index c35285fd6874d5beb2595c09287c4f1aae84d5c8..f1ef7c4695cff21996f584f4a569b6162ab46065 100644 (file)
--- a/view/templates/dfrn_request.tpl
+++ b/view/templates/dfrn_request.tpl
@@ -2,45 +2,14 @@
 
 {{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>
-{{if $url}}
-               <dt>{{$url_label}}</dt>
-               <dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd>
-{{/if}}
-{{if $location}}
-               <dt>{{$location_label}}</dt>
-               <dd>{{$location}}</dd>
-{{/if}}
-{{if $keywords}}
-               <dt>{{$keywords_label}}</dt>
-               <dd>{{$keywords}}</dd>
-{{/if}}
-{{if $about}}
-               <dt>{{$about_label}}</dt>
-               <dd>{{$about nofilter}}</dd>
-{{/if}}
-       </dl>
-
+<form action="{{$request}}" method="post">
        <div id="dfrn-request-url-wrapper">
                <label id="dfrn-url-label" for="dfrn-url">{{$your_address}}</label>
 {{if $myaddr}}
@@ -48,9 +17,6 @@
                <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}">
 {{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>
@@ -60,39 +26,13 @@
        </p>
 
        <div id="dfrn-request-info-wrapper">
-
                {{include file="field_checkbox.tpl" field=$does_know_you}}
-               {{*
-               <p id="doiknowyou">
-               {{$does_know}}
-               </p>
-
-               <div id="dfrn-request-know-yes-wrapper">
-               <label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">{{$yes}}</label>
-               <input type="radio" name="knowyou" id="knowyouyes" value="1" >
 
-               <div id="dfrn-request-knowyou-break" ></div>    
-               </div>
-               <div id="dfrn-request-know-no-wrapper">
-               <label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">{{$no}}</label>
-               <input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" >
-
-               <div id="dfrn-request-knowyou-end"></div>
-               </div>
-               *}}
-
-               <p id="dfrn-request-message-desc">
-                       {{$add_note}}
-               </p>
-               <div id="dfrn-request-message-wrapper">
-                       <textarea name="dfrn-request-message" rows="4" cols="64"></textarea>
-               </div>
+               {{include file="field_textarea.tpl" field=$addnote_field}}
        </div>
 
        <div id="dfrn-request-submit-wrapper">
-{{if $submit}}
                <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}">
-{{/if}}
                <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
        </div>
 </form>