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.

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

Pro 1267 inactive buttons #1336

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2087,6 +2087,9 @@ msgstr "Löschen"
msgid "Enroll your child now."
msgstr "Jetzt anmelden."

msgid "Enrolling not possible."
msgstr "Anmeldungen nicht möglich."

msgid "Enroll"
msgstr "Anmelden"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2097,6 +2097,9 @@ msgstr "Supprimer"
msgid "Enroll your child now."
msgstr "Inscrivez votre enfant maintenant."

msgid "Enrolling not possible."
msgstr "Inscription impossible."

msgid "Enroll"
msgstr "Inscrire"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2081,6 +2081,9 @@ msgstr "Cancellare"
msgid "Enroll your child now."
msgstr "Iscriva ora suo figlio/a."

msgid "Enrolling not possible."
msgstr "Iscrizione non possibile."

msgid "Enroll"
msgstr "Iscrizione"

Expand Down
9 changes: 6 additions & 3 deletions src/onegov/feriennet/templates/macros.pt
Original file line number Diff line number Diff line change
Expand Up @@ -585,14 +585,17 @@
</ul>
</div>

<div class="call-to-action" tal:condition="show_enroll">
<span i18n:translate>
<div class="call-to-action">
<span i18n:translate tal:condition="show_enroll">
Enroll your child now.
</span>
<span i18n:translate tal:condition="not show_enroll">
Enrolling not possible.
</span>

<tal:b switch="request.is_logged_in">
<a tal:case="True" class="button" href="${wrap_occasion_link(request.link(occasion, 'book'))}" i18n:translate>Enroll</a>
<a tal:case="False" class="button" href="${layout.login_to_url(wrap_occasion_link(request.link(occasion, 'book')), skip=True)}" i18n:translate>Enroll</a>
<a tal:case="False" class="button ${'' if show_enroll else 'disabled'}" href="${layout.login_to_url(wrap_occasion_link(request.link(occasion, 'book')), skip=True) if show_enroll else '#'}" i18n:translate>Enroll</a>
</tal:b>
</div>

Expand Down
7 changes: 7 additions & 0 deletions src/onegov/feriennet/theme/styles/feriennet.scss
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,13 @@ ul.tags {
margin: 0;
width: 25%;

&.disabled {
background-color: $aluminum;
border-color: $aluminum;
color: $white;
cursor: default !important;
}

@media #{$medium-only} {
width: 30%;
}
Expand Down
12 changes: 6 additions & 6 deletions tests/onegov/feriennet/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1557,26 +1557,26 @@ def test_deadline(client, scenario):
assert period.is_prebooking_in_past is False
page = client.get('/activity/foo')
assert 'Anmelden' in page.pyquery('.call-to-action a')[0].text
assert 'Jetzt anmelden' in page

with freeze_time(prebook_midnight - timedelta(minutes=30)):
assert not period.wishlist_phase
assert period.is_prebooking_in_past is False
page = client.get('/activity/foo')
assert not page.pyquery('.call-to-action')
# assert not page.pyquery('.call-to-action')
assert 'Jetzt anmelden' not in page

with freeze_time(scenario.latest_period.booking_end + timedelta(days=1)):

# show no 'enroll' for ordinary users past the deadline
# (there is one login link, for the ordinary login)
assert str(client.get('/activity/foo')).count("Anmelden") == 1
# normal users can't enroll anymore
assert 'Anmeldungen nicht möglich' in page

# do show it for admins though and allow signups
# admins still can
admin = client.spawn()
admin.login_admin()

# the ordinary login link vanishes
assert str(admin.get('/activity/foo')).count("Abmelden") == 1
assert str(admin.get('/activity/foo')).count("Anmelden") == 1

page = admin.get('/activity/foo').click("Anmelden")
assert "Der Anmeldeschluss wurde erreicht" not in page.form.submit()
Expand Down
Loading