allow table and search filter to display a heading and also hide the batch...

allow table and search filter to display a heading and also hide the batch actions if they're not being used

opentech/apply/funds/templates/funds/base_submissions_table.html

@@ -9,7 +9,7 @@
 
 {% block content %}
     {% block table %}
-        {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action %}
+        {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=True %}
 
         {% render_table table %}
     {% endblock %}

opentech/apply/funds/templates/funds/includes/table_filter_and_search.html

@@ -2,12 +2,20 @@
     <div class="actions-bar">
         {# Left #}
         <div class="actions-bar__inner actions-bar__inner--left">
-            <p class="actions-bar__total"><span class="js-total-actions">0</span> Selected</p>
-            <form action="" class="js-batch-update-status">
-                <button class="button button--action button--change-status" type="submit">Change status</button>
-            </form>
+            {% if heading %}
+                <h4 class="heading heading--normal heading--no-margin">{{ heading }}</h4>
+            {% endif %}
 
-            <button data-fancybox data-src="#batch-update-reviewers" class="button button--action button--reviewers js-batch-update-reviewers" type="submit">Reviewers</button>
+            {% if use_batch_actions %}
+                <div class="actions-bar__inner actions-bar__inner--batch-actions">
+                    <p class="actions-bar__total"><span class="js-total-actions">0</span> Selected</p>
+                    <form action="" class="js-batch-update-status">
+                        <button class="button button--action button--change-status" type="submit">Change status</button>
+                    </form>
+
+                    <button data-fancybox data-src="#batch-update-reviewers" class="button button--action button--reviewers js-batch-update-reviewers" type="submit">Reviewers</button>
+                </div>
+            {% endif %}
         </div>
 
         {# Right #}

opentech/apply/funds/templates/funds/rounds.html

@@ -20,7 +20,7 @@
 </div>
 
 <div class="wrapper wrapper--large wrapper--inner-space-medium">
-    {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term %}
+    {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_batch_actions=False %}
     {% render_table table %}
 </div>
 

opentech/apply/funds/templates/funds/submissions_overview.html

 {% extends "funds/base_submissions_table.html" %}
 {% load static %}
+{% load render_table from django_tables2 %}
 {% block title %}Submissions{% endblock %}
 
 {% block content %}
@@ -23,8 +24,9 @@
     {% endif %}
 
     {% block table %}
-        <h4 class="heading heading--normal heading--no-margin">All Submissions</h4>
-        {{ block.super }}
+        {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=False heading="All Submissions" %}
+
+        {% render_table table %}
         <div class="all-submissions-table__more">
             <a href="{% url 'apply:submissions:list' %}">Show all</a>
         </div>

opentech/static_src/src/sass/apply/components/_actions-bar.scss

@@ -26,6 +26,16 @@
         }
 
         &--left {
+            display: flex;
+            flex-direction: column;
+            align-items: flex-start;
+        }
+
+        &--right {
+            align-items: flex-end;
+        }
+
+        &--batch-actions {
             display: none;
 
             @include media-query(tablet-landscape) {
@@ -33,6 +43,7 @@
                 opacity: 0;
                 pointer-events: none;
                 transition: opacity $quick-transition;
+                margin: 20px 0 0;
 
                 .batch-actions-enabled & {
                     opacity: 1;

opentech/static_src/src/sass/apply/components/_button.scss

@@ -71,7 +71,6 @@
         display: flex;
         justify-content: space-between;
         max-width: 300px;
-        padding: 15px 20px;
         font-weight: $weight--normal;
         color: $color--default;
         background: url('./../../images/filters.svg') $color--white no-repeat 93% center;
@@ -215,7 +214,7 @@
 
         @include media-query(tablet-landscape) {
             background: none;
-            padding: 0;
+            padding: 10px;
             border: 0;
             align-items: center;
             justify-content: flex-start;

opentech/static_src/src/sass/apply/components/_wrapper.scss

@@ -267,12 +267,9 @@
     }
 
     &--table-actions {
-        margin-bottom: 20px;
-
         @include media-query(tablet-portrait) {
             display: flex;
             justify-content: space-between;
-
         }
 
         @include media-query(tablet-landscape) {