Merge remote-tracking branch 'upstream/develop' into sanitize-gcontact

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

diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl
index b0d201af63d90bbc827234667cfc31a152a02de0..f9454dc654f3d5fdca2e90ed00b999764ef7fe9d 100644 (file)
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -45,10 +45,8 @@
                                                {{if $poll_enabled}}
                                                        <li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
                                                        {{if $poll_interval}}
-                                                               <form id="contact-edit-poll-form" action="/contact/{{$contact_id}}" method="post"> 
-                                                                       <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}}
-                                                                       <input class="btn btn-primary" type="submit" name="submit" value="{{$submit}}" />
-                                                               </form>
+                                                               <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
+                                                               <input class="btn btn-primary" type="submit" name="submit" value="{{$submit}}" />
                                                        {{/if}}
                                                        </li>
                                                {{/if}}
@@ -60,11 +58,6 @@
                                                {{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
                                                {{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
                                        </ul>
-
-                                       <ul>
-                                               <!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
-                                               {{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
-                                       </ul>
                                </div> {{* End of contact-edit-status-wrapper *}}
 
                                <div id="contact-edit-links-end"></div>
@@ -90,7 +83,7 @@
                                                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                                                                        <hr class="profile-separator">
                                                                        <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$location_label}}</div>
-                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$location}}</div>
+                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$location nofilter}}</div>
                                                                </div>
                                                                {{/if}}
 
@@ -195,7 +188,7 @@
                                                                                <p>{{$lbl_vis2}}</p>
                                                                        </div>
                                                                        <div class="form-group">
-                                                                       {{$profile_select}}
+                                                                       {{$profile_select nofilter}}
                                                                        </div>
                                                                        <div class="clear"></div>
                                                                {{/if}}