From 888c12e684af7963c06577a5bb3eae739e957aab Mon Sep 17 00:00:00 2001
From: dojutsu-user <vaibhgupt199@gmail.com>
Date: Sun, 3 Feb 2019 14:30:29 +0530
Subject: [PATCH 1/2] use javascript

---
 readthedocs/templates/account/email.html | 146 ++++++++++++++---------
 1 file changed, 91 insertions(+), 55 deletions(-)

diff --git a/readthedocs/templates/account/email.html b/readthedocs/templates/account/email.html
index b56f72ac185..7c0cc3c8a1b 100644
--- a/readthedocs/templates/account/email.html
+++ b/readthedocs/templates/account/email.html
@@ -9,68 +9,104 @@
 {% block edit_content_header %} {% trans "Change Email" %} {% endblock %}
 
 {% block edit_content %}
-{% if user.emailaddress_set.all %}
-<p>{% trans 'The following email addresses are associated with your account:' %}</p>
-
-<form action="{% url 'account_email' %}" class="email_list" method="post">
-{% csrf_token %}
-<fieldset class="blockLabels">
-
-  {% for emailaddress in user.emailaddress_set.all %}
-<div class="ctrlHolder">
-      <label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
-
-      <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary %}checked="checked"{%endif %} value="{{emailaddress.email}}"/>
-
-{{ emailaddress.email }}
-    {% if emailaddress.verified %}
-    <span class="verified">{% trans "Verified" %}</span>
-    {% else %}
-    <span class="unverified">{% trans "Unverified" %}</span>
-    {% endif %}
-      {% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</span>{% endif %}
-</label>
-</div>
-  {% endfor %}
-
-<div class="buttonHolder">
-      <button class="secondaryAction" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button>
-      <button class="secondaryAction" type="submit" name="action_send" >{% trans 'Re-send Verification' %}</button>
-      <button class="primaryAction" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
-</div>
+  {% if user.emailaddress_set.all %}
+    <p>{% trans 'The following email addresses are associated with your account:' %}</p>
+
+    <form action="{% url 'account_email' %}" class="email_list" method="post">
+      {% csrf_token %}
+      <fieldset class="blockLabels">
+
+        {% for emailaddress in user.emailaddress_set.all %}
+          <div class="ctrlHolder">
+            <label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
+              <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary %}checked="checked"{%endif %} value="{{emailaddress.email}}"/>
+
+              {{ emailaddress.email }}
+                {% if emailaddress.verified %}
+                  <span class="verified">{% trans "Verified" %}</span>
+                {% else %}
+                  <span class="unverified">{% trans "Unverified" %}</span>
+                {% endif %}
+                {% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</span>{% endif %}
+            </label>
+          </div>
+        {% endfor %}
+
+        <div class="buttonHolder">
+          <button class="secondaryAction" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button>
+          <button class="secondaryAction" type="submit" name="action_send" >{% trans 'Re-send Verification' %}</button>
+          <button class="primaryAction" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
+        </div>
+
+      </fieldset>
+    </form>
 
-</fieldset>
-</form>
+  {% else %}
 
-{% else %}
-<p><strong>{% trans 'Warning:'%}</strong> {% trans "You currently do not have any email address set up. You should really add an email address so you can receive notifications, reset your password, etc." %}</p>
+  <p><strong>{% trans 'Warning:'%}</strong>{% trans "You currently do not have any email address set up. You should really add an email address so you can receive notifications, reset your password, etc." %}</p>
 
-{% endif %}
+  {% endif %}
 
+  <h2>{% trans "Add E-mail Address" %}</h2>
 
-    <h2>{% trans "Add E-mail Address" %}</h2>
-
-    <form method="post" action="{% url 'account_email' %}" class="add_email">
-        {% csrf_token %}
-        {{ form.as_p}}
-        <button name="action_add" type="submit">{% trans "Add E-mail" %}</button>
-    </form>
+  <form method="post" action="{% url 'account_email' %}" class="add_email">
+    {% csrf_token %}
+    {{ form.as_p }}
+    <button name="action_add" type="submit">{% trans "Add E-mail" %}</button>
+  </form>
 
 {% endblock %}
 
+{% block footerjs %}
+
+  (function() {
+    var message = "{% trans 'Do you really want to remove the selected email address?' %}";
+    var actions = document.getElementsByName('action_remove');
+    if (actions.length) {
+      actions[0].addEventListener("click", function(e) {
+        if (! confirm(message)) {
+          e.preventDefault();
+        }
+      });
+    }
+  })();
+
+  (function() {
+    var primaryButton = document.querySelector("button[name=action_primary]");
+    var sendVerificationButton = document.querySelector("button[name=action_send");
+
+    {% if user.emailaddress_set.all %}
+      {% for emailaddress in user.emailaddress_set.all %}
+        var email_{{ forloop.counter }} = document.querySelector("input[value='{{ emailaddress.email }}']")
+        if (email_{{ forloop.counter }}.checked == true) {
+          {% if emailaddress.primary %}
+            primaryButton.style.display = 'None';
+          {% else %}
+            primaryButton.style.display = 'block';
+          {% endif %}
+          {% if emailaddress.verified %}
+            sendVerificationButton.style.display = 'None';
+          {% else %}
+            sendVerificationButton.style.display = 'block';
+            primaryButton.style.display = 'None';
+          {% endif %}
+        }
+
+        email_{{ forloop.counter }}.addEventListener('change', function() {
+          {% if emailaddress.primary %}
+            primaryButton.style.display = 'None';
+          {% else %}
+            primaryButton.style.display = 'block';
+          {% endif %}
+          {% if emailaddress.verified %}
+            sendVerificationButton.style.display = 'None';
+          {% else %}
+            sendVerificationButton.style.display = 'block';
+            primaryButton.style.display = 'None';
+          {% endif %}
+        })
+      {% endfor %}
+    {% endif %}
+  })();
 
-{% block extra_body %}
-<script type="text/javascript">
-(function() {
-  var message = "{% trans 'Do you really want to remove the selected email address?' %}";
-  var actions = document.getElementsByName('action_remove');
-  if (actions.length) {
-    actions[0].addEventListener("click", function(e) {
-      if (! confirm(message)) {
-        e.preventDefault();
-      }
-    });
-  }
-})();
-</script>
 {% endblock %}

From 3e8a6426b0c5c9d46d52e87d64b5ffd6595dcb03 Mon Sep 17 00:00:00 2001
From: dojutsu-user <vaibhgupt199@gmail.com>
Date: Thu, 9 May 2019 17:09:34 +0530
Subject: [PATCH 2/2] small lint fixes

---
 readthedocs/templates/account/email.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/readthedocs/templates/account/email.html b/readthedocs/templates/account/email.html
index 7c0cc3c8a1b..1ae3b42fc42 100644
--- a/readthedocs/templates/account/email.html
+++ b/readthedocs/templates/account/email.html
@@ -10,7 +10,7 @@
 
 {% block edit_content %}
   {% if user.emailaddress_set.all %}
-    <p>{% trans 'The following email addresses are associated with your account:' %}</p>
+    <p>{% trans "The following email addresses are associated with your account:" %}</p>
 
     <form action="{% url 'account_email' %}" class="email_list" method="post">
       {% csrf_token %}
@@ -18,8 +18,8 @@
 
         {% for emailaddress in user.emailaddress_set.all %}
           <div class="ctrlHolder">
-            <label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
-              <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary %}checked="checked"{%endif %} value="{{emailaddress.email}}"/>
+            <label for="email_radio_{{ forloop.counter }}" class="{% if emailaddress.primary %}primary_email{%endif%}">
+              <input id="email_radio_{{ forloop.counter }}" type="radio" name="email" {% if emailaddress.primary %}checked="checked"{%endif %} value="{{ emailaddress.email }}"/>
 
               {{ emailaddress.email }}
                 {% if emailaddress.verified %}
