From aa688626d52d4e7fd3df16dc620cf96697c3f95a Mon Sep 17 00:00:00 2001
From: AndreaChirulescu <andrea.chirulescu@gmail.com>
Date: Sun, 5 Sep 2021 16:23:36 +0200
Subject: Re-added the changes for looks, and city/venue selector

---
 includes/admin/views/_concerts_table.php | 25 ++++++++++++++-----------
 includes/css/main.css                    |  3 ---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/includes/admin/views/_concerts_table.php b/includes/admin/views/_concerts_table.php
index 37459a3..aba8c5c 100644
--- a/includes/admin/views/_concerts_table.php
+++ b/includes/admin/views/_concerts_table.php
@@ -51,6 +51,9 @@ if (!class_exists("GiglogAdmin_ConcertsTable"))
             $venue = filter_input( INPUT_POST, 'selectvenue', FILTER_SANITIZE_SPECIAL_CHARS );
             if ($venue) $filter['venue_id'] = $venue;
 
+            if(isset($_POST['ownconcerts']) &&  $_POST['ownconcerts'] == '1')
+        $filter['currentuser'] = wp_get_current_user()->user_login;
+
             $concerts = GiglogAdmin_Concert::find_concerts($filter);
 
             $lastType = '';
@@ -59,15 +62,15 @@ if (!class_exists("GiglogAdmin_ConcertsTable"))
                 $content .= '<tr class="assignitr">';
 
                 if ($lastType != '' && $lastType !=  $concert->venue()->city()) {
-                    $content .= '<td>' . $concert->city() . '</td></tr><tr>';
+                    $content .= '<td>' . $concert->venue->city() . '</td></tr><tr class="assignitr">';
                 }
 
                 if  ($lastType == '' ) {
-                    $content .= '<td>' . $concert->venue()->city() . '</td></tr><tr>';
+                    $content .= '<td>' . $concert->venue()->city() . '</td></tr><tr class="assignitr">';
                 }
                 // Modify these to match the database structure
                 //     $content .= '<td>' . $row->id. '</td>';
-                $content .= '<td></td>';
+                $content .= '<td></br></br></td>';
                 $content .= '<td>' . $concert->cname() . '</td>';
                 $content .= '<td>' . $concert->venue()->name() . '</td>';
                 $fdate =  strtotime($concert->cdate());
@@ -75,12 +78,12 @@ if (!class_exists("GiglogAdmin_ConcertsTable"))
 
                 //$content .= DATE_FORMAT($fdate,'%d.%b.%Y');
                 $content .= '<td>' . $newformat . '</td>';
-                $content .= '<td>' . $this->mark_new_concert($concert) . '</td>';
+                $content .= '<td class="publishstatus">' . $this->mark_new_concert($concert) . '</td>';
 
-                $content .= '<td>' . $this->assign_role_for_user_form('photo1', $concert) . '</td>';
-                $content .= '<td>' . $this->assign_role_for_user_form('photo2', $concert) . '</td>';
-                $content .= '<td>' . $this->assign_role_for_user_form('rev1', $concert) . '</td>';
-                $content .= '<td>' . $this->assign_role_for_user_form('rev2', $concert) . '</td>';
+                $content .= '<td class="assigneduser">' . $this->assign_role_for_user_form('photo1', $concert) . '</td>';
+                $content .= '<td> class="assigneduser">' . $this->assign_role_for_user_form('photo2', $concert) . '</td>';
+                $content .= '<td class="assigneduser">' . $this->assign_role_for_user_form('rev1', $concert) . '</td>';
+                $content .= '<td class="assigneduser">' . $this->assign_role_for_user_form('rev2', $concert) . '</td>';
 
                 $content .= '<td>' . self::STATUS_LABELS[$concert->status()] . '</td>';
 
@@ -124,8 +127,8 @@ if (!class_exists("GiglogAdmin_ConcertsTable"))
             }
             //option to select own concerts only
             $select .= '<input  class="ownconc" type="checkbox" value="1"';
-                if(isset($_POST['my_checkbox'])) $select .=' checked="checked" ';
-            $select.=' name="my_checkbox">Show own concerts only</input>';
+            if(isset($_POST['ownconcerts'])) $select .=' checked="checked" ';
+            $select.=' name="ownconcerts">Show own concerts only</input>';
 
             $select .= '<input type="submit" value="APPLY"></form>';
 
@@ -174,7 +177,7 @@ if (!class_exists("GiglogAdmin_ConcertsTable"))
                 $f = '<form class="unassignit" method="POST" action="">'
                     . '  <input type="hidden" name="cid" value="' . $concert->id() . '" />'
                     . '  <input type="hidden" name="pid" value="' . $role . '" />'
-                    . '  <input type="submit" name="unassignitem" value="Your"/>'
+                    . '  <input type="submit" name="unassignitem" value=""/>'
                     . '</form>';
             }
             elseif ( $assigned_user ) { //check if slot is taken by another user
diff --git a/includes/css/main.css b/includes/css/main.css
index c28ae76..a984018 100644
--- a/includes/css/main.css
+++ b/includes/css/main.css
@@ -169,9 +169,6 @@ input[name="unassignitem"]
  	 background: #CCC
   }
 
-tr.assignitr  {
-	min-height: 120%;
- }
 
  .assigneduser, .publishstatus
  {
-- 
cgit v1.2.3