Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add publication date to collections #3369

Merged
merged 12 commits into from
Dec 20, 2018
Merged

Add publication date to collections #3369

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0f7f806
Add publication date to collections #3125
Dec 1, 2018
e319840
Fixed failing tests, pep8 formatting
k-brk Dec 1, 2018
3e1a539
Review fixes - renaming of published_at field and available property,…
k-brk Dec 2, 2018
5906c4c
Logic of collection templates, formatting
k-brk Dec 3, 2018
04c5b22
Review fixes - graphql field type, simplified logic
k-brk Dec 6, 2018
e99863c
Added newline before comment
k-brk Dec 7, 2018
2fecc34
collection publication logic
k-brk Dec 15, 2018
0ba7afb
Indentation and merge conflict
k-brk Dec 15, 2018
16a7f87
Merge branch 'master' into publicationdate
k-brk Dec 15, 2018
3515adc
Migration merge
k-brk Dec 15, 2018
7de1d91
Merge branch 'master' into publicationdate
k-brk Dec 19, 2018
de9ce0e
Updated changelog and migration merge
k-brk Dec 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions templates/collection/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
{% endblock %}

{% block collection_published_warning %}
{% if not object.is_published %}
<div class="alert alert-warning" role="alert">
{% blocktrans context "Unavailable collection detail text" %}
<strong>Warning!</strong>
You are previewing a collection that is not published.
{% endblocktrans %}
</div>
{% elif object.published_date is not None %}
{% if not object.is_visible %}
<div class="alert alert-warning" role="alert">
{% if object.published_date %}
k-brk marked this conversation as resolved.
Show resolved Hide resolved
{% blocktrans trimmed with date=object.published_date|date context "Unpublished collection details text" %}
<strong>Warning!</strong>
You are previewing a collection that will become visible on <strong>{{ date }}</strong>.
{% endblocktrans %}
{% else %}
{% blocktrans context "Unavailable collection detail text" %}
<strong>Warning!</strong>
You are previewing a collection that is not published.
{% endblocktrans %}
{% endif %}
</div>
{% endif %}
{% endblock %}
Expand Down