Merge branch 'bug/phpinfo-accessible-hotfix' into develop

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

diff --git a/view/theme/frio/templates/dfrn_request.tpl b/view/theme/frio/templates/dfrn_request.tpl
index 45d4aeafd656e0565433c98fecebf6858567a0aa..65f84fd7cc406046871ea09656af840ea082dbc6 100644 (file)
--- a/view/theme/frio/templates/dfrn_request.tpl
+++ b/view/theme/frio/templates/dfrn_request.tpl
@@ -3,56 +3,22 @@
 
 {{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}}
-       </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}}</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}}
+{{if $myaddr}}
                        {{$myaddr}}
                        <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}">
-               {{else}}
+{{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}}
+{{/if}}
                        <div id="dfrn-request-url-end"></div>
                </div>
 
@@ -62,37 +28,12 @@
 
                <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 class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}">
-{{/if}}
                        <input class="btn btn-default" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
                </div>
        </form>