Replace remaining "admin" instances in moderation templates

diff --git a/view/templates/moderation/aside.tpl b/view/templates/moderation/aside.tpl
index 38f53927321a42c0778765407800ad8f0f600c0f..7217ba71e38b922727fa0327e7c50be52bbd2adf 100644 (file)
--- a/view/templates/moderation/aside.tpl
+++ b/view/templates/moderation/aside.tpl
@@ -1,7 +1,6 @@
 <script>
        // update pending count //
        $(function(){
-
                $("nav").bind('nav-update',  function(e,data){
                        var elm = $('#pending-update');
                        var register = $(data).find('register').html();
@@ -15,7 +14,7 @@
 <h4>{{$page.0}}</h4>
 <ul class="admin linklist" role="menu">
 {{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}}
 </ul>
 {{/foreach}}

diff --git a/view/templates/moderation/blocklist/contact.tpl b/view/templates/moderation/blocklist/contact.tpl
index f12eed7a5f8ddb7d045e3615224406ad570243fd..86fbf44e83b696c293bf6a54c440d791bb426c5d 100644 (file)
--- a/view/templates/moderation/blocklist/contact.tpl
+++ b/view/templates/moderation/blocklist/contact.tpl
@@ -11,7 +11,7 @@
 <div id="adminpage">
        <h1>{{$title}} - {{$page}}</h1>
        <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}}">
 
                <h3>{{$h_contacts}}</h3>
@@ -50,7 +50,7 @@
        </form>
 
        <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}}">
                <table id="contactblock">
                        <tbody>
@@ -64,4 +64,3 @@
                <div class="submit"><input type="submit" name="page_contactblock_block" value="{{$submit}}" /></div>
        </form>
 </div>
-

diff --git a/view/templates/moderation/blocklist/server/add.tpl b/view/templates/moderation/blocklist/server/add.tpl
index 999965d55c905c975c21d73f0e2d8a8766104b5a..32044948383f3ad02ea0d76e09022f613939a452 100644 (file)
--- a/view/templates/moderation/blocklist/server/add.tpl
+++ b/view/templates/moderation/blocklist/server/add.tpl
@@ -1,9 +1,9 @@
 <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>
        {{$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}}
                <div class="submit">
                        <button type="submit" class="btn btn-primary">{{$l10n.submit}}</button>
@@ -11,7 +11,7 @@
        </form>
 {{if $pattern}}
        <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="pattern" value="{{$pattern}}">
                <table class="table table-condensed table-striped table-bordered">

diff --git a/view/templates/moderation/blocklist/server/import.tpl b/view/templates/moderation/blocklist/server/import.tpl
index cdce2146351fcdb45eaf8aab74dc440c97dcc1eb..0729ce0e15cf631acf9b0e0a3ad1270b6bcd6708 100644 (file)
--- a/view/templates/moderation/blocklist/server/import.tpl
+++ b/view/templates/moderation/blocklist/server/import.tpl
@@ -1,10 +1,10 @@
 <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>
 {{if !$blocklist}}
     {{$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}}">
         {{include file="field_input.tpl" field=$listfile}}
                <div class="submit">
@@ -13,7 +13,7 @@
        </form>
 {{else}}
        <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="blocklist" value="{{$blocklist|json_encode}}">
                <table class="table table-condensed table-striped table-bordered">

diff --git a/view/templates/moderation/blocklist/server/index.tpl b/view/templates/moderation/blocklist/server/index.tpl
index bfb269ebbe3c9eb1b18c34ef7316dd37f24c86c9..40472adb4da66f61107ac4a5432b0a80893453ad 100644 (file)
--- a/view/templates/moderation/blocklist/server/index.tpl
+++ b/view/templates/moderation/blocklist/server/index.tpl
@@ -11,7 +11,7 @@
        <h2>{{$l10n.importtitle}}</h2>
     {{$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}}">
         {{include file="field_input.tpl" field=$listfile}}
                <div class="submit">
@@ -21,7 +21,7 @@
 
        <h2>{{$l10n.addtitle}}</h2>
     {{$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}}
                <div class="submit">
                        <button type="submit" class="btn btn-primary">{{$l10n.addsubmit}}</button>
@@ -30,7 +30,7 @@
 
        {{if $entries}}
        <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}}">
                {{foreach $entries as $e}}
                        {{include file="field_input.tpl" field=$e.domain}}

diff --git a/view/templates/moderation/item/delete.tpl b/view/templates/moderation/item/delete.tpl
index 497b77677aef051eb6910d450b6878ec5832d411..fc2c4f561f64ba6cfe5a33e8c445cd62264b6d41 100644 (file)
--- a/view/templates/moderation/item/delete.tpl
+++ b/view/templates/moderation/item/delete.tpl
@@ -3,7 +3,7 @@
        <p>{{$intro1}}</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}}">
                {{include file="field_input.tpl" field=$deleteitemguid}}
                <div class="submit"><input type="submit" name="page_deleteitem_submit" value="{{$submit}}" /></div>

diff --git a/view/templates/moderation/summary.tpl b/view/templates/moderation/summary.tpl
index 8769dcd0576a2201575187e1d7a732f908eb4bbc..5869631311d569a2e38a7aacd064c1e3062f5ec1 100644 (file)
--- a/view/templates/moderation/summary.tpl
+++ b/view/templates/moderation/summary.tpl
@@ -1,5 +1,5 @@
 
-<div id='adminpage'>
+<div id="adminpage">
        <h1>{{$title}} - {{$page}}</h1>
 
        <dl>

diff --git a/view/theme/frio/templates/moderation/blocklist/contact.tpl b/view/theme/frio/templates/moderation/blocklist/contact.tpl
index e6acce2e9d2fd6e2a9ef5d3fce9f0ea9ce422bd6..62de27774d312521e5c17559a23b33b5c90ccb6e 100644 (file)
--- a/view/theme/frio/templates/moderation/blocklist/contact.tpl
+++ b/view/theme/frio/templates/moderation/blocklist/contact.tpl
@@ -18,7 +18,7 @@
                        </div>
 
                        <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}}">
 
                                        {{include file="field_input.tpl" field=$contacturl}}
@@ -44,7 +44,7 @@
                        </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">
-                               <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}}">
 
                                        {{if $contacts}}