provide/fix adminpage div container for all admin pages

diff --git a/view/templates/admin/deleteitem.tpl b/view/templates/admin/deleteitem.tpl
index cf819de..f5abc96 100644 (file)
--- a/view/templates/admin/deleteitem.tpl
+++ b/view/templates/admin/deleteitem.tpl
@@ -2,10 +2,11 @@
        <h1>{{$title}} - {{$page}}</h1>
        <p>{{$intro1}}</p>
        <p>{{$intro2}}</p>
-</div>
 
-<form action="{{$baseurl}}/admin/deleteitem" 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>
-</form>
+       <form action="{{$baseurl}}/admin/deleteitem" 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>
+       </form>
+
+</div>

diff --git a/view/templates/admin/federation.tpl b/view/templates/admin/federation.tpl
index 193eefb..bd2af3d 100644 (file)
--- a/view/templates/admin/federation.tpl
+++ b/view/templates/admin/federation.tpl
@@ -1,118 +1,123 @@
 <script src="{{$baseurl}}/vendor/asset/Chart-js/dist/Chart.min.js"></script>
 <div id="adminpage">
-    <h1>{{$title}} - {{$page}}</h1>
-    <canvas id="FederationChart" class="federation-graph" width="320" height="320"></canvas>
-    <p>{{$intro}}</p>
-    {{if not $autoactive}}
-    <p class="error-message">{{$hint}}</p>
-    {{/if}}
-    <p>{{$legendtext}}</p>
-    <ul>
-        {{foreach $counts as $c}}
-        {{if $c[0]['total'] > 0}}
-        <li>{{$c[0]['platform']}} ({{$c[0]['total']}}/{{$c[0]['users']}})</li>
-            {{/if}}
-            {{/foreach}}
-    </ul>
-</div>
-<script>
-var FedData = {
-    datasets: [{
-        data: [
-    {{foreach $counts as $c}}
-            {{$c[0]['total']}},
-    {{/foreach}}
-        ],
-        backgroundColor: [
-{{foreach $counts as $c}}
-            '{{$c[3]}}',
-{{/foreach}}
-        ],
-        hoverBackgroundColor: [
-{{foreach $counts as $c}}
-            '#EE90A1',
-{{/foreach}}
-        ]
-    }],
-    labels: [
-{{foreach $counts as $c}}
-        "{{$c[0]['platform']}}",
-{{/foreach}}
-    ]
-};
-var ctx = document.getElementById("FederationChart").getContext("2d");
-var myDoughnutChart = new Chart(ctx, {
-    type: 'doughnut',
-    data: FedData,
-    options: {
-        legend: {display: false},
-        animation: {animateRotate: false},
-        responsive: false
-    }
-});
-</script>
+       <h1>{{$title}} - {{$page}}</h1>
+
+       <canvas id="FederationChart" class="federation-graph" width="320" height="320"></canvas>
+       <p>{{$intro}}</p>
+
+       {{if not $autoactive}}
+       <p class="error-message">{{$hint}}</p>
+       {{/if}}
+
+       <p>{{$legendtext}}</p>
 
