clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2469 from rabuzarus/2004_rss_poll 

fix: contact edit poll_interval wasn't submitted
This commit is contained in:
Tobias Diekershoff 2016-04-20 15:47:05 +02:00
parent 8c8e635d2e 7ee9c536ee
commit f075c8d410
5 changed files with 163 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
view/global.css
View File

@ -452,4 +452,5 @@ td.federation-data {
#contact-edit-settings { #contact-edit-settings {
display: none; display: none;
margin: 10px 0;
} }

11
view/templates/contact_edit.tpl
View File

@ -8,6 +8,7 @@
<div id="contact-edit-nav-wrapper" > <div id="contact-edit-nav-wrapper" >
<form action="contacts/{{$contact_id}}" method="post" >
<div id="contact-edit-links"> <div id="contact-edit-links">
<div id="contact-edit-status-wrapper"> <div id="contact-edit-status-wrapper">
<span id="contact-edit-contact-status">{{$contact_status}}</span> <span id="contact-edit-contact-status">{{$contact_status}}</span>
@ -65,7 +66,6 @@
<h4 id="contact-edit-settings-label" class="fakelink" onclick="openClose('contact-edit-settings')">{{$contact_settings_label}}</h4> <h4 id="contact-edit-settings-label" class="fakelink" onclick="openClose('contact-edit-settings')">{{$contact_settings_label}}</h4>
<div id="contact-edit-settings"> <div id="contact-edit-settings">
<form action="contacts/{{$contact_id}}" method="post" >
<input type="hidden" name="contact_id" value="{{$contact_id}}"> <input type="hidden" name="contact_id" value="{{$contact_id}}">
<div id="contact-edit-end" ></div> <div id="contact-edit-end" ></div>
@ -79,7 +79,6 @@
<div id="contact-edit-info-wrapper"> <div id="contact-edit-info-wrapper">
<h4>{{$lbl_info1}}</h4> <h4>{{$lbl_info1}}</h4>
<textarea id="contact-edit-info" rows="8" cols="60" name="info">{{$info}}</textarea> <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>
<div id="contact-edit-info-end"></div> <div id="contact-edit-info-end"></div>
@ -90,9 +89,13 @@
</div> </div>
{{$profile_select}} {{$profile_select}}
<div id="contact-edit-profile-select-end"></div> <div id="contact-edit-profile-select-end"></div>
<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
{{/if}} {{/if}}
</form>
</div> </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>{{* End of contact-edit-nav-wrapper *}}
</div> </div>

4
view/theme/duepuntozero/style.css
View File

@ -1739,10 +1739,6 @@ blockquote.shared_content {
/*margin-left: 175px;*/ /*margin-left: 175px;*/
} }
.contact-edit-submit {
margin-top: 20px;
}
.contact-select { position: absolute; top: 64px; left:64px; display:none; } .contact-select { position: absolute; top: 64px; left:64px; display:none; }
.contact-select:checked, .contact-select:checked,
.contact-entry-photo:hover .contact-select { display:block; } .contact-entry-photo:hover .contact-select { display:block; }

4
view/theme/vier/style.css
View File

@ -2986,10 +2986,6 @@ a.mail-list-link {
list-style-type: none; list-style-type: none;
} }
#contact-edit-settings {
margin-top: 10px;
}
a.btn#contact-edit-actions-button { a.btn#contact-edit-actions-button {
cursor: pointer; cursor: pointer;
border-radius: 3px; border-radius: 3px;

11
view/theme/vier/templates/contact_edit.tpl
View File

@ -8,6 +8,7 @@
<div id="contact-edit-nav-wrapper" > <div id="contact-edit-nav-wrapper" >
<form action="contacts/{{$contact_id}}" method="post" >
<div id="contact-edit-links"> <div id="contact-edit-links">
<div id="contact-edit-status-wrapper"> <div id="contact-edit-status-wrapper">
<span id="contact-edit-contact-status">{{$contact_status}}</span> <span id="contact-edit-contact-status">{{$contact_status}}</span>
@ -65,7 +66,6 @@
<h4 id="contact-edit-settings-label" class="fakelink" onclick="openClose('contact-edit-settings')">{{$contact_settings_label}}</h4> <h4 id="contact-edit-settings-label" class="fakelink" onclick="openClose('contact-edit-settings')">{{$contact_settings_label}}</h4>
<div id="contact-edit-settings"> <div id="contact-edit-settings">
<form action="contacts/{{$contact_id}}" method="post" >
<input type="hidden" name="contact_id" value="{{$contact_id}}"> <input type="hidden" name="contact_id" value="{{$contact_id}}">
<div id="contact-edit-end" ></div> <div id="contact-edit-end" ></div>
@ -79,7 +79,6 @@
<div id="contact-edit-info-wrapper"> <div id="contact-edit-info-wrapper">
<h4>{{$lbl_info1}}</h4> <h4>{{$lbl_info1}}</h4>
<textarea id="contact-edit-info" rows="8" cols="60" name="info">{{$info}}</textarea> <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>
<div id="contact-edit-info-end"></div> <div id="contact-edit-info-end"></div>
@ -90,9 +89,13 @@
</div> </div>
{{$profile_select}} {{$profile_select}}
<div id="contact-edit-profile-select-end"></div> <div id="contact-edit-profile-select-end"></div>
<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
{{/if}} {{/if}}
</form>
</div> </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>{{* End of contact-edit-nav-wrapper *}}
</div> </div>