Merge pull request #8772 from annando/post-update

[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 04426eeb12aa5b799d2cc2af2e1b1ae141d0c245..55a7891a82d019f1814f3afb7ca3f9653dfac026 100644 (file)
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -5,7 +5,7 @@
        <div id="contact-edit-wrapper" >
 
                {{* Insert Tab-Nav *}}
-               {{$tab_str}}
+               {{$tab_str nofilter}}
 
 
                <div id="contact-edit-content-wrapper">
@@ -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|escape:'html'}}" />
-                                                               </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/0?nets=all&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}}
 
@@ -114,7 +107,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">{{$about_label}}</div>
-                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$about}}</div>
+                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$about nofilter}}</div>
                                                                </div>
                                                                {{/if}}
                                                        </div>
@@ -139,12 +132,12 @@
                                                                {{include file="field_checkbox.tpl" field=$notify}}
                                                                {{if $fetch_further_information}}
                                                                        {{include file="field_select.tpl" field=$fetch_further_information}}
-                                                                       {{if $fetch_further_information.2 == 2 || $fetch_further_information.2 == 3}} {{include file="field_textarea.tpl" field=$ffi_keyword_blacklist}} {{/if}}
+                                                                       {{if $fetch_further_information.2 == 2 || $fetch_further_information.2 == 3}} {{include file="field_textarea.tpl" field=$ffi_keyword_denylist}} {{/if}}
                                                                {{/if}}
                                                                {{include file="field_checkbox.tpl" field=$hidden}}
 
                                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                                </div>
                                                                <div class="clear"></div>
                                                        </div>
@@ -167,7 +160,7 @@
                                                                {{include file="field_textarea.tpl" field=$cinfo}}
 
                                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                                </div>
                                                                <div class="clear"></div>
                                                                {{if $reason}}
@@ -179,35 +172,6 @@
                                                </div>
                                        </div>
                                        {{/if}}
-                                       {{if $lbl_vis1}}
-                                       <div class="panel">
-                                               <div class="section-subtitle-wrapper" role="tab" id="contact-edit-profile-select">
-                                                       <h4>
-                                                               <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#contact-edit-tools" href="#contact-edit-profile-select-collapse" aria-expanded="false" aria-controls="contact-edit-profile-select-collapse">
-                                                                       {{$lbl_vis1}}
-                                                               </a>
-                                                       </h4>
-                                               </div>
-                                               <div id="contact-edit-profile-select-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="contact-edit-profile-select">
-                                                       <div class="section-content-tools-wrapper">
-                                                               {{if $profile_select}}
-                                                                       <div id="contact-edit-profile-select-text">
-                                                                               <p>{{$lbl_vis2}}</p>
-                                                                       </div>
-                                                                       <div class="form-group">
-                                                                       {{$profile_select}}
-                                                                       </div>
-                                                                       <div class="clear"></div>
-                                                               {{/if}}
-
-                                                               <div class="form-group pull-right settings-submit-wrapper" >
-                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
-                                                               </div>
-                                                               <div class="clear"></div>
-                                                       </div>
-                                               </div>
-                                       </div>
-                                       {{/if}}
                                </div>
 
                        </form>{{* End of the form *}}