-
Notifications
You must be signed in to change notification settings - Fork 9
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
LittlePay Modal #1516
Merged
Merged
LittlePay Modal #1516
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
32004a2
feat(enrollment-index): modal - first pass at LittlePay modal, modal …
machikoyasuda d7438fa
refactor(modal-trigger): use button instead of link, so it opens on s…
machikoyasuda a279c8c
refactor(enrollment-index): put strings in django.po
machikoyasuda dd23c15
fix(enrollment-index): reduce space
machikoyasuda a38cc1e
refactor(modal-trigger): allow classes to be specified into modal tri…
machikoyasuda 6cc3342
fix(modal-trigger): -5px to make . closer
machikoyasuda 86f04fc
refactor(modal-info): create Modal Info, template for info-only modals
machikoyasuda 2f4b772
fix(modal): add modal trigger hover color, make btn close standout color
machikoyasuda 05a88c1
fix(copy): move the period over
machikoyasuda 0eb8011
fix(copy): move period in for Spanish too
machikoyasuda 8fff84e
Merge branch 'dev' into feat/1481-veterans--littlepay-modal
machikoyasuda File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
<!-- Modal --> | ||
{% with id|add:"-modal-label" as aria_labelledby_id %} | ||
<div class="modal fade" id="{{ id }}" tabindex="-1" aria-labelledby="{{ aria_labelledby_id }}" aria-hidden="true"> | ||
<div class="modal-dialog {{ size }} modal-dialog-centered modal-dialog-scrollable"> | ||
<div class="modal-content"> | ||
<div class="modal-header border-0 p-2"> | ||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> | ||
</div> | ||
<div class="modal-body pt-0 mt-0 p-4 m-2"> | ||
{% block modal-content %} | ||
{% endblock modal-content %} | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
{% endwith %} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
<!-- Button to trigger modal --> | ||
<button type="button" class="btn btn-lg btn-primary" data-bs-toggle="modal" data-bs-target="#{{ id }}">{{ text }}</button> | ||
<button type="button" class="{{ classes }}" data-bs-toggle="modal" data-bs-target="#{{ id }}">{{ text }}</button> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
benefits/enrollment/templates/enrollment/includes/modal--littlepay.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{% extends "core/includes/modal-info.html" %} | ||
{% load i18n %} | ||
{% load static %} | ||
|
||
{% block modal-content %} | ||
<h2 id="littlepay-modal">{% translate "enrollment.pages.index.modal.title" %}</h2> | ||
<div class="row"> | ||
<p class="pt-3">{% translate "enrollment.pages.index.modal.p[0]" %}</p> | ||
<p class="pt-4">{% translate "enrollment.pages.index.modal.p[1]" %}</p> | ||
</div> | ||
{% endblock modal-content %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This code is pretty similar to
modal.html
. The only differences aresize
on line 4 and some spacing (p-2
on line 6,pt-0 mt-0 p-4 m-2
on line 9).It might be worth it to find a way to make them one file. It doesn't necessarily have to be in this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Definitely can be done in a future PR!