Merge remote-tracking branch 'upstream/develop' into develop

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

diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl
index 29173a1d777f7b717b4f74604ff68a070a4973fe..8e686c33dc1642df69898dc0ba7cfc3cbe6aa0aa 100644 (file)
--- a/view/templates/dfrn_request.tpl
+++ b/view/templates/dfrn_request.tpl
@@ -1,30 +1,47 @@
-{{*
- *     AUTOMATICALLY GENERATED TEMPLATE
- *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <h1>{{$header}}</h1>
 
+{{if $myaddr}}
+{{else}}
 <p id="dfrn-request-intro">
 {{$page_desc}}<br />
 <ul id="dfrn-request-networks">
-<li><a href="http://friendica.com" title="{{$friendica}}">{{$friendica}}</a></li>
-<li><a href="http://joindiaspora.com" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
-<li><a href="http://ostatus.org" title="{{$public_net}}" >{{$statusnet}}</a></li>
-{{if $emailnet}}<li>{{$emailnet}}</li>{{/if}}
+<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>
 {{$invite_desc}}
 </p>
 <p>
 {{$desc}}
 </p>
+{{/if}}
+
+{{if $request}}
+<form action="{{$request}}" method="post">
+{{else}}
+<form action="dfrn_request/{{$nickname}}" method="post">
+{{/if}}
+
+{{if $photo}}
+<img src="{{$photo}}" alt="" id="dfrn-request-photo" />
+{{/if}}
 
-<form action="dfrn_request/{{$nickname}}" method="post" />
+{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
+{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
+{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
+{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
 
 <div id="dfrn-request-url-wrapper" >
        <label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
-       <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
+       {{if $myaddr}}
+               {{$myaddr}}
+               <input type="hidden" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+       {{else}}
+       <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+       {{/if}}
+       {{if $url}}
+               <input type="hidden" name="url" id="url" value="{{$url|escape:'html'}}" />
+       {{/if}}
        <div id="dfrn-request-url-end"></div>
 </div>
 
@@ -34,7 +51,8 @@
 
 <div id="dfrn-request-info-wrapper" >
 
-
+{{include file="field_yesno.tpl" field=$does_know_you}}
+<!--
 <p id="doiknowyou">
 {{$does_know}}
 </p>
@@ -51,7 +69,7 @@
 
                <div id="dfrn-request-knowyou-end"></div>
                </div>
-
+-->
 
 <p id="dfrn-request-message-desc">
 {{$add_note}}
@@ -64,7 +82,9 @@
 </div>
 
        <div id="dfrn-request-submit-wrapper">
-               <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
-               <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
+               {{if $submit}}
+                       <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
+               {{/if}}
+               <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
        </div>
 </form>