X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftemplates%2Fcontact_edit.tpl;h=95e8e5d29acec265dcc76d3ec4aa06031529dd2f;hb=2ce64c2496e11fd57aff6ad22bd183840e308d1d;hp=133912bc94c988a68abbcf286f21545fcb05b477;hpb=53f3b8ab53f167471a7b0a8390d95438a10d8151;p=friendica.git

diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index 133912bc94..95e8e5d29a 100644
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -16,8 +16,11 @@
 	<div id="contact-edit-nav-wrapper" >
 		<div id="contact-edit-links">
 			<ul>
-				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
+				{{if $relation_text}}
+					<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
+				{{/if}}
 				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
+				<li><div id="contact-edit-profileurl">{{$profileurllabel}}: <a href="{{$url}}">{{$profileurl}}</a></div></li>
 				{{if $lost_contact}}
 					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
 				{{/if}}
@@ -33,8 +36,8 @@
 				{{if $archived}}
 					<li><div id="archive-message">{{$archived}}</div></li>
 				{{/if}}
-
-				<li>&nbsp;</li>
+			</ul>
+			<ul>
 
 				{{if $common_text}}
 					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
@@ -48,6 +51,9 @@
 				{{if $lblsuggest}}
 					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
 				{{/if}}
+				{{if $follow}}
+					<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>
+				{{/if}}
 
 			</ul>
 		</div>
@@ -58,33 +64,38 @@
 <form action="contacts/{{$contact_id}}" method="post" >
 <input type="hidden" name="contact_id" value="{{$contact_id}}">
 
-	{{if $poll_enabled}}
-		<div id="contact-edit-poll-wrapper">
+	<div id="contact-edit-poll-wrapper">
+		{{if $poll_enabled}}
 			<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
-			<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}} <span id="contact-edit-update-now" class="button"><a href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
-		</div>
-	{{/if}}
+			{{if $poll_interval}}
+				<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}}
+			{{/if}}
+			<span id="contact-edit-update-now" class="button"><a href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
+		{{/if}}
+	</div>
 	<div id="contact-edit-end" ></div>
 	{{include file="field_checkbox.tpl" field=$notify}}
-	{{include file="field_select.tpl" field=$fetch_further_information}}
+	{{if $fetch_further_information}}
+		{{include file="field_select.tpl" field=$fetch_further_information}}
+		{{if $fetch_further_information.2 == 2 }} {{include file="field_textarea.tpl" field=$ffi_keyword_blacklist}} {{/if}}
+	{{/if}}
 	{{include file="field_checkbox.tpl" field=$hidden}}
 
 <div id="contact-edit-info-wrapper">
 <h4>{{$lbl_info1}}</h4>
 	<textarea id="contact-edit-info" rows="8" cols="60" name="info">{{$info}}</textarea>
-	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
 </div>
 <div id="contact-edit-info-end"></div>
 
-
-<div id="contact-edit-profile-select-text">
-<h4>{{$lbl_vis1}}</h4>
-<p>{{$lbl_vis2}}</p> 
-</div>
-{{$profile_select}}
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
-
+{{if $profile_select}}
+	<div id="contact-edit-profile-select-text">
+	<h4>{{$lbl_vis1}}</h4>
+	<p>{{$lbl_vis2}}</p> 
+	</div>
+	{{$profile_select}}
+	<div id="contact-edit-profile-select-end"></div>
+	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+{{/if}}
 </form>
 </div>