From 0056403b1552f10d70d4ec5accd478d428d0bc8d Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Wed, 20 Apr 2016 15:37:34 +0200 Subject: [PATCH] fix: contact edit poll_interval wasn't submitted --- view/global.css | 1 + view/templates/contact_edit.tpl | 159 +++++++++++---------- view/theme/duepuntozero/style.css | 4 - view/theme/vier/style.css | 4 - view/theme/vier/templates/contact_edit.tpl | 159 +++++++++++---------- 5 files changed, 163 insertions(+), 164 deletions(-) diff --git a/view/global.css b/view/global.css index f375e811b2..8f0b06507c 100644 --- a/view/global.css +++ b/view/global.css @@ -452,4 +452,5 @@ td.federation-data { #contact-edit-settings { display: none; + margin: 10px 0; } diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl index 93999a860c..c5012822ec 100644 --- a/view/templates/contact_edit.tpl +++ b/view/templates/contact_edit.tpl @@ -8,91 +8,94 @@ <div id="contact-edit-nav-wrapper" > - <div id="contact-edit-links"> - <div id="contact-edit-status-wrapper"> - <span id="contact-edit-contact-status">{{$contact_status}}</span> - - {{* This is the Action menu where contact related actions like 'ignore', 'hide' can be performed *}} - <div id="contact-edit-actions"> - <a class="btn" rel="#contact-actions-menu" href="#" id="contact-edit-actions-button">{{$contact_action_button}}</a> - - <ul role="menu" aria-haspopup="true" id="contact-actions-menu" class="menu-popup" > - {{if $lblsuggest}}<li role="menuitem"><a href="#" title="{{$contact_actions.suggest.title}}" onclick="window.location.href='{{$contact_actions.suggest.url}}'; return false;">{{$contact_actions.suggest.label}}</a></li>{{/if}} - {{if $poll_enabled}}<li role="menuitem"><a href="#" title="{{$contact_actions.update.title}}" onclick="window.location.href='{{$contact_actions.update.url}}'; return false;">{{$contact_actions.update.label}}</a></li>{{/if}} - <li class="divider"></li> - <li role="menuitem"><a href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li> - <li role="menuitem"><a href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li> - <li role="menuitem"><a href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li> - <li role="menuitem"><a href="#" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li> + <form action="contacts/{{$contact_id}}" method="post" > + <div id="contact-edit-links"> + <div id="contact-edit-status-wrapper"> + <span id="contact-edit-contact-status">{{$contact_status}}</span> + + {{* This is the Action menu where contact related actions like 'ignore', 'hide' can be performed *}} + <div id="contact-edit-actions"> + <a class="btn" rel="#contact-actions-menu" href="#" id="contact-edit-actions-button">{{$contact_action_button}}</a> + + <ul role="menu" aria-haspopup="true" id="contact-actions-menu" class="menu-popup" > + {{if $lblsuggest}}<li role="menuitem"><a href="#" title="{{$contact_actions.suggest.title}}" onclick="window.location.href='{{$contact_actions.suggest.url}}'; return false;">{{$contact_actions.suggest.label}}</a></li>{{/if}} + {{if $poll_enabled}}<li role="menuitem"><a href="#" title="{{$contact_actions.update.title}}" onclick="window.location.href='{{$contact_actions.update.url}}'; return false;">{{$contact_actions.update.label}}</a></li>{{/if}} + <li class="divider"></li> + <li role="menuitem"><a href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li> + <li role="menuitem"><a href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li> + <li role="menuitem"><a href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li> + <li role="menuitem"><a href="#" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li> + </ul> + </div> + + {{* Block with status information about the contact *}} + <ul> + {{if $relation_text}}<li><div id="contact-edit-rel">{{$relation_text}}</div></li>{{/if}} + + {{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}} + {{/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 $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}} + {{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}} </ul> - </div> - {{* Block with status information about the contact *}} - <ul> - {{if $relation_text}}<li><div id="contact-edit-rel">{{$relation_text}}</div></li>{{/if}} + <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 *}} - {{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}} - {{/if}} - </li> + {{* Some information about the contact from the profile *}} + <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>{{* End of contact-edit-links *}} + + <div id="contact-edit-links-end"></div> + + <hr /> + + <h4 id="contact-edit-settings-label" class="fakelink" onclick="openClose('contact-edit-settings')">{{$contact_settings_label}}</h4> + <div id="contact-edit-settings"> + <input type="hidden" name="contact_id" value="{{$contact_id}}"> + + <div id="contact-edit-end" ></div> + {{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 }} {{include file="field_textarea.tpl" field=$ffi_keyword_blacklist}} {{/if}} {{/if}} + {{include file="field_checkbox.tpl" field=$hidden}} - {{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 $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 *}} - - {{* Some information about the contact from the profile *}} - <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>{{* End of contact-edit-links *}} - - <div id="contact-edit-links-end"></div> - - <hr /> - - <h4 id="contact-edit-settings-label" class="fakelink" onclick="openClose('contact-edit-settings')">{{$contact_settings_label}}</h4> - <div id="contact-edit-settings"> - <form action="contacts/{{$contact_id}}" method="post" > - <input type="hidden" name="contact_id" value="{{$contact_id}}"> - - <div id="contact-edit-end" ></div> - {{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 }} {{include file="field_textarea.tpl" field=$ffi_keyword_blacklist}} {{/if}} + <div id="contact-edit-info-wrapper"> + <h4>{{$lbl_info1}}</h4> + <textarea id="contact-edit-info" rows="8" cols="60" name="info">{{$info}}</textarea> + </div> + <div id="contact-edit-info-end"></div> + + {{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> {{/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|escape:'html'}}" /> </div> - <div id="contact-edit-info-end"></div> - {{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> + <input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" /> + + <div class="contact-edit-submit-end clearfix"></div> + + </form>{{* End of the form *}} </div>{{* End of contact-edit-nav-wrapper *}} </div> diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 53d034d865..49754c8389 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1739,10 +1739,6 @@ blockquote.shared_content { /*margin-left: 175px;*/ } -.contact-edit-submit { - margin-top: 20px; -} - .contact-select { position: absolute; top: 64px; left:64px; display:none; } .contact-select:checked, .contact-entry-photo:hover .contact-select { display:block; } diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 340d3b6442..47a0bfbabd 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -2986,10 +2986,6 @@ a.mail-list-link { list-style-type: none; } -#contact-edit-settings { - margin-top: 10px; -} - a.btn#contact-edit-actions-button { cursor: pointer; border-radius: 3px; diff --git a/view/theme/vier/templates/contact_edit.tpl b/view/theme/vier/templates/contact_edit.tpl index ce3cfbf808..ef177de07e 100644 --- a/view/theme/vier/templates/contact_edit.tpl +++ b/view/theme/vier/templates/contact_edit.tpl @@ -8,91 +8,94 @@ <div id="contact-edit-nav-wrapper" > - <div id="contact-edit-links"> - <div id="contact-edit-status-wrapper"> - <span id="contact-edit-contact-status">{{$contact_status}}</span> - - {{* This is the Action menu where contact related actions like 'ignore', 'hide' can be performed *}} - <div id="contact-edit-actions"> - <a class="btn" id="contact-edit-actions-button">{{$contact_action_button}}</a> - - <ul role="menu" aria-haspopup="true" id="contact-actions-menu" class="menu-popup" > - {{if $lblsuggest}}<li role="menuitem"><a href="#" title="{{$contact_actions.suggest.title}}" onclick="window.location.href='{{$contact_actions.suggest.url}}'; return false;">{{$contact_actions.suggest.label}}</a></li>{{/if}} - {{if $poll_enabled}}<li role="menuitem"><a href="#" title="{{$contact_actions.update.title}}" onclick="window.location.href='{{$contact_actions.update.url}}'; return false;">{{$contact_actions.update.label}}</a></li>{{/if}} - <li class="divider"></li> - <li role="menuitem"><a href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li> - <li role="menuitem"><a href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li> - <li role="menuitem"><a href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li> - <li role="menuitem"><a href="#" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li> + <form action="contacts/{{$contact_id}}" method="post" > + <div id="contact-edit-links"> + <div id="contact-edit-status-wrapper"> + <span id="contact-edit-contact-status">{{$contact_status}}</span> + + {{* This is the Action menu where contact related actions like 'ignore', 'hide' can be performed *}} + <div id="contact-edit-actions"> + <a class="btn" id="contact-edit-actions-button">{{$contact_action_button}}</a> + + <ul role="menu" aria-haspopup="true" id="contact-actions-menu" class="menu-popup" > + {{if $lblsuggest}}<li role="menuitem"><a href="#" title="{{$contact_actions.suggest.title}}" onclick="window.location.href='{{$contact_actions.suggest.url}}'; return false;">{{$contact_actions.suggest.label}}</a></li>{{/if}} + {{if $poll_enabled}}<li role="menuitem"><a href="#" title="{{$contact_actions.update.title}}" onclick="window.location.href='{{$contact_actions.update.url}}'; return false;">{{$contact_actions.update.label}}</a></li>{{/if}} + <li class="divider"></li> + <li role="menuitem"><a href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li> + <li role="menuitem"><a href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li> + <li role="menuitem"><a href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li> + <li role="menuitem"><a href="#" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li> + </ul> + </div> + + {{* Block with status information about the contact *}} + <ul> + {{if $relation_text}}<li><div id="contact-edit-rel">{{$relation_text}}</div></li>{{/if}} + + {{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}} + {{/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 $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}} + {{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}} </ul> - </div> - {{* Block with status information about the contact *}} - <ul> - {{if $relation_text}}<li><div id="contact-edit-rel">{{$relation_text}}</div></li>{{/if}} + <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 *}} - {{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}} - {{/if}} - </li> + {{* Some information about the contact from the profile *}} + <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>{{* End of contact-edit-links *}} + + <div id="contact-edit-links-end"></div> + + <hr /> + + <h4 id="contact-edit-settings-label" class="fakelink" onclick="openClose('contact-edit-settings')">{{$contact_settings_label}}</h4> + <div id="contact-edit-settings"> + <input type="hidden" name="contact_id" value="{{$contact_id}}"> + + <div id="contact-edit-end" ></div> + {{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 }} {{include file="field_textarea.tpl" field=$ffi_keyword_blacklist}} {{/if}} {{/if}} + {{include file="field_checkbox.tpl" field=$hidden}} - {{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 $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 *}} - - {{* Some information about the contact from the profile *}} - <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>{{* End of contact-edit-links *}} - - <div id="contact-edit-links-end"></div> - - <hr /> - - <h4 id="contact-edit-settings-label" class="fakelink" onclick="openClose('contact-edit-settings')">{{$contact_settings_label}}</h4> - <div id="contact-edit-settings"> - <form action="contacts/{{$contact_id}}" method="post" > - <input type="hidden" name="contact_id" value="{{$contact_id}}"> - - <div id="contact-edit-end" ></div> - {{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 }} {{include file="field_textarea.tpl" field=$ffi_keyword_blacklist}} {{/if}} + <div id="contact-edit-info-wrapper"> + <h4>{{$lbl_info1}}</h4> + <textarea id="contact-edit-info" rows="8" cols="60" name="info">{{$info}}</textarea> + </div> + <div id="contact-edit-info-end"></div> + + {{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> {{/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|escape:'html'}}" /> </div> - <div id="contact-edit-info-end"></div> - {{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> + <input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" /> + + <div class="contact-edit-submit-end clearfix"></div> + + </form>{{* End of the form *}} </div>{{* End of contact-edit-nav-wrapper *}} </div> -- 2.39.5