-
Notifications
You must be signed in to change notification settings - Fork 1
Feat: UI templates for the districts
application
#98
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
Merged
Merged
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
10cf53b
feat: add District context for templates
lalver1 46f0969
feat: add ui placeholders for the districts pages
lalver1 7b93b1f
feat: re-organize context for templates using a mixin
lalver1 62e5262
chore: rename block to districts-content (plural) for consistency
lalver1 5cb85e2
refactor(views): DistrictView inherits from DetailView
lalver1 6f2679c
refactor: rename URL parameter and template context for clarity
lalver1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,24 @@ | ||
<h1>District {{ district }}</h1> | ||
<p>URL of route: {% url "districts:district" district %}</p> | ||
{% extends "districts/index.html" %} | ||
|
||
{% block headline %} | ||
District {{ url_district }} - {{ district_query.name }} | ||
{% endblock headline %} | ||
|
||
{% block district-content %} | ||
<div class="row"> | ||
<div class="col-lg-4 border"> | ||
<h2>Form</h2> | ||
</div> | ||
<div class="col-lg-8 border"> | ||
<h2>Chart</h2> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-lg-4 border"> | ||
<h2>Details for {{ district_query.name }}</h2> | ||
</div> | ||
<div class="col-lg-8 border"> | ||
<h2>Map</h2> | ||
</div> | ||
</div> | ||
{% endblock district-content %} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,46 @@ | ||
{% extends "core/base.html" %} | ||
|
||
{% block headline %} | ||
Districts | ||
{% endblock headline %} | ||
|
||
{% block inner-content %} | ||
<p>Districts</p> | ||
<div class="container p-t-lg"> | ||
<div class="row"> | ||
<div class="col-lg-2 pb-lg-5" role="complementary"> | ||
<!-- Side navigation --> | ||
<nav aria-labelledby="navigation-list" class="side-navigation"> | ||
<ul class="list-navigation"> | ||
{% for district in district_queryset %} | ||
<li> | ||
<a href="{% url 'districts:district' district.number %}">District {{ district.number }}</a> | ||
thekaveman marked this conversation as resolved.
Show resolved
Hide resolved
|
||
</li> | ||
{% endfor %} | ||
</ul> | ||
</nav> | ||
</div> | ||
<div class="col-lg-10 pb-lg-5"> | ||
|
||
{% block district-content %} | ||
<div class="row"> | ||
<div class="col-lg-4 border"> | ||
<h2>Form</h2> | ||
</div> | ||
<div class="col-lg-8 border"> | ||
<h2>Chart</h2> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-lg-4 border"> | ||
<h2>Details</h2> | ||
</div> | ||
<div class="col-lg-8 border"> | ||
<h2>Map</h2> | ||
</div> | ||
</div> | ||
{% endblock district-content %} | ||
|
||
</div> | ||
</div> | ||
</div> | ||
{% endblock inner-content %} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,24 @@ | ||
from django.views.generic import TemplateView | ||
|
||
from .models import District | ||
|
||
|
||
class IndexView(TemplateView): | ||
thekaveman marked this conversation as resolved.
Show resolved
Hide resolved
|
||
template_name = "districts/index.html" | ||
|
||
def get_context_data(self, **kwargs): | ||
context = super().get_context_data(**kwargs) | ||
context["district_queryset"] = District.objects.all() | ||
return context | ||
|
||
|
||
class DistrictView(TemplateView): | ||
thekaveman marked this conversation as resolved.
Show resolved
Hide resolved
|
||
template_name = "districts/district.html" | ||
|
||
def get_context_data(self, **kwargs): | ||
context = super().get_context_data(**kwargs) | ||
district = self.kwargs.get("district") | ||
context["district"] = district | ||
context["url_district"] = district | ||
thekaveman marked this conversation as resolved.
Show resolved
Hide resolved
|
||
context["district_queryset"] = District.objects.all() | ||
context["district_query"] = District.objects.all().get(number=district) | ||
return context |
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.