X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftemplates%2Fdfrn_request.tpl;h=f1ef7c4695cff21996f584f4a569b6162ab46065;hb=cad8748105c2c64bdfa07c6d11d52c5be30dda5f;hp=5225bd60b22743f45b88c26c4be0601ac0608882;hpb=d30d13959b21eafc7ea35d26ccc6bf10a84f8541;p=friendica.git

diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl
index 5225bd60b2..f1ef7c4695 100644
--- a/view/templates/dfrn_request.tpl
+++ b/view/templates/dfrn_request.tpl
@@ -1,91 +1,38 @@
 <h1>{{$header}}</h1>
 
-{{if $myaddr}}
-{{else}}
+{{if !$myaddr}}
 <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}}
-</ul>
-{{$invite_desc}}
+	{{$page_desc nofilter}}
 </p>
 <p>
-{{$desc}}
+	{{$invite_desc nofilter}}
 </p>
 {{/if}}
 
-{{if $request}}
 <form action="{{$request}}" method="post">
+	<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}}
-<form action="dfrn_request/{{$nickname}}" method="post">
-{{/if}}
-
-{{if $photo}}
-<img src="{{$photo}}" alt="" id="dfrn-request-photo" />
+		<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}">
 {{/if}}
+		<div id="dfrn-request-url-end"></div>
+	</div>
 
-{{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" 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>
-
-<p id="dfrn-request-options">
-{{$pls_answer}}
-</p>
-
-<div id="dfrn-request-info-wrapper" >
-
-{{include file="field_yesno.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" />
+	<p id="dfrn-request-options">
+		{{$pls_answer}}
+	</p>
 
-		<div id="dfrn-request-knowyou-end"></div>
-		</div>
--->
+	<div id="dfrn-request-info-wrapper">
+		{{include file="field_checkbox.tpl" field=$does_know_you}}
 
-<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>
+		{{include file="field_textarea.tpl" field=$addnote_field}}
 	</div>
 
-
-</div>
-
 	<div id="dfrn-request-submit-wrapper">
-		{{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'}}" />
+		<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}">
+		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
 	</div>
 </form>