-<table id="federation-stats">
-{{foreach $counts as $c}}
-    {{if $c[0]['total'] > 0}}
-    <tr>
-        <th>{{$c[0]['platform']}}</th>
-        <th><strong>{{$c[0]['total']}}</strong></td>
-        <td>{{$c[0]['network']}}</td>
-    </tr>
-    <tr>
-        <td colspan="3" class="federation-data">
-            <canvas id="{{$c[2]}}Chart" class="federation-network-graph" width="240" height="240"></canvas>
-            <script>
-var {{$c[2]}}data = {
-    datasets: [{
-        data: [
-        {{foreach $c[1] as $v}}
-            {{$v['total']}},
-        {{/foreach}}
-        ],
-        backgroundColor: [
-        {{foreach $c[1] as $v}}
-            '{{$c[3]}}',
-        {{/foreach}}
-        ],
-        hoverBackgroundColor: [
-        {{foreach $c[1] as $v}}
-            '#EE90A1',
-        {{/foreach}}
-        ]
-    }],
-    labels: [
-        {{foreach $c[1] as $v}}
-        '{{$v['version']}}',
-        {{/foreach}}
-    ]
-};
-var ctx = document.getElementById("{{$c[2]}}Chart").getContext("2d");
-var my{{$c[2]}}DoughnutChart = new Chart(ctx, {
-    type: 'doughnut',
-    data: {{$c[2]}}data,
-    options: {
-    legend: {display: false},
-        animation: {animateRotate: false},
-        responsive: false
-    }
-});
-            </script>
-            <ul class="federation-stats">
-        {{foreach $c[1] as $v}}
-                <li>
-            {{if ($c[0]['platform']==='Friendica' and  $version===$v['version']) }}
-                    <span class="version-match">{{$v['version']}}</span>
-            {{else}}
-                    {{$v['version']}}
-            {{/if}}
-                    ({{$v['total']}})
-                </li>
-        {{/foreach}}
-            </ul>
-        </td>
-    </tr>
-    {{/if}}
-{{/foreach}}
-</table>
+       <ul>
+               {{foreach $counts as $c}}
+                       {{if $c[0]['total'] > 0}}
+                       <li>{{$c[0]['platform']}} ({{$c[0]['total']}}/{{$c[0]['users']}})</li>
+                       {{/if}}
+               {{/foreach}}
+       </ul>
+
+       <script>
+       var FedData = {
+               datasets: [{
+                       data: [
+                               {{foreach $counts as $c}}
+                                       {{$c[0]['total']}},
+                               {{/foreach}}
+                       ],
+                       backgroundColor: [
+                               {{foreach $counts as $c}}
+                                       '{{$c[3]}}',
+                               {{/foreach}}
+                               ],
+                       hoverBackgroundColor: [
+                               {{foreach $counts as $c}}
+                                       '#EE90A1',
+                               {{/foreach}}
+                       ]
+               }],
+               labels: [
+                       {{foreach $counts as $c}}
+                               "{{$c[0]['platform']}}",
+                       {{/foreach}}
+               ]
+       };
+       var ctx = document.getElementById("FederationChart").getContext("2d");
+       var myDoughnutChart = new Chart(ctx, {
+               type: 'doughnut',
+               data: FedData,
+               options: {
+                   legend: {display: false},
+                   animation: {animateRotate: false},
+                   responsive: false
+               }
+       });
+       </script>
+
+       <table id="federation-stats">
+       {{foreach $counts as $c}}
+               {{if $c[0]['total'] > 0}}
+               <tr>
+                       <th>{{$c[0]['platform']}}</th>
+                       <th><strong>{{$c[0]['total']}}</strong></td>
+                       <td>{{$c[0]['network']}}</td>
+               </tr>
+               <tr>
+                       <td colspan="3" class="federation-data">
+                               <canvas id="{{$c[2]}}Chart" class="federation-network-graph" width="240" height="240"></canvas>
+                               <script>
+                                       var {{$c[2]}}data = {
+                                               datasets: [{
+                                                       data: [
+                                                       {{foreach $c[1] as $v}}
+                                                               {{$v['total']}},
+                                                       {{/foreach}}
+                                                       ],
+                                                       backgroundColor: [
+                                                       {{foreach $c[1] as $v}}
+                                                               '{{$c[3]}}',
+                                                       {{/foreach}}
+                                                       ],
+                                                       hoverBackgroundColor: [
+                                                       {{foreach $c[1] as $v}}
+                                                               '#EE90A1',
+                                                       {{/foreach}}
+                                                       ]
+                                               }],
+                                               labels: [
+                                                       {{foreach $c[1] as $v}}
+                                                               '{{$v['version']}}',
+                                                       {{/foreach}}
+                                               ]
+                                       };
+                                       var ctx = document.getElementById("{{$c[2]}}Chart").getContext("2d");
+                                       var my{{$c[2]}}DoughnutChart = new Chart(ctx, {
+                                               type: 'doughnut',
+                                               data: {{$c[2]}}data,
+                                               options: {
+                                               legend: {display: false},
+                                                       animation: {animateRotate: false},
+                                                       responsive: false
+                                               }
+                                       });
+                               </script>
+                               <ul class="federation-stats">
+                               {{foreach $c[1] as $v}}
+                                       <li>
+                                               {{if ($c[0]['platform']==='Friendica' and  $version===$v['version']) }}
+                                               <span class="version-match">{{$v['version']}}</span>
+                                               {{else}}
+                                               {{$v['version']}}
+                                               {{/if}}
+                                               ({{$v['total']}})
+                                       </li>
+                               {{/foreach}}
+                               </ul>
+                       </td>
+               </tr>
+               {{/if}}
+       {{/foreach}}
+       </table>
+</div>

