thooge/YMS
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Webgui: improve table summary generation

Browse Source
This commit is contained in:
Thomas Hooge
2026-07-18 09:07:17 +02:00
parent 631f1cd2cf
commit 90bfdbc569
19 changed files with 357 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webgui/box.php
+2 -3
View File
@@ -115,9 +115,8 @@ foreach ($res as $row) {
echo "</tr>\n";
}
// Table summary
echo "<tfoot>\n";
echo '<tr><td colspan="4">', sprintf(_('%d records'), count($res)), '</td></tr>', "\n";
echo "</tfoot>\n";
$numrows = count($res);
table_rec_summary($i, $numrows, $numrows, 5);
echo "</table>\n";
form_add_button('box.php');
webgui/cable.php
+1 -3
View File
@@ -153,9 +153,7 @@ foreach ($res as $row) {
echo "</tr>\n";
}
// Table summary
echo "<tfoot>\n";
echo '<tr><td colspan="6">', sprintf(_('%d records'), count($res)), '</td></tr>', "\n";
echo "</tfoot>\n";
table_rec_summary($i0, $i, $numrows, 6);
echo "</table>\n";
form_add_button($g_scriptname);
webgui/checklist.php
+1 -3
View File
@@ -93,9 +93,7 @@ foreach ($res as $row) {
echo "</tr>\n";
}
// Table summary
echo "<tfoot>\n";
echo '<tr><td colspan="6">', sprintf(_('%d records'), count($res)), '</td></tr>', "\n";
echo "</tfoot>\n";
table_rec_summary($i0, $i, $numrows, 6);
echo "</table>\n";
form_add_button($g_scriptname);
webgui/company.php
+1 -3
View File
@@ -223,9 +223,7 @@ foreach ($res as $row) {
echo "</tr>\n";
}
// Table summary
echo "<tfoot>\n";
echo '<tr><td colspan="6">', sprintf(_('Records %d to %d of %d'), $i0, $i, $numrows), '</td></tr>', "\n";
echo "</tfoot>\n";
table_rec_summary($i0, $i, $numrows, 6);
echo "</table>\n";
echo $pagination;
webgui/documents.php
+1 -3
View File
@@ -398,9 +398,7 @@ foreach ($res as $row) {
echo "</tr>\n";
}
// Table summary
echo "<tfoot>\n";
echo '<tr><td colspan="6">', sprintf(_('Records %d to %d of %d'), $i0, $i, $numrows), '</td></tr>', "\n";
echo "</tfoot>\n";
table_rec_summary($i0, $i, $numrows, 6);
echo "</table>\n";
echo $pagination;
webgui/dropdown.php
+10 -5
View File
@@ -28,7 +28,7 @@ function create_ddval_form($script, $ddid, $formtype, $row=NULL) {
echo '<div class="form-floating">';
echo '<input type="text" name="ddtext" id="ddtext" class="form-control"';
if ($update) echo ' value="', $row['ddtext'],'"';
echo '><label for="ddtext">Description</label></div>', "\n";
echo '><label for="ddtext">', _('Description'), '</label></div>', "\n";
// all other fields in secondary row
echo '<div class="row my-3">';
@@ -36,17 +36,17 @@ function create_ddval_form($script, $ddid, $formtype, $row=NULL) {
echo '<div class="col"><div class="form-floating">';
echo '<input type="text" name="ddshort" id="ddshort"class="form-control"';
if ($update) echo ' value="', $row['ddshort'],'"';
echo '><label for="ddshort">Short description</label></div></div>', "\n";
echo '><label for="ddshort">', _('Short description'), '</label></div></div>', "\n";
echo '<div class="col"><div class="form-floating">';
echo '<input type="color" name="color" id="color" class="form-control"';
if ($update) echo ' value="#', $row['color'],'"';
echo '><label for="color">Color</label></div></div>', "\n";
echo '><label for="color">', _('Color'), '</label></div></div>', "\n";
echo '<div class="col"><div class="form-floating">';
echo '<input type="text" name="sort" id="sort" class="form-control"';
if ($update) echo ' value="', $row['sort'],'"';
echo '><label for="sort">Sort</label></div></div>', "\n";
echo '><label for="sort">', _('Sort'), '</label></div></div>', "\n";
echo '</div>'; // finish row
@@ -187,11 +187,12 @@ echo '<th>', _('Short'), "</th>";
echo '<th>', _('Color'), "</th>";
echo '<th>', _('Sort'), "</th>";
echo '<th>', _('Flags'), "</th>";
echo "<th></th>\n";
echo "</tr>\n";
echo "</thead>\n";
$i = 0;
foreach ($sth->fetchAll() as $row) {
$i++;
$flags = explode(',', $row['flags']);
$fixed = in_array('fixed', $flags);
echo '<tr>';
@@ -207,6 +208,7 @@ foreach ($sth->fetchAll() as $row) {
echo '<td>', ($fixed ? '<i class="bi bi-lock"></i>' : ''), '</td>';
echo "</tr>\n";
}
table_rec_summary(1, $i, $i, 6);
echo "</table>\n";
echo '<a href="', $g_scriptname, '" class="btn btn-secondary">', _('Back'), "</a>\n";
@@ -236,7 +238,9 @@ echo "<th></th>\n";
echo "</tr>\n";
echo "</thead>\n";
$i = 0;
foreach ($sth->fetchAll() as $row) {
$i++;
echo '<tr>';
if ($row['ddval'] == $v) {
echo '<td>', $row['ddval'], '</td>';
@@ -270,6 +274,7 @@ if ($v == -2) {
echo "<td></td>\n";
echo "</tr>";
}
table_rec_summary(1, $i, $i, 6);
echo "</table>\n";
echo '<a href="', $g_scriptname, '?f=add&id=', $id, '" class="btn btn-primary">', _('Add'), "</a>\n";
webgui/equipment.php
+3 -6
View File
@@ -387,12 +387,9 @@ foreach ($res as $row) {
echo "</td>\n";
echo "</tr>\n";
}
?>
<tfoot>
<tr><td colspan="8"><?php printf(_('Records %d to %d of %d'), $i0, $i, $numrows); ?></td></tr>
</tfoot>
</table>
<?php
table_rec_summary($i0, $i, $numrows, 8);
echo "</table>\n";
echo $pagination;
form_add_button($g_scriptname);
webgui/fuse.php
+1 -3
View File
@@ -178,9 +178,7 @@ foreach ($res as $row) {
echo "</tr>\n";
}
// Table summary
echo "<tfoot>\n";
echo '<tr><td colspan="6">', sprintf(_('%d records'), count($res)), '</td></tr>', "\n";
echo "</tfoot>\n";
table_rec_summary($i0, $i, $numrows, 6);
echo "</table>\n";
form_add_button($g_scriptname);
webgui/globals.inc
+13
View File
@@ -1328,6 +1328,19 @@ function get_pagination($script, $param, $page, $lastpage, $small=false) {
return $out;
}
function table_rec_summary($start, $end, $total, $cols) {
// common summary table footer for data tables
echo "<tfoot>\n";
echo ' <tr><td colspan="', $cols, '">';
if ($total > 0) {
echo sprintf(_('Records %d to %d of %d'), $start, $end, $total);
} else {
echo _('No records found');
}
echo "</td></tr>\n";
echo "</tfoot>\n";
}
function pdf_get_pagecount($filename) {
$pages = exec("/usr/bin/mutool show $filename Root/Pages/Count", $output, $retval);
// TODO error checking
webgui/index.php
+5 -2
View File
@@ -135,7 +135,10 @@ $sth = $pdo->query("SELECT vid, vesselname, model FROM vessel ORDER BY vid");
$res = $sth->fetchAll();
foreach ($res as $row) {
echo ' <option value="', $row['vid'], '"', ($row['vid'] == $vid ? ' selected>' : '>');
echo $row['vesselname'], ' - ', $row['model'];
echo $row['vesselname'];
if ($row['model']) {
echo ' - ', $row['model'];
}
echo "</option>\n";
}
?>
@@ -154,7 +157,7 @@ echo ' <button type="submit" class="btn btn-secondary" name="submit[add]">',
echo '<div class="row my-2">', "\n";
echo '<div class="col-1"></div>', "\n";
echo '<div class="col">';
if ($vessel->shipyard) {
if ($vessel->shipyard && $vessel->shipyard > 0) {
if ($vessel->shipyard == -3) {
echo _('Custom-build');
} else {
webgui/inventory.php
+1 -3
View File
@@ -268,9 +268,7 @@ foreach ($res as $row) {
echo "</tr>\n";
}
// Table summary
echo "<tfoot>\n";
echo '<tr><td colspan="7">', sprintf(_('Records %d to %d of %d'), $i0, $i, $numrows), '</td></tr>', "\n";
echo "</tfoot>\n";
table_rec_summary($i0, $i, $numrows, 7);
echo "</table>\n";
echo $pagination;
webgui/maintenance.php
+1 -3
View File
@@ -199,9 +199,7 @@ foreach ($res as $row) {
echo "</tr>\n";
}
// Table summary
echo "<tfoot>\n";
echo '<tr><td colspan="6">', sprintf(_('Records %d to %d of %d'), $i0, $i, $numrows), '</td></tr>', "\n";
echo "</tfoot>\n";
table_rec_summary($i0, $i, $numrows, 6);
echo "</table>\n";
echo $pagination;
webgui/measurement.php
+2 -3
View File
@@ -237,9 +237,8 @@ foreach ($res as $row) {
echo "</tr>\n";
}
// Table summary
echo "<tfoot>\n";
echo '<tr><td colspan="6">', sprintf(_('%d records'), count($res)), '</td></tr>', "\n";
echo "</tfoot>\n";
$numrows = count($res);
table_rec_summary($i, $numrows, $numrows, 7);
echo "</table>\n";
echo $pagination;
webgui/projects.php
+3 -6
View File
@@ -220,9 +220,7 @@ foreach ($res as $row) {
echo "</tr>\n";
}
// Table summary
echo "<tfoot>\n";
echo '<tr><td colspan="6">', sprintf(_('Records %d to %d of %d'), $i0, $i, $numrows), '</td></tr>', "\n";
echo "</tfoot>\n";
table_rec_summary($i0, $i, $numrows, 6);
echo "</table>\n";
echo $pagination;
@@ -266,9 +264,8 @@ foreach ($res as $row) {
echo "</tr>\n";
}
// Table summary
echo "<tfoot>\n";
echo '<tr><td colspan="2">', sprintf(_('%d records'), count($res)), '</td></tr>', "\n";
echo "</tfoot>\n";
table_rec_summary($i0, $i, count($res), 4);
echo "</table>\n";
form_add_button('task.php');
webgui/provisions.php
+1 -3
View File
@@ -217,9 +217,7 @@ foreach ($res as $row) {
echo "</tr>\n";
}
// Table summary
echo "<tfoot>\n";
echo '<tr><td colspan="8">', sprintf(_('Records %d to %d of %d'), $i0, $i, $numrows), '</td></tr>', "\n";
echo "</tfoot>\n";
table_rec_summary($i0, $i, $numrows, 8);
echo "</table>\n";
echo $pagination;
webgui/shapes/sigma36.svg
+304
View File
@@ -0,0 +1,304 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="1024"
height="325"
viewBox="0 0 1024 325"
version="1.1"
id="svg5"
xml:space="preserve"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><title
id="title134">Shape template</title><defs
id="defs2" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="M 808.53337,163.19944 734.91129,131.26007"
id="path1051-3-9-62" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 808.52945,163.54942 -75.47596,30.128"
id="path1051-3-9-62-6" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 633.2542,254.13104 -180.28542,16.3527"
id="path1051-3-9-92" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="M 452.25753,38.597179 330.59821,39.817207"
id="path1051-3-9-6" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 387.62707,240.10887 -239.83404,0.0703"
id="path1051-3-9-6-7" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 331.70231,173.71055 -135.05747,0.0489"
id="path1051-3-9-6-7-0-9" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="M 635.14816,70.054094 451.74929,54.969043"
id="path1051-3-9-6-1" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:2, 0.999999;stroke-dashoffset:0;stroke-opacity:1"
d="m 232.81806,194.80674 c 0,0 61.1113,21.37067 75.97017,24.88339 14.85887,3.51272 79.61312,19.43925 79.61312,19.43925"
id="path1051-3-7" /><rect
style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
id="rect1255"
width="62.198921"
height="52.990868"
x="332.10193"
y="136.3568" /><rect
style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
id="rect1255-6"
width="3.9857686"
height="108.9136"
x="187.29346"
y="109.60042" /><rect
style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:2, 1;stroke-dashoffset:0"
id="rect1255-1"
width="27.217455"
height="42.136147"
x="195.25999"
y="191.24643" /><rect
style="display:inline;fill:none;stroke:#000000;stroke-width:0.999998;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
id="rect1255-1-2"
width="35.377628"
height="52.031517"
x="394.29581"
y="239.3064" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 635.06789,107.18892 98.53583,0.0153"
id="path1051-3-70-9-5" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 454.13553,117.43164 180.17642,0.0341"
id="path1051-3-70-9-5-9" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 635.45082,248.94391 98.53583,0.0153"
id="path1051-3-70-9-5-1" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 634.87595,214.6136 66.98679,0.0153"
id="path1051-3-70-9-5-8" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 702.19836,248.93305 0.0669,-85.48485"
id="path1051-3-70-9-5-8-7" /><rect
style="display:inline;fill:none;stroke:#000000;stroke-width:0.999995;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
id="rect1255-3-6"
width="40.192474"
height="30.994183"
x="381.07401"
y="56.476891" /><circle
style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0"
id="path1537-2"
cx="412.66504"
cy="71.820229"
r="4.1049838" /><g
id="g4475"
transform="matrix(1.1348054,0,0,1.1354068,-235.23022,3.3571502)"
style="display:inline;stroke-width:0.880975"><rect
style="display:inline;fill:none;stroke:#000000;stroke-width:0.880971;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
id="rect1255-3"
width="28.496277"
height="25.182354"
x="506.32599"
y="47.019566" /><circle
style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.880975;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0"
id="path1537-2-3"
cx="511.54593"
cy="59.438629"
r="1.4208409" /></g><g
id="g4475-2"
transform="matrix(1.1348054,0,0,1.1354068,-235.36149,44.258451)"
style="display:inline;stroke-width:0.880975"><rect
style="display:inline;fill:none;stroke:#000000;stroke-width:0.880971;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
id="rect1255-3-0"
width="28.496277"
height="25.182354"
x="506.32599"
y="47.019566" /><circle
style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.880975;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0"
id="path1537-2-3-2"
cx="511.54593"
cy="59.438629"
r="1.4208409" /></g><circle
style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0"
id="path1537-6"
cx="391.82516"
cy="71.729965"
r="4.1049838" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 454.50999,118.92264 -22.45695,-0.18073 -0.39506,-72.487493 -57.28714,-0.389951 -0.17425,90.148314"
id="path1051-3-9-1" /><rect
style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.999998;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect2020-1"
width="16.26861"
height="55.640427"
x="434.14221"
y="53.814102"
ry="1.3045897"
rx="1.3628241" /><rect
style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect2020-1-3"
width="5.62324"
height="25.014383"
x="345.48184"
y="149.27467"
ry="1.3045897"
rx="1.362824" /><rect
style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect2020-1-3-3"
width="5.62324"
height="25.014383"
x="357.25745"
y="149.27467"
ry="1.3045897"
rx="1.362824" /><rect
style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect2020-1-3-7"
width="5.62324"
height="25.014383"
x="369.03302"
y="149.27467"
ry="1.3045897"
rx="1.362824" /><rect
style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect2020-1-3-5"
width="5.62324"
height="25.014383"
x="380.80862"
y="149.27467"
ry="1.3045897"
rx="1.362824" /><rect
style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect2020-1-3-0"
width="111.90344"
height="18.664913"
x="470.03284"
y="167.53821"
ry="1.3045897"
rx="1.3628241" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 452.49301,229.86036 -63.80763,0.11673 -0.18514,92.02549"
id="path1051-7" /><g
id="g5567"
style="display:inline"><rect
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
id="rect5540"
width="13.511249"
height="9.0826178"
x="-23.655949"
y="178.23715"
transform="matrix(0.85686157,-0.51554656,0.51506157,0.85715318,0,0)" /><path
id="rect5540-2"
style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round"
transform="matrix(0.85686157,-0.51554656,0.51506157,0.85715318,0,0)"
d="m -9.6138827,177.74473 78.5477247,6.61845 0.158658,1.62647 -78.8946484,1.82549 z" /></g><g
id="g1346-7"
transform="rotate(90,657.07918,158.12561)"
style="display:inline"><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 711.61753,105.88116 2.65465,-0.01"
id="path1051-3-70-9-6-0" /><rect
style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect2591-3-9"
width="8.0729084"
height="10.706293"
x="714.31329"
y="101.32455"
ry="0" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 716.92538,107.04318 2.79647,-0.003"
id="path1051-3-70-9-6-7-3" /><path
id="rect2588-6"
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round"
d="m 686.24942,90.899539 20.82037,0.08492 c 0,0 5.06651,8.402799 4.39879,16.424111 -0.93076,11.18123 -8.47355,16.69152 -14.7092,16.79516 -6.23564,0.1036 -13.73785,-6.42007 -14.55567,-15.91907 -0.83507,-9.699525 4.04571,-17.385082 4.04571,-17.385082 z" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect2591-0"
width="22.45204"
height="2.0430894"
x="685.52374"
y="88.79052" /></g><g
id="g6330"
transform="translate(-0.0199408,0.49049318)"
style="display:inline"><rect
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect2020"
width="25.927773"
height="23.153271"
x="648.62805"
y="217.77386"
ry="1.3045899"
rx="1.362824" /><ellipse
style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:2, 1;stroke-dashoffset:0;stroke-opacity:1"
id="path6326"
cx="661.59192"
cy="229.35049"
rx="2.5"
ry="2.5056882" /></g><path
id="path6390"
style="display:inline;fill:none;stroke:#000000"
d="m 924.1753,130.54723 63.49275,25.64623 c 0,0 7.80167,2.53126 7.70886,7.76444 -0.0928,5.23318 -6.91264,7.65068 -6.91264,7.65068 l -64.2282,23.57082 c 0,0 -5.45334,1.3706 -7.59768,-0.30016 -2.14434,-1.67076 -1.77579,-5.29511 -1.77579,-5.29511 l 0.0224,-52.79243 c 0,0 -0.50129,-2.97041 2.91107,-5.21806 3.41237,-2.24764 6.37925,-1.02641 6.37925,-1.02641 z" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 631.6865,163.92556 -44.99554,0.0854 0.11983,42.33665 -133.55851,-0.0394 -0.0472,19.17532"
id="path1051-35" /><path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:8, 4, 2, 4;stroke-dashoffset:0;stroke-opacity:1"
d="M 3.3e-6,164.00334 1023.9982,163.99999"
id="path271" /><path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 1.1513337,163.97982 c 0,0 -2.02619595,-14.29108 18.4151383,-43.72321 C 25.603228,111.56469 40.219341,92.010451 64.286166,80.956937 101.66329,63.79021 162.14546,50.17193 199.47841,40.272131 260.68566,24.041441 375.56272,2.6705633 439.97148,2.746937 c 114.75286,0.1360701 278.41068,43.620718 352.98863,69.394756 74.58618,25.776885 215.57749,80.993027 219.01729,82.365417 11.7207,4.6763 10.7503,9.77072 10.7503,9.77072"
id="path951" /><use
x="0"
y="0"
xlink:href="#path951"
id="use1049"
transform="matrix(1,0,0,-1,-0.01475402,328.11317)" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="M 332.42802,10.538906 V 164.94022"
id="path1051-5" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 452.5609,225.28683 v 97.76641"
id="path1051-5-20" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="M 93.686637,68.801437 C 67.583225,93.807736 55.90958,131.12694 56.000194,163.60735 c 0.09061,32.48041 8.492798,78.75514 37.686443,95.39153"
id="path1051-5-20-6" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="M 454.2103,2.7462719 V 123.25896"
id="path1051-5-20-3" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="M 147.35341,53.859814 V 274.33377"
id="path1051-5-20-3-5" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 909.71829,115.57086 v 97.71626"
id="path1051" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="M 734.40826,53.942026 V 133.8024"
id="path1051-9" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="M 634.6999,28.575482 V 120.45295"
id="path1051-9-1" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="M 635.69122,164.33737 V 300.27495"
id="path1051-9-1-2" /><path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="m 634.06403,164.0493 79.71347,-0.10951 18.91846,18.68387 0.89915,92.57886"
id="path1051-356-2" /><ellipse
style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0"
id="path1640"
cx="641.56738"
cy="162.34418"
rx="10.004243"
ry="5.6452112" /><circle
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
id="path4529"
cx="451.89331"
cy="126.35135"
r="3.9999998" /><circle
style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
id="path4529-6"
cx="447.16467"
cy="223.45563"
r="3.9999998" /><metadata
id="metadata132"><rdf:RDF><cc:Work
rdf:about=""><dc:title>Shape template</dc:title><dc:creator><cc:Agent><dc:title>Thomas Hooge</dc:title></cc:Agent></dc:creator><cc:license
rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /></cc:Work><cc:License
rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"><cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF></metadata></svg>
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

webgui/storage.php
+5 -6
View File
@@ -139,9 +139,9 @@ foreach ($res as $row) {
echo "</td>\n";
echo "</tr>\n";
}
echo "<tfoot>\n";
echo '<tr><td colspan="5">', sprintf(_('%d records'), count($res)), '</td></tr>', "\n";
echo "</tfoot>\n";
// Table summary
$numrows = count($res);
table_rec_summary($i, $numrows, $numrows, 5);
echo "</table>\n";
form_add_button($g_scriptname);
@@ -179,9 +179,8 @@ foreach ($res as $row) {
echo "</tr>\n";
}
// Table summary
echo "<tfoot>\n";
echo '<tr><td colspan="4">', sprintf(_('%d records'), count($res)), '</td></tr>', "\n";
echo "</tfoot>\n";
$numrows = count($res);
table_rec_summary($i, $numrows, $numrows, 4);
echo "</table>\n";
form_add_button('box.php');
webgui/tag.php
+1 -3
View File
@@ -140,9 +140,7 @@ foreach ($res as $row) {
echo "</tr>\n";
}
// Table summary
echo "<tfoot>\n";
echo '<tr><td colspan="6">', sprintf(_('%d records'), count($res)), '</td></tr>', "\n";
echo "</tfoot>\n";
table_rec_summary($i0, $i, $numrows, 6);
echo "</table>\n";
form_add_button($g_scriptname);
webgui/task.php
+1 -3
View File
@@ -241,9 +241,7 @@ foreach ($res as $row) {
echo "</tr>\n";
}
// Table summary
echo "<tfoot>\n";
echo '<tr><td colspan="6">', sprintf(_('%d records'), count($res)), '</td></tr>', "\n";
echo "</tfoot>\n";
table_rec_summary($i0, $i, $numrows, 6);
echo "</table>\n";
// additional pagination at bottom