SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit b51c5b17 authored by Jean-Sébastien Caux's avatar Jean-Sébastien Caux
Browse files

Improve presentation of Series

parent af85e107
No related branches found
No related tags found
No related merge requests found
# Generated by Django 2.2.11 on 2020-04-23 10:33
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('series', '0004_series_container_journals'),
]
operations = [
migrations.AddField(
model_name='series',
name='information',
field=models.TextField(blank=True, help_text='You can use plain text, Markdown or reStructuredText; see our <a href="/markup/help/" target="_blank">markup help</a> pages.'),
),
]
...@@ -16,6 +16,11 @@ class Series(models.Model): ...@@ -16,6 +16,11 @@ class Series(models.Model):
help_text=('You can use plain text, Markdown or reStructuredText; see our ' help_text=('You can use plain text, Markdown or reStructuredText; see our '
'<a href="/markup/help/" target="_blank">markup help</a> pages.') '<a href="/markup/help/" target="_blank">markup help</a> pages.')
) )
information = models.TextField(
help_text=('You can use plain text, Markdown or reStructuredText; see our '
'<a href="/markup/help/" target="_blank">markup help</a> pages.'),
blank=True
)
image = models.ImageField(upload_to='series/images/', blank=True) image = models.ImageField(upload_to='series/images/', blank=True)
container_journals = models.ManyToManyField( container_journals = models.ManyToManyField(
'journals.Journal', 'journals.Journal',
......
...@@ -18,12 +18,12 @@ ...@@ -18,12 +18,12 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<h1 class="highlight"> <h1 class="highlight">
{{ collection.series.name }} <a href="{{ collection.series.get_absolute_url }}">{{ collection.series.name }}</a>
{% if collection.series.container_journals %} {% if collection.series.container_journals %}
<br> <br>
<small><em> <small><em>
<ul class="list list-inline mt-2 mb-0"> <ul class="list list-inline mt-2 mb-0">
<li class="list-inline-item mx-0">contained in</li> <li class="list-inline-item mx-0">a series contained in</li>
{% for container in collection.series.container_journals.all %} {% for container in collection.series.container_journals.all %}
<li class="list-inline-item"> <li class="list-inline-item">
<a href="{{ container.get_absolute_url }}">{{ container }}</a> <a href="{{ container.get_absolute_url }}">{{ container }}</a>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
{% endif %} {% endif %}
</h1> </h1>
<h2 class="highlight"> <h2 class="highlight">
{{ collection.name }} Collection&emsp;{{ collection.name }}
</h2> </h2>
</div> </div>
</div> </div>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<br> <br>
<small><em> <small><em>
<ul class="list list-inline mt-2 mb-0"> <ul class="list list-inline mt-2 mb-0">
<li class="list-inline-item mx-0">contained in</li> <li class="list-inline-item mx-0">a series contained in</li>
{% for container in series.container_journals.all %} {% for container in series.container_journals.all %}
<li class="list-inline-item"> <li class="list-inline-item">
<a href="{{ container.get_absolute_url }}">{{ container }}</a> <a href="{{ container.get_absolute_url }}">{{ container }}</a>
...@@ -30,22 +30,26 @@ ...@@ -30,22 +30,26 @@
</em></small> </em></small>
{% endif %} {% endif %}
</h2> </h2>
<ul>
<li><a href="#description">Description</a></li>
<li><a href="#collections">Collections in this Series</a></li>
<li><a href="#information">Detailed information</a></li>
</ul>
<div class="p-2">
<img class="d-flex mr-3" alt="series image" src="{{ series.image.url }}">
</div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-lg-6">
<h3 class="highlight" id="description">Description</h3>
<div class="p-2"> <div class="p-2">
{{ series.description|automarkup }} {{ series.description|automarkup }}
</div> </div>
<div class="p-2">
<img class="d-flex mr-3" alt="series image" src="{{ series.image.url }}">
</div>
</div> </div>
</div>
<div class="row"> <div class="col-lg-6">
<div class="col-12"> <h3 class="highlight" id="collections">Collections in this Series</h3>
<h3 class="highlight">Collections in this Series</h3>
<ul> <ul>
{% for collection in series.collection_set.all %} {% for collection in series.collection_set.all %}
<li><a href="{{ collection.get_absolute_url }}">{{ collection }}</a></li> <li><a href="{{ collection.get_absolute_url }}">{{ collection }}</a></li>
...@@ -56,4 +60,16 @@ ...@@ -56,4 +60,16 @@
</div> </div>
</div> </div>
<div class="row">
<div class="col-12">
<h3 class="highlight" id="information">
Detailed information&nbsp;
<a data-toggle="collapse" href="#series-information" aria-expanded="false" aria-controls="series-information">(show/hide)</a>
</h3>
<div id="series-information" class="p-2 collapse">
{{ series.information|automarkup }}
</div>
</div>
</div>
{% endblock content %} {% endblock content %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment