Move 'add new candiadte' button / form into the table

I think this is a nicer way to link 'candidate actions' with the
candidate table, leaving other actions to be 'ballot actions' in a
fucutre commit.

Author: symroe

ynr/apps/candidates/models/popolo_extra.py

@@ -615,7 +615,6 @@ def user_can_edit_membership(self, user, allow_if_trusted_to_lock=True):
         if (
             not self.candidates_locked
             and not self.cancelled
-            and not hasattr(self, "sopn")
         ):
             return True
 

ynr/apps/candidates/static/candidates/_forms.scss

@@ -73,6 +73,10 @@ form.signup {
 .form-item {
   margin-bottom: 1.5em;
 
+  .row {
+    margin: 0;
+  }
+
   input,
   select,
   p {

ynr/apps/candidates/static/js/ballot.js

@@ -18,14 +18,19 @@ $(function() {
   }
 
   /* Set up the hide / reveal for the add new candidate form */
-  $('.show-new-candidate-form').on('click', function(e){
+  $(document).on('click', '.show-new-candidate-form', function(e){
     e.preventDefault();
+    e.target.classList.add('hide-new-candidate-form')
+    e.target.classList.remove('show-new-candidate-form')
     var newCandidate = getNewCandidateDiv(e.target);
     newCandidate.slideDown(function(){
       newCandidate.find('input:text').eq(0).focus();
     });
   });
-  $('.hide-new-candidate-form').on('click', function(e){
+  $(document).on('click', '.hide-new-candidate-form', function(e){
+    e.preventDefault();
+    e.target.classList.add('show-new-candidate-form')
+    e.target.classList.remove('hide-new-candidate-form')
     var newCandidate = getNewCandidateDiv(e.target);
     newCandidate.slideUp();
   });

ynr/apps/candidates/tests/test_candidacy_add_and_remove.py

@@ -1,3 +1,5 @@
+import re
+
 from django_webtest import WebTest
 from official_documents.models import BallotSOPN
 from people.tests.factories import PersonFactory
@@ -63,9 +65,14 @@ def test_can_see_add_button_with_no_sopn(self):
             user=self.user,
         )
         self.assertContains(response, "Add a new candidate")
+
+        # We allow adding candidates when there is a SOPN
+        # but we mark the button as 'secondary'
         BallotSOPN.objects.create(ballot=ballot)
         response = self.app.get(
             ballot.get_absolute_url(),
             user=self.user,
         )
-        self.assertNotContains(response, "Add a new candidate")
+        button = response.html.find("a", text=re.compile("Add a new candidate"))
+        self.assertIsNotNone(button)
+        self.assertIn("secondary", button["class"])

ynr/apps/elections/templates/elections/ballot_view.html

@@ -42,7 +42,6 @@ <h1>{{ ballot.post.label }}</h1>
 
 
 {% block content %}
-
 <div class="row">
   <div class="columns large-9">
     <div class="ballot_status">
@@ -76,6 +75,9 @@ <h2>Candidates unknown</h2>
                 We don’t know of any candidates in {{ ballot.post.label }} for the {{ ballot.election.name }} yet.
             We expect the official list of candidates to be published on or after
                 <strong>{{ ballot.expected_sopn_date }}</strong>.</p>
+            <p class="clearfix">
+            {% include "elections/includes/_ballot_add_candidate.html" with position='left' %}
+            </p>
         {% endif %}
     </div>
 
@@ -182,61 +184,46 @@ <h2>Candidates unknown</h2>
             {% endif %}
           </tr>
           {% endfor %}
+
+          {% if membership_edits_allowed or not user.is_authenticated and not ballot.has_sopn%}
+        <tr>
+        <td colspan="3">
+          {% include "elections/includes/_ballot_add_candidate.html" %}
+        </td>
+        </tr>
+
+      {% endif %}
+
+
         </tbody>
       </table>
       {% endif %}
+
+    <div class="ballot-ctas">
       {% if user_can_record_results and has_any_winners %}
         <form action="{% url 'retract-winner' ballot_paper_id=ballot.ballot_paper_id %}" method="post">
           {% csrf_token %}
           <input type="submit" class="button alert small" value="Unset the current winners, if incorrect">
         </form>
       {% endif %}
-
-    <div class="ballot-ctas">
-
       {% include "elections/includes/_ballot_suggest_locking.html" %}
       {% include "elections/includes/_ballot_lock_form.html" %}
 
       {% if user_can_review_photos and ballot.get_absolute_queued_image_review_url %}
         <p>This ballot has candidate photos awaiting approval.<a href="{{ ballot.get_absolute_queued_image_review_url }}"> Do you have time to review them?</a></p>
       {% endif %}
-
-      {% if membership_edits_allowed %}
-        <p class="right-align">
-          <a class="show-new-candidate-form button {% if ballot.has_sopn %}secondary{% endif %}" href="{% url 'person-create' ballot_paper_id=ballot.ballot_paper_id %}">
-            Add a new candidate
-          </a>
-        </p>
-      {% elif not user.is_authenticated and not ballot.has_sopn %}
-        <p>
-
-          <a href="{% url 'wombles:login' %}?next={{ request.path }}" class="button">
-            Sign in to add a new candidate
-          </a>
-        </p>
-      {% endif %}
     </div>
 
-    {% if membership_edits_allowed %}
-      {% if add_candidate_form %}
-        <div class="candidates__new" {% if add_candidate_form.errors %}style="display: block"{% endif %}>
-          <h4>Add a new candidate</h4>
-          <form id="new-candidate-form" name="new-candidate-form" action="{% url 'person-create' ballot_paper_id=ballot.ballot_paper_id %}" method="post">
-          {% with form=add_candidate_form identifiers_formset=identifiers_formset %}
-            {% include 'candidates/_person_form.html' %}
-          {% endwith %}
-          </form>
-        </div>
-      {% endif %}
 
-      {# Only include these if the user can alter memberships #}
-      {% include "elections/includes/_ballot_candidates_might_stand.html" %}
-      {% include "elections/includes/_ballot_candidates_not_standing.html" %}
-    {% endif %}
   {% if ballot.has_results and ballot.resultset %}
     {% include "elections/includes/_ballot_results_table.html" with results=ballot.resultset %}
   {% endif %}
 
+   {# Only include these if the user can alter memberships #}
+      {% include "elections/includes/_ballot_candidates_might_stand.html" %}
+      {% include "elections/includes/_ballot_candidates_not_standing.html" %}
+
+
   {% if user.is_authenticated and logged_actions %}
     <h2 id="history">History for this ballot</h2>
     {% for action in logged_actions %}

ynr/apps/elections/templates/elections/includes/_ballot_add_candidate.html

@@ -0,0 +1,24 @@
+{% if not user.is_authenticated and not ballot.has_sopn %}
+    <a href="{% url 'wombles:login' %}?next={{ request.path }}" class="button small right" style="margin:0">
+        Sign in to add a new candidate
+    </a>
+{% endif %}
+
+{% if membership_edits_allowed %}
+    <a class="show-new-candidate-form button small {% if not position %}right{% endif %} {% if ballot.has_sopn %}secondary{% else %}success{% endif %}"
+       style="margin:0" href="{% url 'person-create' ballot_paper_id=ballot.ballot_paper_id %}">
+        Add a new candidate
+    </a>
+
+    {% if add_candidate_form %}
+        <div class="candidates__new" {% if add_candidate_form.errors %}style="display: block"{% endif %}>
+            <h4>Add a new candidate</h4>
+            <form id="new-candidate-form" name="new-candidate-form"
+                  action="{% url 'person-create' ballot_paper_id=ballot.ballot_paper_id %}" method="post">
+                {% with form=add_candidate_form identifiers_formset=identifiers_formset %}
+                    {% include 'candidates/_person_form.html' %}
+                {% endwith %}
+            </form>
+        </div>
+    {% endif %}
+{% endif %}

ynr/apps/elections/tests/data_timeline_helper.py

@@ -1,3 +1,5 @@
+import re
+
 from django_webtest import WebTest
 
 
@@ -72,14 +74,11 @@ def assertDataTimelineNotLocked(self, response):
 
     def assertDataTimelineShowAddCandidateCTA(self, response):
         if not response.context["user"].is_authenticated:
-            self.assertInHTML(
-                """
-                <a href="/accounts/login/?next=/elections/local.foo.bar.2019-08-03/" class="button">
-                    Sign in to add a new candidate
-                </a>
-                """,
-                response.text,
+            button = response.html.find(
+                "a", text=re.compile("Sign in to add a new candidate")
             )
+            self.assertIsNotNone(button)
+            self.assertEqual(button["href"], "/accounts/login/?next=/elections/local.foo.bar.2019-08-03/")
 
     def assertDataTimelineCandidateAddingInProgress(self, response):
         self.assertDataTimelineShown(response)