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

diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl
index 44c8ef1e6a..f1ef7c4695 100644
--- a/view/templates/dfrn_request.tpl
+++ b/view/templates/dfrn_request.tpl
@@ -1,75 +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}}
 
-<form action="dfrn_request/{{$nickname}}" method="post" />
-
-<div id="dfrn-request-url-wrapper" >
-	<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
-	{{if $myaddr}}
+<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" size="32" value="{{$myaddr|escape:'html'}}" />
-	{{else}}
-	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|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" />
+		<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}}
+		<div id="dfrn-request-url-end"></div>
+	</div>
 
-		<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">
-		<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
-		<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>