Merge pull request #5966 from JeroenED/theme/frio/oembed/view-active-class

[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 52f3fc545ed5edd7e2c5b29031b92259ba52ed33..04426eeb12aa5b799d2cc2af2e1b1ae141d0c245 100644 (file)
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -9,7 +9,7 @@
 
 
                <div id="contact-edit-content-wrapper">
-                       <form action="contacts/{{$contact_id}}" method="post" >
+                       <form action="contact/{{$contact_id}}" method="post" >
 
                                {{* This is the Action menu where contact related actions like 'ignore', 'hide' can be performed *}}
                                <ul id="contact-edit-actions" class="nav nav-pills preferences">
@@ -26,8 +26,8 @@
                                                        {{/if}}
                                                        <li role="presentation"><a role="menuitem" href="{{$contact_actions.block.url}}" title="{{$contact_actions.block.title}}">{{$contact_actions.block.label}}</a></li>
                                                        <li role="presentation"><a role="menuitem" href="{{$contact_actions.ignore.url}}" title="{{$contact_actions.ignore.title}}">{{$contact_actions.ignore.label}}</a></li>
-                                                       <li role="presentation"><a role="menuitem" href="{{$contact_actions.archive.url}}" title="{{$contact_actions.archive.title}}">{{$contact_actions.archive.label}}</a></li>
-                                                       <li role="presentation"><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.delete.title}}" onclick="addToModal('{{$contact_actions.delete.url}}?confirm=1');">{{$contact_actions.delete.label}}</button></li>
+                                                       {{if $contact_actions.archive.url}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.archive.url}}" title="{{$contact_actions.archive.title}}">{{$contact_actions.archive.label}}</a></li>{{/if}}
+                                                       {{if $contact_actions.delete.url}}<li role="presentation"><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.delete.title}}" onclick="addToModal('{{$contact_actions.delete.url}}?confirm=1');">{{$contact_actions.delete.label}}</button></li>{{/if}}
                                                </ul>
                                        </li>
                                </ul>
@@ -45,14 +45,18 @@
                                                {{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}}
-                                                               <span id="contact-edit-poll-text">{{$updpub}}</span> {{$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>
                                                        {{/if}}
                                                        </li>
                                                {{/if}}
 
                                                {{if $lost_contact}}<li><div id="lost-contact-message">{{$lost_contact}}</div></li>{{/if}}
                                                {{if $insecure}}<li><div id="insecure-message">{{$insecure}}</div></li> {{/if}}
-                                               {{if $blocked}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
+                                               {{if $blocked && !$pending}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
+                                               {{if $pending}}<li><div id="pending-message">{{$pending}}</div></li>{{/if}}
                                                {{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
                                                {{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
                                        </ul>
@@ -118,6 +122,7 @@
                                                <div class="clear"></div>
                                        </div>
 
+                                       {{if $contact_settings_label}}
                                        <div class="panel">
                                                <div class="section-subtitle-wrapper" role="tab" id="contact-edit-settings">
                                                        <h4>
@@ -145,7 +150,9 @@
                                                        </div>
                                                </div>
                                        </div>
+                                       {{/if}}
 
+                                       {{if $lbl_info1}}
                                        <div class="panel">
                                                <div class="section-subtitle-wrapper" role="tab" id="contact-edit-info">
                                                        <h4>
@@ -163,10 +170,16 @@
                                                                        <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
                                                                </div>
                                                                <div class="clear"></div>
+                                                               {{if $reason}}
+                                                               <h4>{{$lbl_info2}}</h4>
+                                                               <p>{{$reason}}</p>
+                                                               <div class="clear"></div>
+                                                               {{/if}}
                                                        </div>
                                                </div>
                                        </div>
-
+                                       {{/if}}
+                                       {{if $lbl_vis1}}
                                        <div class="panel">
                                                <div class="section-subtitle-wrapper" role="tab" id="contact-edit-profile-select">
                                                        <h4>
@@ -194,7 +207,7 @@
                                                        </div>
                                                </div>
                                        </div>
-
+                                       {{/if}}
                                </div>
 
                        </form>{{* End of the form *}}