Merge pull request #2119 from annando/1511-contact-evolution

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

diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index 133912bc94c988a68abbcf286f21545fcb05b477..0733c9e18752d60eb6b4cd770e863acaf9b647c5 100644 (file)
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -1,5 +1,3 @@
-
-
 <h2>{{$header}}</h2>
 
 <div id="contact-edit-wrapper" >
@@ -16,8 +14,9 @@
        <div id="contact-edit-nav-wrapper" >
                <div id="contact-edit-links">
                        <ul>
-                               <li><div id="contact-edit-rel">{{$relation_text}}</div></li>
-                               <li><div id="contact-edit-nettype">{{$nettype}}</div></li>
+                               {{if $relation_text}}
+                                       <li><div id="contact-edit-rel">{{$relation_text}}</div></li>
+                               {{/if}}
                                {{if $lost_contact}}
                                        <li><div id="lost-contact-message">{{$lost_contact}}</div></li>
                                {{/if}}
@@ -33,8 +32,9 @@
                                {{if $archived}}
                                        <li><div id="archive-message">{{$archived}}</div></li>
                                {{/if}}
+                       </ul>
 
-                               <li>&nbsp;</li>
+                       <ul>
 
                                {{if $common_text}}
                                        <li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
@@ -44,47 +44,61 @@
                                {{/if}}
 
 
-                               <li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
+                               <!-- <li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
                                {{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>
+
+                       <dl><dt>{{$profileurllabel}}</dt><dd><a target="blank" href="{{$url}}">{{$profileurl}}</a></dd></dl>
+                       {{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>
        </div>
        <div id="contact-edit-nav-end"></div>
 
+<hr />
 
 <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>