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

Merge pull request #12150 from MrPetovan/bug/moderation 

Replace remaining "admin" instances in moderation templates
This commit is contained in:
Philipp 2022-11-09 14:31:14 +01:00 committed by GitHub
parent 55365aa4da cb5e18838c
commit d6e12d412b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
view/templates/moderation/aside.tpl
View File

@ -1,7 +1,6 @@
<script> <script>
// update pending count // // update pending count //
$(function(){ $(function(){
$("nav").bind('nav-update', function(e,data){ $("nav").bind('nav-update', function(e,data){
var elm = $('#pending-update'); var elm = $('#pending-update');
var register = $(data).find('register').html(); var register = $(data).find('register').html();
@ -15,7 +14,7 @@
<h4>{{$page.0}}</h4> <h4>{{$page.0}}</h4>
<ul class="admin linklist" role="menu"> <ul class="admin linklist" role="menu">
{{foreach $page.1 as $item}} {{foreach $page.1 as $item}}
<li class='admin link button {{$item.2}}' role="menuitem"><a href='{{$item.0}}'>{{$item.1}}</a></li> <li class="admin link button {{$item.2}}" role="menuitem"><a href="{{$item.0}}">{{$item.1}}</a></li>
{{/foreach}} {{/foreach}}
</ul> </ul>
{{/foreach}} {{/foreach}}

5
view/templates/moderation/blocklist/contact.tpl
View File

@ -11,7 +11,7 @@
<div id="adminpage"> <div id="adminpage">
<h1>{{$title}} - {{$page}}</h1> <h1>{{$title}} - {{$page}}</h1>
<p>{{$description nofilter}}</p> <p>{{$description nofilter}}</p>
<form action="{{$baseurl}}/admin/blocklist/contact" method="post"> <form action="{{$baseurl}}/moderation/blocklist/contact" method="post">
<input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
<h3>{{$h_contacts}}</h3> <h3>{{$h_contacts}}</h3>
@ -50,7 +50,7 @@
</form> </form>
<h3>{{$h_newblock}}</h3> <h3>{{$h_newblock}}</h3>
<form action="{{$baseurl}}/admin/blocklist/contact" method="post"> <form action="{{$baseurl}}/moderation/blocklist/contact" method="post">
<input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
<table id="contactblock"> <table id="contactblock">
<tbody> <tbody>
@ -64,4 +64,3 @@
<div class="submit"><input type="submit" name="page_contactblock_block" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_contactblock_block" value="{{$submit}}" /></div>
</form> </form>
</div> </div>

6
view/templates/moderation/blocklist/server/add.tpl
View File

@ -1,9 +1,9 @@
<div id="adminpage"> <div id="adminpage">
<p><a href="{{$baseurl}}/admin/blocklist/server">{{$l10n.return_list}}</a></p> <p><a href="{{$baseurl}}/moderation/blocklist/server">{{$l10n.return_list}}</a></p>
<h1>{{$l10n.title}} - {{$l10n.page}}</h1> <h1>{{$l10n.title}} - {{$l10n.page}}</h1>
{{$l10n.syntax nofilter}} {{$l10n.syntax nofilter}}
<form action="{{$baseurl}}/admin/blocklist/server/add" method="get"> <form action="{{$baseurl}}/moderation/blocklist/server/add" method="get">
{{include file="field_input.tpl" field=$newdomain}} {{include file="field_input.tpl" field=$newdomain}}
<div class="submit"> <div class="submit">
<button type="submit" class="btn btn-primary">{{$l10n.submit}}</button> <button type="submit" class="btn btn-primary">{{$l10n.submit}}</button>
@ -11,7 +11,7 @@
</form> </form>
{{if $pattern}} {{if $pattern}}
<h2>{{$l10n.matching_servers}}</h2> <h2>{{$l10n.matching_servers}}</h2>
<form action="{{$baseurl}}/admin/blocklist/server/add" method="post"> <form action="{{$baseurl}}/moderation/blocklist/server/add" method="post">
<input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
<input type="hidden" name="pattern" value="{{$pattern}}"> <input type="hidden" name="pattern" value="{{$pattern}}">
<table class="table table-condensed table-striped table-bordered"> <table class="table table-condensed table-striped table-bordered">

6
view/templates/moderation/blocklist/server/import.tpl
View File

@ -1,10 +1,10 @@
<div id="adminpage"> <div id="adminpage">
<p><a href="{{$baseurl}}/admin/blocklist/server">{{$l10n.return_list}}</a></p> <p><a href="{{$baseurl}}/moderation/blocklist/server">{{$l10n.return_list}}</a></p>
<h1>{{$l10n.title}} - {{$l10n.page}}</h1> <h1>{{$l10n.title}} - {{$l10n.page}}</h1>
{{if !$blocklist}} {{if !$blocklist}}
{{$l10n.download nofilter}} {{$l10n.download nofilter}}
<form action="{{$baseurl}}/admin/blocklist/server/import" method="post" enctype="multipart/form-data"> <form action="{{$baseurl}}/moderation/blocklist/server/import" method="post" enctype="multipart/form-data">
<input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
{{include file="field_input.tpl" field=$listfile}} {{include file="field_input.tpl" field=$listfile}}
<div class="submit"> <div class="submit">
@ -13,7 +13,7 @@
</form> </form>
{{else}} {{else}}
<h2>{{$l10n.patterns}}</h2> <h2>{{$l10n.patterns}}</h2>
<form action="{{$baseurl}}/admin/blocklist/server/import" method="post"> <form action="{{$baseurl}}/moderation/blocklist/server/import" method="post">
<input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
<input type="hidden" name="blocklist" value="{{$blocklist|json_encode}}"> <input type="hidden" name="blocklist" value="{{$blocklist|json_encode}}">
<table class="table table-condensed table-striped table-bordered"> <table class="table table-condensed table-striped table-bordered">

6
view/templates/moderation/blocklist/server/index.tpl
View File

@ -11,7 +11,7 @@
<h2>{{$l10n.importtitle}}</h2> <h2>{{$l10n.importtitle}}</h2>
{{$l10n.download nofilter}} {{$l10n.download nofilter}}
<form action="{{$baseurl}}/admin/blocklist/server/import" method="post" enctype="multipart/form-data"> <form action="{{$baseurl}}/moderation/blocklist/server/import" method="post" enctype="multipart/form-data">
<input type="hidden" name="form_security_token" value="{{$form_security_token_import}}"> <input type="hidden" name="form_security_token" value="{{$form_security_token_import}}">
{{include file="field_input.tpl" field=$listfile}} {{include file="field_input.tpl" field=$listfile}}
<div class="submit"> <div class="submit">
@ -21,7 +21,7 @@
<h2>{{$l10n.addtitle}}</h2> <h2>{{$l10n.addtitle}}</h2>
{{$l10n.syntax nofilter}} {{$l10n.syntax nofilter}}
<form action="{{$baseurl}}/admin/blocklist/server/add" method="get"> <form action="{{$baseurl}}/moderation/blocklist/server/add" method="get">
{{include file="field_input.tpl" field=$newdomain}} {{include file="field_input.tpl" field=$newdomain}}
<div class="submit"> <div class="submit">
<button type="submit" class="btn btn-primary">{{$l10n.addsubmit}}</button> <button type="submit" class="btn btn-primary">{{$l10n.addsubmit}}</button>
@ -30,7 +30,7 @@
{{if $entries}} {{if $entries}}
<h2>{{$l10n.currenttitle}}</h2> <h2>{{$l10n.currenttitle}}</h2>
<form action="{{$baseurl}}/admin/blocklist/server" method="post"> <form action="{{$baseurl}}/moderation/blocklist/server" method="post">
<input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
{{foreach $entries as $e}} {{foreach $entries as $e}}
{{include file="field_input.tpl" field=$e.domain}} {{include file="field_input.tpl" field=$e.domain}}

2
view/templates/moderation/item/delete.tpl
View File

@ -3,7 +3,7 @@
<p>{{$intro1}}</p> <p>{{$intro1}}</p>
<p>{{$intro2}}</p> <p>{{$intro2}}</p>
<form action="{{$baseurl}}/admin/item/delete" method="post"> <form action="{{$baseurl}}/moderation/item/delete" method="post">
<input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
{{include file="field_input.tpl" field=$deleteitemguid}} {{include file="field_input.tpl" field=$deleteitemguid}}
<div class="submit"><input type="submit" name="page_deleteitem_submit" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_deleteitem_submit" value="{{$submit}}" /></div>

2
view/templates/moderation/summary.tpl
View File

@ -1,5 +1,5 @@
<div id='adminpage'> <div id="adminpage">
<h1>{{$title}} - {{$page}}</h1> <h1>{{$title}} - {{$page}}</h1>
<dl> <dl>

4
view/theme/frio/templates/moderation/blocklist/contact.tpl
View File

@ -18,7 +18,7 @@
</div> </div>
<div id="admin-settings-contactblock-block-collapse" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-contactblock-block"> <div id="admin-settings-contactblock-block-collapse" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-contactblock-block">
<form action="{{$baseurl}}/admin/blocklist/contact" method="post"> <form action="{{$baseurl}}/moderation/blocklist/contact" method="post">
<input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
{{include file="field_input.tpl" field=$contacturl}} {{include file="field_input.tpl" field=$contacturl}}
@ -44,7 +44,7 @@
</div> </div>
<div id="admin-settings-contactblock-blocked-collapse" class="panel-body panel-collapse collapse {{if count($contacts) > 0}}in{{/if}}" role="tabpanel" aria-labelledby="admin-settings-contactblock-blocked"> <div id="admin-settings-contactblock-blocked-collapse" class="panel-body panel-collapse collapse {{if count($contacts) > 0}}in{{/if}}" role="tabpanel" aria-labelledby="admin-settings-contactblock-blocked">
<form action="{{$baseurl}}/admin/blocklist/contact" method="post"> <form action="{{$baseurl}}/moderation/blocklist/contact" method="post">
<input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
{{if $contacts}} {{if $contacts}}