From ec489dad95c69394a730656fd5933bf5bf71837e Mon Sep 17 00:00:00 2001 From: Todd Dembrey <todd.dembrey@torchbox.com> Date: Wed, 23 Jan 2019 18:14:15 +0000 Subject: [PATCH] Add in the button to the bottom of the table --- .../funds/templates/funds/submissions.html | 4 ++++ opentech/apply/funds/views.py | 1 + .../components/_all-submissions-table.scss | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/opentech/apply/funds/templates/funds/submissions.html b/opentech/apply/funds/templates/funds/submissions.html index 753f01193..22a8f77e7 100644 --- a/opentech/apply/funds/templates/funds/submissions.html +++ b/opentech/apply/funds/templates/funds/submissions.html @@ -21,7 +21,11 @@ {% endif %} {% block table %} + <h4 class="heading heading--normal heading--no-margin">All Submissions</h4> {{ block.super }} + <div class="all-submissions-table__more"> + <a href="{% url 'apply:submissions:list' %}">Show all</a> + </div> {% endblock %} </div> diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py index 032b2e313..4cfdd0d6e 100644 --- a/opentech/apply/funds/views.py +++ b/opentech/apply/funds/views.py @@ -80,6 +80,7 @@ class BaseAdminSubmissionsTable(SingleTableMixin, FilterView): class SubmissionListView(AllActivityContextMixin, BaseAdminSubmissionsTable): template_name = 'funds/submissions.html' table_class = SummarySubmissionsTable + table_pagination = False def get_queryset(self): return super().get_queryset()[:10] diff --git a/opentech/static_src/src/sass/apply/components/_all-submissions-table.scss b/opentech/static_src/src/sass/apply/components/_all-submissions-table.scss index 4e00d921d..b06e88f91 100644 --- a/opentech/static_src/src/sass/apply/components/_all-submissions-table.scss +++ b/opentech/static_src/src/sass/apply/components/_all-submissions-table.scss @@ -3,6 +3,7 @@ $root: &; font-size: 14px; + thead { display: none; @@ -226,4 +227,21 @@ &__toggle { padding: 5px 0 5px 5px; } + + &__more { + display: flex; + justify-content: center; + background-color: $color--white; + padding: 20px 25px; + min-height: auto; + + a { + margin: 0; + flex-basis: auto; + font-weight: $weight--semibold; + } + + } + + } -- GitLab