summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2021-09-05 21:35:19 +0200
committerHarald Eilertsen <haraldei@anduin.net>2021-09-05 21:35:19 +0200
commit2ed78a27f89ad817c93bc5d196e61f21bb91d3ac (patch)
tree1b0a66a3270760f63d5d399a5843f0a0fcaeaf54
parentf663d5f74e4dbc71ee4b1db76b7b7d026bd95539 (diff)
parent59f4855374b2a365162d91d93309359109321471 (diff)
downloadgigologadmin-2ed78a27f89ad817c93bc5d196e61f21bb91d3ac.tar.gz
gigologadmin-2ed78a27f89ad817c93bc5d196e61f21bb91d3ac.tar.bz2
gigologadmin-2ed78a27f89ad817c93bc5d196e61f21bb91d3ac.zip
Merge remote-tracking branch 'andrea/andreaschanges' into dev
-rw-r--r--assets/images/checkedbox.pngbin0 -> 6656 bytes
-rw-r--r--assets/images/checkedbox.png.license4
-rw-r--r--assets/images/redicon.pngbin0 -> 28599 bytes
-rw-r--r--assets/images/redicon.png.license4
-rw-r--r--includes/admin/views/_concerts_table.php9
5 files changed, 13 insertions, 4 deletions
diff --git a/assets/images/checkedbox.png b/assets/images/checkedbox.png
new file mode 100644
index 0000000..7de92a0
--- /dev/null
+++ b/assets/images/checkedbox.png
Binary files differ
diff --git a/assets/images/checkedbox.png.license b/assets/images/checkedbox.png.license
new file mode 100644
index 0000000..2d950a1
--- /dev/null
+++ b/assets/images/checkedbox.png.license
@@ -0,0 +1,4 @@
+SPDX-FileCopyrightText: 2021 Andrea Chirulescu <andrea.chirulescu@gmail.com>
+SPDX-FileCopyrightText: 2021 Harald Eilertsen <haraldei@anduin.net>
+
+SPDX-License-Identifier: CC0-1.0 \ No newline at end of file
diff --git a/assets/images/redicon.png b/assets/images/redicon.png
new file mode 100644
index 0000000..6366d17
--- /dev/null
+++ b/assets/images/redicon.png
Binary files differ
diff --git a/assets/images/redicon.png.license b/assets/images/redicon.png.license
new file mode 100644
index 0000000..2d950a1
--- /dev/null
+++ b/assets/images/redicon.png.license
@@ -0,0 +1,4 @@
+SPDX-FileCopyrightText: 2021 Andrea Chirulescu <andrea.chirulescu@gmail.com>
+SPDX-FileCopyrightText: 2021 Harald Eilertsen <haraldei@anduin.net>
+
+SPDX-License-Identifier: CC0-1.0 \ No newline at end of file
diff --git a/includes/admin/views/_concerts_table.php b/includes/admin/views/_concerts_table.php
index efa55e2..75f50c6 100644
--- a/includes/admin/views/_concerts_table.php
+++ b/includes/admin/views/_concerts_table.php
@@ -35,8 +35,9 @@ if (!class_exists("GiglogAdmin_ConcertsTable"))
// $content .= '</tr><th>CITY</th><th>ID</th><th>BAND</th><th>VENUE</th><th>DATE</th></tr>';
$content .= '<tr class="assignithrow"><th>CITY</th><th>NAME</th><th>VENUE</th><th>DATE</th>';
- if(!is_admin())
- $content .= '<th>EVENT</th><th>TICKETS</th>';
+ if(!is_admin()) {
+ $content .= '<th>EVENT</th><th>TICKETS</th>';
+ }
else
{
@@ -118,7 +119,7 @@ if (!class_exists("GiglogAdmin_ConcertsTable"))
{
$cty = filter_input(INPUT_POST, 'selectcity', FILTER_SANITIZE_SPECIAL_CHARS);
- $select = '<form method="POST" action="">FILTER DATA:';
+ $select = '<form method="POST" action="" class="filterclass">FILTER DATA:';
$select .= \EternalTerror\ViewHelpers\select_field(
"selectcity",
array_map(fn($city) => [$city, $city], GiglogAdmin_Venue::all_cities()),
@@ -143,7 +144,7 @@ if (!class_exists("GiglogAdmin_ConcertsTable"))
. checked(isset($_POST['ownconcerts']) ? $_POST['ownconcerts'] : false)
. '><label for="ownconcerts">Show own concerts only</label>';
}
- $select .= '<input type="submit" value="APPLY"></form>';
+ $select .= '<input class="applybuton" type="submit" value="Apply Filters"></form>';
return $select;
}