diff --git a/view/templates/admin/settings_features.tpl b/view/templates/admin/settings_features.tpl
index abcc527..d2bd35e 100644 (file)
--- a/view/templates/admin/settings_features.tpl
+++ b/view/templates/admin/settings_features.tpl
@@ -1,21 +1,24 @@
-<h1>{{$title}}</h1>
 
-<form action="admin/features" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+<div id="adminpage">
+       <h1>{{$title}}</h1>
 
-{{foreach $features as $g => $f}}
-<h3 class="settings-heading"><a href="javascript:;">{{$f.0}}</a></h3>
+       <form action="admin/features" method="post" autocomplete="off">
+       <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-<div class="settings-content-block">
-       {{foreach $f.1 as $fcat}}
-               {{include file="field_yesno.tpl" field=$fcat.0}}
-               {{include file="field_yesno.tpl" field=$fcat.1}}
-       {{/foreach}}
+       {{foreach $features as $g => $f}}
+       <h3 class="settings-heading"><a href="javascript:;">{{$f.0}}</a></h3>
+
+       <div class="settings-content-block">
+               {{foreach $f.1 as $fcat}}
+                       {{include file="field_yesno.tpl" field=$fcat.0}}
+                       {{include file="field_yesno.tpl" field=$fcat.1}}
+               {{/foreach}}
 
-       <div class="settings-submit-wrapper" >
-               <input type="submit" name="submit" class="settings-features-submit" value="{{$submit|escape:'html'}}" />
+               <div class="settings-submit-wrapper" >
+                       <input type="submit" name="submit" class="settings-features-submit" value="{{$submit|escape:'html'}}" />
+               </div>
        </div>
-</div>
-{{/foreach}}
+       {{/foreach}}
 
-</form>
+       </form>
+</div>

diff --git a/view/templates/failed_updates.tpl b/view/templates/failed_updates.tpl
index 8e949ed..2fd6c3d 100644 (file)
--- a/view/templates/failed_updates.tpl
+++ b/view/templates/failed_updates.tpl
@@ -1,18 +1,19 @@
 
-<h2>{{$banner}}</h2>
+<div id="adminpage">
+       <h2>{{$banner}}</h2>
 
-<div id="failed_updates_desc">{{$desc}}</div>
+       <div id="failed_updates_desc">{{$desc}}</div>
 
-{{if $failed}}
-{{foreach $failed as $f}}
+       {{if $failed}}
+       {{foreach $failed as $f}}
+               <h4>{{$f}}</h4>
 
-<h4>{{$f}}</h4>
-<ul>
-<li><a href="{{$base}}/admin/dbsync/mark/{{$f}}">{{$mark}}</a></li>
-<li><a href="{{$base}}/admin/dbsync/{{$f}}">{{$apply}}</a></li>
-</ul>
-
-<hr />
-{{/foreach}}
-{{/if}}
+               <ul>
+                       <li><a href="{{$base}}/admin/dbsync/mark/{{$f}}">{{$mark}}</a></li>
+                       <li><a href="{{$base}}/admin/dbsync/{{$f}}">{{$apply}}</a></li>
+               </ul>
 
+               <hr />
+       {{/foreach}}
+       {{/if}}
+</div>

diff --git a/view/templates/structure_check.tpl b/view/templates/structure_check.tpl
index b3774ea..7193d38 100644 (file)
--- a/view/templates/structure_check.tpl
+++ b/view/templates/structure_check.tpl
@@ -1,7 +1,8 @@
 
-<h2>{{$banner}}</h2>
+<div id="adminpage">
+       <h2>{{$banner}}</h2>
 
-<p><a href="{{$base}}/admin/dbsync/check">{{$check}}</a></p>
-
-<hr />
+       <p><a href="{{$base}}/admin/dbsync/check">{{$check}}</a></p>
 
+       <hr />
+</div>