From 9226c46778e5961d34ef15032353879b0ba4b08b Mon Sep 17 00:00:00 2001 From: Evert Date: Tue, 14 Nov 2017 15:35:08 +0200 Subject: [PATCH 1/3] Add requests to requirements.txt. Closes #52 --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index c7d77b3..2b00bcd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ Django==1.11.4 Pillow==4.2.1 dj-database-url==0.4.2 +requests==2.18.4 From ddeff408f1442cb7aad414561734165d6c8f656e Mon Sep 17 00:00:00 2001 From: Evert Date: Tue, 14 Nov 2017 15:39:11 +0200 Subject: [PATCH 2/3] Change `Artwork` to `Banner` in Show where its appropriate, make ban scope nullable because `site_wide` is a thing --- LandingPage/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LandingPage/models.py b/LandingPage/models.py index e03a920..be27211 100644 --- a/LandingPage/models.py +++ b/LandingPage/models.py @@ -66,7 +66,7 @@ class Show(TimestampedModel): storage=show_static_storage, upload_to = name_banner, help_text="A banner used for the show's page.", - verbose_name="Artwork" + verbose_name="Banner" ) def __str__(self): return '%s [%s]'%(self.name,self.abbr) @@ -132,6 +132,7 @@ class Ban(TimestampedModel): ) scope = models.ManyToManyField( Show, + blank=True, help_text='The shows this user is banned from interacting with', verbose_name='Banned From', related_name='bans' From c7f0bbe54553f1d09a3bbc9dfc4b5923d25c2ac1 Mon Sep 17 00:00:00 2001 From: Evert Date: Tue, 14 Nov 2017 15:48:44 +0200 Subject: [PATCH 3/3] Ensure the banner's text stays in it's place --- LandingPage/static/css/style.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/LandingPage/static/css/style.css b/LandingPage/static/css/style.css index 045cd4b..a37abd1 100644 --- a/LandingPage/static/css/style.css +++ b/LandingPage/static/css/style.css @@ -63,6 +63,9 @@ input[type=text], input:not([type=submit]) { max-width: 180px; max-height: 260px; } +.show-promo span { + display: block; +} .blocklayout .block { margin: 15px; box-shadow: 2px 2px 5px #9c9c9c;