diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/concert.php | 6 | ||||
| -rw-r--r-- | includes/css/main.css | 16 | ||||
| -rw-r--r-- | includes/venue.php | 3 |
3 files changed, 24 insertions, 1 deletions
diff --git a/includes/concert.php b/includes/concert.php index 29de015..66f9c1f 100644 --- a/includes/concert.php +++ b/includes/concert.php @@ -85,6 +85,7 @@ if ( !class_exists('GiglogAdmin_Concert') ) { $query = self::BASE_QUERY . 'WHERE ' . $wpdb->prepare('wpg_concerts.id = %d', $id); + $query.= ' ORDER BY wpgconcert_date'; $results = $wpdb->get_results($query); @@ -216,9 +217,14 @@ if ( !class_exists('GiglogAdmin_Concert') ) { array_push($where, 'wpg_venues.id = ' . $wpdb->prepare('%s', $filter["venue_id"])); } + if ( isset( $filter["currentuser"] ) ) { + array_push($where , 'wpgconcert_roles like "%'.$filter["currentuser"].'%"'); + } + if ( ! empty( $where ) ) { $query .= 'WHERE ' . implode(' and ', $where); } + $query.= ' ORDER BY wpgconcert_date'; $results = $wpdb->get_results($query); diff --git a/includes/css/main.css b/includes/css/main.css index 1cbc906..c28ae76 100644 --- a/includes/css/main.css +++ b/includes/css/main.css @@ -77,6 +77,7 @@ span.takenbyself padding: none !important; font-size: small; vertical-align: center; + border-collapse:collapse; } table.assignit @@ -84,6 +85,7 @@ table.assignit { white-space: nowrap; overflow: hidden; + border-collapse:collapse; } input[name="unassignitem"] @@ -162,3 +164,17 @@ input[name="unassignitem"] { height: auto; } + + tr.assignitr:nth-child(even){ + background: #CCC + } + +tr.assignitr { + min-height: 120%; + } + + .assigneduser, .publishstatus + { + text-align: center; + + } diff --git a/includes/venue.php b/includes/venue.php index 3ad0f06..444fd29 100644 --- a/includes/venue.php +++ b/includes/venue.php @@ -110,7 +110,7 @@ if ( !class_exists('GiglogAdmin_Venue') ) { { global $wpdb; - $results = $wpdb->get_results("select * from wpg_venues"); + $results = $wpdb->get_results("select * from wpg_venues ORDER BY wpgvenue_name"); return array_map(function ($r) { return new GiglogAdmin_Venue($r); }, $results); } @@ -125,6 +125,7 @@ if ( !class_exists('GiglogAdmin_Venue') ) { { global $wpdb; $q = $wpdb->prepare("select * from wpg_venues where wpgvenue_city=%s", $city); + $q .=" ORDER BY wpgvenue_name"; $results = $wpdb->get_results($q); return array_map(function ($r) { return new GiglogAdmin_Venue($r); }, $results); |