R1-268: Scholarships - Ordering and labels #1105
Open
Conversation
This file contains hidden or 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
neilbulloch
reviewed
Oct 31, 2025
rca/scholarships/models.py
Outdated
| # Scholarship listing fields | ||
| scholarships_listing_background_color = models.CharField( | ||
| max_length=10, | ||
| choices=(("light", "Light"), ("dark", "Dark")), |
There was a problem hiding this comment.
Suggestion:
class BackgroundColor(models.TextChoices):
LIGHT = "light", "Light"
DARK = "dark", "Dark"
class ScholarshipsListingPage(ContactFieldsMixin, BasePage):
# ...
scholarships_listing_background_color = models.CharField(
max_length=10,
choices=BackgroundColor.choices,
default=BackgroundColor.LIGHT,
help_text="Select the background color for this section",
verbose_name="Background Color",
)
neilbulloch
reviewed
Oct 31, 2025
There was a problem hiding this comment.
Suggestion: Avoid using autogenerated migration names :)
neilbulloch
reviewed
Oct 31, 2025
| <nav class="section filter-bar filter-bar--large {% if not results %}filter-bar--no-results-large{% endif %} " data-filter-bar> | ||
| <div class="grid"> | ||
| <div class="layout__start-one layout__span-two layout__@large-start-two layout__@large-span-three"> | ||
| {% if page.scholarships_listing_background_color == "dark" %} |
There was a problem hiding this comment.
Issue: Avoid using hard coded values (i.e. "dark") in templates
neilbulloch
reviewed
Oct 31, 2025
| </form> | ||
|
|
||
| <section class="section bg bg--light"> | ||
| {% if page.scholarships_listing_background_color == "dark" %} |
There was a problem hiding this comment.
Issue: Avoid using hard coded values in templates :)
neilbulloch
requested changes
Oct 31, 2025
There was a problem hiding this comment.
Thanks @patrickcuagan looks nice, just a couple of things :)
added 3 commits
November 3, 2025 09:14
…ature/268-scholarships-ordering-and-labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Ticket: https://torchbox.atlassian.net/browse/R1-268
This MR moves the scholarships filters section to be below the title in the scholarships listing page. Additionally, editors can choose its background color.
As for the filter label, we just add a simple rename to be 'Fee status' as requested.