Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2
Fixed some stuff: - converted some files from DOS to Uni* (CRLF -> LF) - removed trailing white-spaces Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
commit
7a9456d5ac
350 changed files with 19367 additions and 16093 deletions
33
view/templates/admin_blocklist.tpl
Normal file
33
view/templates/admin_blocklist.tpl
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
<script>
|
||||
function confirm_delete(uname){
|
||||
return confirm("{{$confirm_delete}}".format(uname));
|
||||
}
|
||||
</script>
|
||||
<div id="adminpage">
|
||||
<h1>{{$title}} - {{$page}}</h1>
|
||||
<p>{{$intro}}</p>
|
||||
<p>{{$public}}</p>
|
||||
|
||||
<h2>{{$addtitle}}</h2>
|
||||
<form action="{{$baseurl}}/admin/blocklist" method="post">
|
||||
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
|
||||
{{include file="field_input.tpl" field=$newdomain}}
|
||||
{{include file="field_input.tpl" field=$newreason}}
|
||||
<div class="submit"><input type="submit" name="page_blocklist_save" value="{{$submit}}" /></div>
|
||||
</form>
|
||||
|
||||
{{if $entries}}
|
||||
<h2>{{$currenttitle}}</h2>
|
||||
<p>{{$currentintro}}</p>
|
||||
<form action="{{$baseurl}}/admin/blocklist" method="post">
|
||||
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
|
||||
{{foreach $entries as $e}}
|
||||
{{include file="field_input.tpl" field=$e.domain}}
|
||||
{{include file="field_input.tpl" field=$e.reason}}
|
||||
{{include file="field_checkbox.tpl" field=$e.delete}}
|
||||
{{/foreach}}
|
||||
<div class="submit"><input type="submit" name="page_blocklist_edit" value="{{$savechanges}}" /></div>
|
||||
{{/if}}
|
||||
</form>
|
||||
|
||||
</div>
|
||||
|
|
@ -118,7 +118,6 @@
|
|||
{{include file="field_input.tpl" field=$proxy}}
|
||||
{{include file="field_input.tpl" field=$proxyuser}}
|
||||
{{include file="field_input.tpl" field=$timeout}}
|
||||
{{include file="field_input.tpl" field=$maxloadavg}}
|
||||
{{include file="field_input.tpl" field=$maxloadavg_frontend}}
|
||||
{{include file="field_input.tpl" field=$optimize_max_tablesize}}
|
||||
{{include file="field_input.tpl" field=$optimize_fragmentation}}
|
||||
|
|
@ -146,6 +145,8 @@
|
|||
<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
|
||||
|
||||
<h3>{{$worker_title}}</h3>
|
||||
{{include file="field_input.tpl" field=$maxloadavg}}
|
||||
{{include file="field_input.tpl" field=$min_memory}}
|
||||
{{include file="field_input.tpl" field=$worker_queues}}
|
||||
{{include file="field_checkbox.tpl" field=$worker_dont_fork}}
|
||||
{{include file="field_checkbox.tpl" field=$worker_fastlane}}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
|
||||
<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" >
|
||||
<a href="group/drop/{{$id}}?t={{$form_security_token}}"
|
||||
onclick="return confirmDelete();"
|
||||
id="group-delete-icon-{{$id}}"
|
||||
class="icon drophide group-delete-icon"
|
||||
onmouseover="imgbright(this);"
|
||||
onmouseout="imgdull(this);" ></a>
|
||||
<a href="group/drop/{{$id}}?t={{$form_security_token}}"
|
||||
onclick="return confirmDelete();"
|
||||
id="group-delete-icon-{{$id}}"
|
||||
class="icon drophide group-delete-icon"
|
||||
onmouseover="imgbright(this);"
|
||||
onmouseout="imgdull(this);"
|
||||
title="{{$delete}}">
|
||||
</a>
|
||||
</div>
|
||||
<div class="group-delete-end"></div>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,61 @@
|
|||
|
||||
{{* Template for the contact group list *}}
|
||||
|
||||
{{* The contacts who are already members of the contact group *}}
|
||||
<div id="group">
|
||||
<h3>{{$groupeditor.label_members}}</h3>
|
||||
<div id="group-members" class="contact_list">
|
||||
{{if $groupeditor.members }}
|
||||
{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
|
||||
{{else}}
|
||||
{{$groupeditor.group_is_empty}}
|
||||
{{/if}}
|
||||
</div>
|
||||
<div id="group-members-end"></div>
|
||||
<hr id="group-separator" />
|
||||
<h3>{{$groupeditor.label_members}}</h3>
|
||||
<div id="group-members" class="contact_list">
|
||||
|
||||
{{if $groupeditor.members }}
|
||||
|
||||
{{foreach $groupeditor.members as $c}}
|
||||
{{* If there are too many contacts we use another view mode *}}
|
||||
{{if $shortmode}}
|
||||
<div class="contact-block-textdiv mpgroup">
|
||||
<a class="contact-block-link mpgroup fakelink" target="redir" onclick="groupChangeMember({{$c.change_member.gid}},{{$c.change_member.cid}},'{{$c.change_member.sec_token}}'); return true;" title="{{$c.name}} [{{$c.itemurl}}]" alt="{{$c.name}}">
|
||||
{{$c.name}}"
|
||||
</a>
|
||||
</div>
|
||||
{{else}}
|
||||
{{* The normal view mode *}}
|
||||
<div class="contact-block-div mpgroup">
|
||||
<a class="contact-block-link mpgroup fakelink" target="redir" onclick="groupChangeMember({{$c.change_member.gid}},{{$c.change_member.cid}},'{{$c.change_member.sec_token}}'); return true;">
|
||||
<img class="contact-block-img mpgroup " src="{{$c.thumb}}" title="{{$c.name}} [{{$c.itemurl}}]" alt="{{$c.name}}">
|
||||
</a>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
|
||||
{{else}}
|
||||
{{$groupeditor.group_is_empty}}
|
||||
{{/if}}
|
||||
</div>
|
||||
|
||||
<div id="group-members-end"></div>
|
||||
<hr id="group-separator" />
|
||||
</div>
|
||||
|
||||
{{* The contacts who are not members of the contact group *}}
|
||||
<div id="contacts">
|
||||
<h3>{{$groupeditor.label_contacts}}</h3>
|
||||
<div id="group-all-contacts" class="contact_list">
|
||||
{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
|
||||
</div>
|
||||
<div id="group-all-contacts-end"></div>
|
||||
<h3>{{$groupeditor.label_contacts}}</h3>
|
||||
<div id="group-all-contacts" class="contact_list">
|
||||
{{foreach $groupeditor.contacts as $m}}
|
||||
{{* If there are too many contacts we use another view mode *}}
|
||||
{{if $shortmode}}
|
||||
<div class="contact-block-textdiv mpall">
|
||||
<a class="contact-block-link mpall fakelink" target="redir" onclick="groupChangeMember({{$m.change_member.gid}},{{$m.change_member.cid}},'{{$m.change_member.sec_token}}'); return true;" title="{{$m.name}} [{{$m.itemurl}}]" alt="{{$m.name}}">
|
||||
{{$m.name}}
|
||||
</a>
|
||||
</div>
|
||||
{{else}}
|
||||
{{* The normal view mode *}}
|
||||
<div class="contact-block-div mpall">
|
||||
<a class="contact-block-link mpall fakelink" target="redir" onclick="groupChangeMember({{$m.change_member.gid}},{{$m.change_member.cid}},'{{$m.change_member.sec_token}}'); return true;">
|
||||
<img class="contact-block-img mpall " src="{{$m.thumb}}" title="{{$m.name}} [{{$m.itemurl}}]" alt="{{$m.name}}">
|
||||
</a>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
</div>
|
||||
<div id="group-all-contacts-end"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div>
|
||||
<form class="intro-form" action="notifications/{{$intro_id}}" method="post">
|
||||
<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore|escape:'html'}}" />
|
||||
<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard|escape:'html'}}" />
|
||||
{{if $discard}}<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard|escape:'html'}}" />{{/if}}
|
||||
</form>
|
||||
<div class="intro-form-end"></div>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue