add javascript for userlist tablehead checkall box, fix pageselector css

This commit is contained in:
Hendrik
2017-01-20 12:06:23 +01:00
parent e0d02d283d
commit 3152839dae
2 changed files with 52 additions and 39 deletions

View File

@@ -52,10 +52,16 @@
margin: 10px; margin: 10px;
} }
.admin-userpage { .admin-userheading {
width: 170px; width: auto;
margin-bottom: 20px; float: left;
}
.admin-pageui {
text-align: right;
float: right; float: right;
width: auto;
margin-bottom: 20px;
} }
.usertitle { .usertitle {

View File

@@ -30,8 +30,6 @@
} }
} }
} }
document.write(checked);
allbox.checked = checked; allbox.checked = checked;
} }
@@ -221,10 +219,11 @@ function test_input($data) {
<br> <br>
<div class="admin-users"> <div class="admin-users">
<h2 class="usertitle">Users:</h2> <div class="admin-usertitle">
<div class="admin-userheading">
<div class="admin-userpage"> <h2>Users:</h2>
<p class="pagenumber">Showing results </div>
<div class="admin-pageui">
<?php <?php
if ($pagetype == "user") { if ($pagetype == "user") {
$pages = countSomeUsersByStatus($db, $search, $status); $pages = countSomeUsersByStatus($db, $search, $status);
@@ -233,8 +232,9 @@ function test_input($data) {
} }
$countresults = $pages->fetchColumn(); $countresults = $pages->fetchColumn();
$mincount = min($listm, $countresults); $mincount = min($listm, $countresults);
echo "$listn to $mincount out of $countresults"; ?></p><br> $minlist = min($listn + 1, $countresults);
<input type="submit" name="prev" value="prev"> ?>
<p class="pagenumber">Current page:</p>
<form class="admin-pageselector" <form class="admin-pageselector"
action="<?php htmlspecialchars(basename($_SERVER['REQUEST_URI'])) ?>" action="<?php htmlspecialchars(basename($_SERVER['REQUEST_URI'])) ?>"
method="post"> method="post">
@@ -253,7 +253,11 @@ function test_input($data) {
?> ?>
</select> </select>
</form> </form>
<input type="submit" name="next" value="next"> <p class="entriesshown">
<?php
echo "Showing results $minlist to $mincount out of $countresults";
?>
</div>
</div> <br> </div> <br>
<table class="usertable"> <table class="usertable">
@@ -281,6 +285,7 @@ function test_input($data) {
$role = $user['role']; $role = $user['role'];
$bancomment = $user['bancomment']; $bancomment = $user['bancomment'];
$thispage = htmlspecialchars(basename($_SERVER['REQUEST_URI'])); $thispage = htmlspecialchars(basename($_SERVER['REQUEST_URI']));
$function = "checkCheckAll(document.getElementById('checkall'))";
echo(" echo("
<tr> <tr>
@@ -289,7 +294,7 @@ function test_input($data) {
class='checkbox-list' class='checkbox-list'
value='$userID' value='$userID'
form='admin-batchform' form='admin-batchform'
onchange='checkCheckAll(document.getElementById('checkall'))'> onchange=" . "$function" . ">
</td> </td>
<td>$username</td> <td>$username</td>
<td>$role</td> <td>$role</td>
@@ -319,6 +324,7 @@ function test_input($data) {
$role = $group['status']; $role = $group['status'];
$description = $group['description']; $description = $group['description'];
$thispage = htmlspecialchars(basename($_SERVER['REQUEST_URI'])); $thispage = htmlspecialchars(basename($_SERVER['REQUEST_URI']));
$function = "checkCheckAll(document.getElementById('checkall'))";
echo(" echo("
<tr> <tr>
@@ -326,7 +332,8 @@ function test_input($data) {
name='checkbox-group[]' name='checkbox-group[]'
class='checkbox-list' class='checkbox-list'
value='$groupID' value='$groupID'
form='admin-groupbatchform'> form='admin-groupbatchform'
onchange=" . "$function" . ">
</td> </td>
<td>$name</td> <td>$name</td>
<td>$role</td> <td>$role</td>