@@ -33,9 +33,9 @@
         {% endfor %}
 
         <div class="buttonHolder">
-          <button class="secondaryAction" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button>
-          <button class="secondaryAction" type="submit" name="action_send" >{% trans 'Re-send Verification' %}</button>
-          <button class="primaryAction" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
+          <button class="secondaryAction" type="submit" name="action_primary" >{% trans "Make Primary" %}</button>
+          <button class="secondaryAction" type="submit" name="action_send" >{% trans "Re-send Verification" %}</button>
+          <button class="primaryAction" type="submit" name="action_remove" >{% trans "Remove" %}</button>
         </div>
 
       </fieldset>
@@ -43,7 +43,7 @@
 
   {% else %}
 
-  <p><strong>{% trans 'Warning:'%}</strong>{% trans "You currently do not have any email address set up. You should really add an email address so you can receive notifications, reset your password, etc." %}</p>
+  <p><strong>{% trans "Warning:" %}</strong>{% trans "You currently do not have any email address set up. You should really add an email address so you can receive notifications, reset your password, etc." %}</p>
 
   {% endif %}
 
@@ -75,7 +75,7 @@ <h2>{% trans "Add E-mail Address" %}</h2>
     var primaryButton = document.querySelector("button[name=action_primary]");
     var sendVerificationButton = document.querySelector("button[name=action_send");
 
-    {% if user.emailaddress_set.all %}
+    {% if user.emailaddress_set.exists %}
       {% for emailaddress in user.emailaddress_set.all %}
         var email_{{ forloop.counter }} = document.querySelector("input[value='{{ emailaddress.email }}']")
         if (email_{{ forloop.counter }}.checked == true) {