diff --git a/proceedings/migrations/0005_auto_20190626_1125.py b/proceedings/migrations/0005_auto_20190626_1125.py new file mode 100644 index 0000000000000000000000000000000000000000..7ceff1f49484f28789468f6389fba2bab19c3b8b --- /dev/null +++ b/proceedings/migrations/0005_auto_20190626_1125.py @@ -0,0 +1,23 @@ +# Generated by Django 2.1.8 on 2019-06-26 09:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('proceedings', '0004_auto_20190512_0918'), + ] + + operations = [ + migrations.AddField( + model_name='proceedings', + name='cover_image', + field=models.ImageField(blank=True, upload_to='proceedings/images/'), + ), + migrations.AddField( + model_name='proceedings', + name='logo', + field=models.ImageField(blank=True, upload_to='proceedings/images/'), + ), + ] diff --git a/proceedings/models.py b/proceedings/models.py index 70d81b7ecc0c4be2905eb56efaeacf32ad359a4d..cfef7212562e94372cc77c41292c10c7988c5b70 100644 --- a/proceedings/models.py +++ b/proceedings/models.py @@ -31,6 +31,8 @@ class Proceedings(TimeStampedModel): event_description = models.TextField(blank=True) event_start_date = models.DateField(null=True, blank=True) event_end_date = models.DateField(null=True, blank=True) + logo = models.ImageField(upload_to='proceedings/images/', blank=True) + cover_image = models.ImageField(upload_to='proceedings/images/', blank=True) # Fellows lead_fellow = models.ForeignKey('colleges.Fellowship', null=True, blank=True, diff --git a/proceedings/templates/partials/proceedings/description.html b/proceedings/templates/partials/proceedings/description.html index a698597fed10e6cdf3882f4adec5ec0d673ef468..f12c62a33097a5cb89acb1127cc5fcde006c4875 100644 --- a/proceedings/templates/partials/proceedings/description.html +++ b/proceedings/templates/partials/proceedings/description.html @@ -1,3 +1,12 @@ +{% if proceedings.cover_image %} + <div class="row"> + <div class="col-lg-9"> +{% endif %} + +{% if proceedings.logo %} + <div class="row"> + <div class="col-10"> +{% endif %} <h3>{{ proceedings.event_name }} {% if proceedings.event_suffix %}({{ proceedings.event_suffix }}){% endif %}</h3> <div class="mb-4"> Event dates: from {{ proceedings.event_start_date }} to {{ proceedings.event_end_date }}. @@ -9,8 +18,24 @@ Prepare your manuscript according to <a href="{% url 'submissions:author_guidelines' %}">our guidelines</a>, using <a href>our LaTeX template</a>. {% endif %} </div> +{% if proceedings.logo %} + </div> + <div class="col-lg-2"> + <img class="d-flex mr-3" src="{{ proceedings.logo.url }}" alt="logo"/> + </div> + </div> +{% endif %} <p>{{ proceedings.event_description|safe|linebreaksbr }}</p> +{% if proceedings.cover_image %} + </div> + <div class="col-lg-1"></div> + <div class="col-lg-2"> + <img class="d-flex mr-3" src="{{ proceedings.cover_image.url }}" alt="cover_image"/> + </div> + </div> +{% endif %} + {% if proceedings.fellowships.guests.exists %} <h3>Guest Fellows responsible for this Issue</h3> <ul>