Reformat dfrn_request and auto_request templates

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

diff --git a/view/templates/auto_request.tpl b/view/templates/auto_request.tpl
index f1cca45464ec3d59b172140698ba20e73d2a609e..84039fa4fd79d51c3d107fe5b55aa1769df9c448 100644 (file)
--- a/view/templates/auto_request.tpl
+++ b/view/templates/auto_request.tpl
@@ -1,60 +1,64 @@
 <h1>{{$header}}</h1>
 
-{{if $myaddr == ""}}
+{{if !$myaddr}}
 <p id="dfrn-request-intro">
-{{$page_desc}}<br />
+       {{$page_desc}}
+</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>
+       <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>
 <p>
-{{$invite_desc}}
+       {{$invite_desc nofilter}}
 </p>
 <p>
-{{$desc}}
+       {{$desc nofilter}}
 </p>
 {{/if}}
 
-{{if $request}}
-<form action="{{$request}}" method="post" />
-{{else}}
-<form action="dfrn_request/{{$nickname}}" method="post" />
-{{/if}}
-
+<form action="{{$request|default:"dfrn_request/$nickname"}}" method="post">
 {{if $photo}}
-<img src="{{$photo}}" alt="" id="dfrn-request-photo">
+       <img src="{{$photo}}" alt="" id="dfrn-request-photo">
 {{/if}}
 
-{{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>
-        {{if $myaddr}}
-                {{$myaddr}}
-                <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>
-
-
-<div id="dfrn-request-info-wrapper" >
+       <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>
 
-</div>
+       <div id="dfrn-request-url-wrapper">
+               <label id="dfrn-url-label" for="dfrn-url">{{$your_address}}</label>
+{{if $myaddr}}
+               {{$myaddr}}
+               <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>
 
        <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}}" />
+{{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>