AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-02-28 19:04:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Categories Create and Edit Modals to take advantage of custom colors

Browse Source
This commit is contained in:
johnnyq
2023-11-16 18:54:49 -05:00
parent 76e348a3a1
commit b1c60fa4d8
4 changed files with 28 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
categories.php
View File

@@ -31,21 +31,6 @@ if (isset($_GET['archived'])) {
$category = "Archived";
}
$colors_used_array = [];
//Colors Used
$sql_colors_used = mysqli_query(
$mysqli,
"SELECT category_color FROM categories
WHERE category_type = '$category'
AND category_$archive_query"
);
while ($color_used_row = mysqli_fetch_array($sql_colors_used)) {
$colors_used_array[] = $color_used_row['category_color'];
}
$colors_diff = array_diff($colors_array, $colors_used_array);
?>
@@ -59,7 +44,7 @@ $colors_diff = array_diff($colors_array, $colors_used_array);
?>
<div class="card-tools">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCategoryModal"><i
class="fas fa-plus mr-2"></i>Create</button>
class="fas fa-plus mr-2"></i>New <?php echo nullable_htmlentities($category); ?> Category</button>
</div>
<?php
}
@@ -75,7 +60,7 @@ $colors_diff = array_diff($colors_array, $colors_used_array);
value="<?php if (isset($q)) {
echo stripslashes(nullable_htmlentities($q));
} ?>"
placeholder="Search Categories">
placeholder="Search <?php echo nullable_htmlentities($category); ?> Categories ">
<div class="input-group-append">
<button class="btn btn-primary"><i class="fa fa-search"></i></button>
</div>
@@ -140,7 +125,6 @@ $colors_diff = array_diff($colors_array, $colors_used_array);
$category_id = intval($row['category_id']);
$category_name = nullable_htmlentities($row['category_name']);
$category_color = nullable_htmlentities($row['category_color']);
//$colors_used_array[] = $row['category_color'];
?>
<tr>
@@ -186,12 +170,9 @@ $colors_diff = array_diff($colors_array, $colors_used_array);
</tr>
<?php
//$colors_diff = array_diff($colors_array,$colors_used_array);
include "category_edit_modal.php";
}
?>