From 5d36cac868f84fe47d07f7ea4be63799c50b45e9 Mon Sep 17 00:00:00 2001
From: Chris Lawton <chris.lawton@torchbox.com>
Date: Fri, 18 Jan 2019 15:59:35 +0000
Subject: [PATCH] rename all submission table
---
opentech/apply/funds/tables.py | 4 ++--
opentech/apply/funds/templates/funds/tables/table.html | 4 ++--
.../static_src/src/javascript/apply/all-submissions-table.js | 4 ++--
opentech/static_src/src/sass/apply/abstracts/_variables.scss | 3 +++
.../{_all-submissions.scss => _all-submissions-table.scss} | 5 +----
opentech/static_src/src/sass/apply/components/_table.scss | 4 +---
opentech/static_src/src/sass/apply/main.scss | 2 +-
7 files changed, 12 insertions(+), 14 deletions(-)
rename opentech/static_src/src/sass/apply/components/{_all-submissions.scss => _all-submissions-table.scss} (98%)
diff --git a/opentech/apply/funds/tables.py b/opentech/apply/funds/tables.py
index ded01709b..b4475fc02 100644
--- a/opentech/apply/funds/tables.py
+++ b/opentech/apply/funds/tables.py
@@ -19,7 +19,7 @@ from .widgets import Select2MultiCheckboxesWidget
def make_row_class(record):
- css_class = 'submission-meta__row' if record.next else 'all-submissions__parent'
+ css_class = 'submission-meta__row' if record.next else 'all-submissions-table__parent'
css_class += '' if record.active else ' is-inactive'
return css_class
@@ -48,7 +48,7 @@ class SubmissionsTable(tables.Table):
'class': make_row_class,
'data-record-id': lambda record: record.id,
}
- attrs = {'class': 'all-submissions'}
+ attrs = {'class': 'all-submissions-table'}
def render_user(self, value):
return value.get_full_name()
diff --git a/opentech/apply/funds/templates/funds/tables/table.html b/opentech/apply/funds/templates/funds/tables/table.html
index 9a7848ff7..a6f7eea2d 100644
--- a/opentech/apply/funds/templates/funds/tables/table.html
+++ b/opentech/apply/funds/templates/funds/tables/table.html
@@ -12,7 +12,7 @@
</tr>
{% with submission=row.record %}
- <tr class="all-submissions__child" data-parent-id="{{ submission.id }}">
+ <tr class="all-submissions-table__child" data-parent-id="{{ submission.id }}">
<td colspan="{{ table.columns|length }}">
<table class="submission-meta">
<tr class="submission-meta__row">
@@ -48,7 +48,7 @@
{% if row.record.previous %}
{# we have a linked application, re-render the header row #}
- <tr class="all-submissions__child" data-parent-id="{{ row.record.id }}">
+ <tr class="all-submissions-table__child" data-parent-id="{{ row.record.id }}">
<td colspan="{{ table.columns|length }}">
<table class="submission-meta">
<tr class="submission-meta__row">
diff --git a/opentech/static_src/src/javascript/apply/all-submissions-table.js b/opentech/static_src/src/javascript/apply/all-submissions-table.js
index 71d6f2087..f98d01454 100644
--- a/opentech/static_src/src/javascript/apply/all-submissions-table.js
+++ b/opentech/static_src/src/javascript/apply/all-submissions-table.js
@@ -3,7 +3,7 @@
'use strict';
// add the toggle arrow before the submission titles
- $('.all-submissions__parent td.title').prepend('<span class="all-submissions__toggle js-toggle-submission"><span class="arrow"></span></span>');
+ $('.all-submissions-table__parent td.title').prepend('<span class="all-submissions-table__toggle js-toggle-submission"><span class="arrow"></span></span>');
// grab all the toggles
const children = Array.prototype.slice.call(
@@ -13,7 +13,7 @@
// show/hide the submission child rows
children.forEach(function (child) {
child.addEventListener('click', (e) => {
- $(e.target).closest('.all-submissions__parent').toggleClass('is-expanded');
+ $(e.target).closest('.all-submissions-table__parent').toggleClass('is-expanded');
});
});
diff --git a/opentech/static_src/src/sass/apply/abstracts/_variables.scss b/opentech/static_src/src/sass/apply/abstracts/_variables.scss
index 62949ad6d..dd696f978 100644
--- a/opentech/static_src/src/sass/apply/abstracts/_variables.scss
+++ b/opentech/static_src/src/sass/apply/abstracts/_variables.scss
@@ -117,3 +117,6 @@ $filter-dropdown: '.select2 .select2-selection.select2-selection--single';
// listing header/spacer height
$listing-header-height: 75px;
+
+// Table breakpoint
+$table-breakpoint: 'tablet-landscape';
diff --git a/opentech/static_src/src/sass/apply/components/_all-submissions.scss b/opentech/static_src/src/sass/apply/components/_all-submissions-table.scss
similarity index 98%
rename from opentech/static_src/src/sass/apply/components/_all-submissions.scss
rename to opentech/static_src/src/sass/apply/components/_all-submissions-table.scss
index ea72a28ba..015611bec 100644
--- a/opentech/static_src/src/sass/apply/components/_all-submissions.scss
+++ b/opentech/static_src/src/sass/apply/components/_all-submissions-table.scss
@@ -1,7 +1,4 @@
-// also in _table.scss
-$table-breakpoint: 'tablet-landscape';
-
-.all-submissions {
+.all-submissions-table {
$root: &;
font-size: 14px;
diff --git a/opentech/static_src/src/sass/apply/components/_table.scss b/opentech/static_src/src/sass/apply/components/_table.scss
index 122903dc6..3b5dfbe90 100644
--- a/opentech/static_src/src/sass/apply/components/_table.scss
+++ b/opentech/static_src/src/sass/apply/components/_table.scss
@@ -1,6 +1,4 @@
-// also in _all-submissions.scss
-$table-breakpoint: 'tablet-landscape';
-
+// base table styles - specific ones in their own scss partial
table {
width: 100%;
background-color: $color--white;
diff --git a/opentech/static_src/src/sass/apply/main.scss b/opentech/static_src/src/sass/apply/main.scss
index 930863ffb..092fcff4b 100644
--- a/opentech/static_src/src/sass/apply/main.scss
+++ b/opentech/static_src/src/sass/apply/main.scss
@@ -8,7 +8,7 @@
@import 'base/typography';
// Components
-@import 'components/all-submissions';
+@import 'components/all-submissions-table';
@import 'components/admin-bar';
@import 'components/activity-feed';
@import 'components/comment';
--
GitLab