X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Ftemplates%2Fauto_request.tpl;h=a6f148723fc9bfbd02eef7ea6511e0c70f62d613;hb=79eeb409695716fae8a501a02ef57ed855acb3a8;hp=9c737cf55ad4b406df44736f1d43c0a385ebed44;hpb=21a055f670149e67f2ad03da43f590c5329822e2;p=friendica.git

diff --git a/view/theme/frio/templates/auto_request.tpl b/view/theme/frio/templates/auto_request.tpl
index 9c737cf55a..a6f148723f 100644
--- a/view/theme/frio/templates/auto_request.tpl
+++ b/view/theme/frio/templates/auto_request.tpl
@@ -1,62 +1,45 @@
 <div class="generic-page-wrapper">
-<h1>{{$header}}</h1>
-
-{{if $myaddr == ""}}
-<p id="dfrn-request-intro">
-{{$page_desc}}<br />
-<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>
-<p>
-{{$invite_desc}}
-</p>
-<p>
-{{$desc}}
-</p>
+	<h1>{{$header}}</h1>
+
+{{if !$myaddr}}
+	<p id="dfrn-request-intro">
+		{{$page_desc nofilter}}
+	</p>
+	<p>
+		{{$invite_desc nofilter}}
+	</p>
 {{/if}}
 
-{{if $request}}
-<form action="{{$request}}" method="post" />
-{{else}}
-<form action="dfrn_request/{{$nickname}}" method="post" />
+	<form action="{{$request}}" method="post">
+{{if $url}}
+		<dl>
+			<dt>{{$url_label}}</dt>
+			<dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd>
+		</dl>
 {{/if}}
-
-{{if $photo}}
-<img src="{{$photo}}" alt="" id="dfrn-request-photo">
+{{if $keywords}}
+		<dl>
+			<dt>{{$keywords_label}}</dt>
+			<dd>{{$keywords}}</dd>
+		</dl>
 {{/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|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>
-
-
-<div id="dfrn-request-info-wrapper" >
-
+		<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}}
+			<input type="hidden" name="url" id="url" value="{{$url}}">
+			<div id="dfrn-request-url-end"></div>
+		</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>
 </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|escape:'html'}}" />
-		{{/if}}
-		<input class="btn btn-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
-	</div>
-</form>
-</div>
\ No newline at end of file