summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--includes/admin/views/giglog_admin_page.php34
-rw-r--r--includes/css/main.css34
-rw-r--r--tests/VenueTest.php11
3 files changed, 63 insertions, 16 deletions
diff --git a/includes/admin/views/giglog_admin_page.php b/includes/admin/views/giglog_admin_page.php
index 870e361..3336fbd 100644
--- a/includes/admin/views/giglog_admin_page.php
+++ b/includes/admin/views/giglog_admin_page.php
@@ -134,34 +134,36 @@ if ( !class_exists( 'GiglogAdmin_AdminPage' ) ) {
else
$c = new GiglogAdmin_Concert();
- $content='<form method="POST" action="" class="concedit" > Form to create/edit concerts and venues<br>'
+ $content='<div><h3>Form to create/edit concerts and venues</h3><br></div><div class="editform"><div class="concertform">';
+ $content.='<form method="POST" action="" class="concert" >'
+ .'<div class="concertitems"><strong>CONCERT DETAILS</strong><br><br><fieldset>'
.'<input type="hidden" name="pid" value="' .$c->id(). '" />'
- .'<label for="cname">Concert Name:</label><input type="text" id="cname" name="cname" value="'.$c->cname().'"><br>'
+ .'<label for="cname">Concert Name:</label><textarea id="cname" name="cname" value="'.$c->cname().'">'.$c->cname().'</textarea><br>'
.'<label for="venue">Venue:</label>'.GiglogAdmin_AdminPage::get_allvenues($c->venue()).'<br>'
.'<label for="cdate">Date:</label><input type="date" id="cdate" name="cdate" value="'.$c->cdate().'"><br>'
.'<label for="ticket">Tickets:</label><input type="text" id="ticket" name="ticket" value="'.$c->tickets().'"><br>'
.'<label for="eventurl">Event link:</label><input type="text" id="eventurl" name="eventurl" value="'.$c->eventlink().'"><br>'
- .'<label for="photo1">Photo1:</label>'.GiglogAdmin_AdminPage::get_user($c->id(),'photo1').'<br>'
- .'<label for="photo2">Photo2:</label>'.GiglogAdmin_AdminPage::get_user($c->id(),'photo2').'<br>'
- .'<label for="rev1">Text1:</label>'.GiglogAdmin_AdminPage::get_user($c->id(),'rev1').'<br>'
- .'<label for="rev2">Text2:</label>'.GiglogAdmin_AdminPage::get_user($c->id(),'rev2').'<br>'
- ;
-
+ .'</fieldset>';
// actions differ if we update or create a concert, hence two buttons needed
- if ($editing) {
+ if ($editing)
$content.='<p><input type="submit" name="editconcert" value="Edit Concert"></p>';
- }
- else {
+ else
$content.='<p><input type="submit" name="newconcert" value="Create New Concert"></p>';
- }
- $content.='</form>';
+ $content.='</div>';
+ $content.='<div class="useritems"><strong>ASSIGNMENT DETAILS</strong><br><br><fieldset>'
+ .'<label for="photo1">Photo1:</label>'.GiglogAdmin_AdminPage::get_user($c->id(),'photo1').'<br>'
+ .'<label for="photo2">Photo2:</label>'.GiglogAdmin_AdminPage::get_user($c->id(),'photo2').'<br>'
+ .'<label for="rev1">Text1:</label>'.GiglogAdmin_AdminPage::get_user($c->id(),'rev1').'<br>'
+ .'<label for="rev2">Text2:</label>'.GiglogAdmin_AdminPage::get_user($c->id(),'rev2').'<br>';
- $content.='<form method="POST" action="" class="venue" ><br>'
- .'<label for="venue">Venue Name:</label><input type="text" id="venuename" name="venuename"><br>'
+ $content.='<fieldset></div></form></div>';
+ $content.='<div class="venueform"><form method="POST" action="" class="venue" ><strong>VENUE DETAILS</strong><br><br>'
+ .'<fieldset><label for="venue">Venue Name:</label><input type="text" id="venuename" name="venuename"><br>'
.'<label for="eventurl">Venue City:</label><input type="text" id="venuecity" name="venuecity"><br>'
.'<p><input type="submit" name="newvenue" value="Create New Venue"></p>'
- .'</form>';
+ .'<fieldset></form></div>';
+ $content.='</div>';
return $content;
}
diff --git a/includes/css/main.css b/includes/css/main.css
index 27ecbef..3d26183 100644
--- a/includes/css/main.css
+++ b/includes/css/main.css
@@ -102,3 +102,37 @@ input[name="unassignitem"]
padding: unset;
width: 80px;
}
+
+/*for giglog editform*/
+.editform input,textarea
+{
+ box-shadow:10px;
+ border-radius:10px;
+}
+
+.editform, .concert
+{
+ display:flex;
+}
+
+.concertform,.venueform
+{
+ padding: 2px;
+ border: 1px solid;
+}
+
+ .editform fieldset {
+ min-width: 200px;
+ display: inline-block;
+ }
+
+ .editform fieldset label{
+ margin-right: 10px;
+ position: relative;
+ display: block;
+ }
+
+ .editform textarea
+ {
+ height: auto;
+ }
diff --git a/tests/VenueTest.php b/tests/VenueTest.php
index 4278951..1fde15e 100644
--- a/tests/VenueTest.php
+++ b/tests/VenueTest.php
@@ -41,6 +41,17 @@ final class VenueTest extends WP_UnitTestCase
$this->assertEquals($other->name(), $venue->name());
}
+ public function testFindOrCreateExistingVenueVariableCase() : void
+ {
+ global $wpdb;
+
+ $venue = GiglogAdmin_Venue::create("This is not the venue you are looking for");
+ $other = GiglogAdmin_Venue::find_or_create("ThiS IS noT tHe VenuE YOu aRe looking FoR");
+
+ $this->assertEquals($other->id(), $venue->id());
+ $this->assertEquals($other->name(), $venue->name());
+ }
+
public function testFindAllVenuesInCity() : void
{
global $wpdb;