From 269744118ecdaadced751f27faee83ec12d20ba0 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 27 2020 16:21:29 +0000
Subject: [PATCH 1/2] Fix a missing closing div


This was messing up the entire settings page

Fixes https://pagure.io/pagure/issue/4787

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/templates/user_settings.html b/pagure/templates/user_settings.html
index e4d082c..38cedd1 100644
--- a/pagure/templates/user_settings.html
+++ b/pagure/templates/user_settings.html
@@ -142,6 +142,7 @@
               </div>
             </div>
           </div>
+         </div>
           <div class="row">
             <div class="col">
                     <p>

From ca5a869a3082bc5afae7d5b6dfba7fe5eb9f47e4 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 27 2020 16:21:29 +0000
Subject: [PATCH 2/2] Rework HTML indentation to make it easier to read/follow


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/templates/_api_token.html b/pagure/templates/_api_token.html
index cbb65c0..e7461be 100644
--- a/pagure/templates/_api_token.html
+++ b/pagure/templates/_api_token.html
@@ -1,96 +1,96 @@
 {% macro render_api_token(token, repo, username, form) -%}
 <div class="form-group{% if token.expired %} expired_api_keys{% endif %}">
-    <div class="input-group">
-      <div class="input-group-prepend">
-        <span class="input-group-text">
-          <span class="fa fa-key"></span>
-          <strong> {{ token.description or '' }}</strong>
-        </span>
-      </div>
-      <div class="input-group-prepend">
-        <span class="input-group-text">
-          <a href="#"
-            data-toggle="modal" data-target="#acls{{ token.id }}">
-            {{token.acls_list_pretty|length}} ACLs
-          </a>
-        </span>
-        <div class="modal fade" id="acls{{ token.id }}" tabindex="-1"
-              role="dialog" aria-labelledby="ACLs" aria-hidden="true">
-          <div class="modal-dialog" role="document">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                  <span aria-hidden="true">&times;</span>
-                  <span class="sr-only">Close</span>
-                </button>
-                <h4 class="modal-title" id="myModalLabel">ACLs</h4>
-              </div>
-              <div class="modal-body">
-                <ul>
-                  {% for acl in token.acls_list_pretty %}
-                    <li>{{ acl }}</li>
-                  {% endfor %}
-                </ul>
-              </div>
+  <div class="input-group">
+    <div class="input-group-prepend">
+      <span class="input-group-text">
+        <span class="fa fa-key"></span>
+        <strong> {{ token.description or '' }}</strong>
+      </span>
+    </div>
+    <div class="input-group-prepend">
+      <span class="input-group-text">
+        <a href="#"
+          data-toggle="modal" data-target="#acls{{ token.id }}">
+          {{token.acls_list_pretty|length}} ACLs
+        </a>
+      </span>
+      <div class="modal fade" id="acls{{ token.id }}" tabindex="-1"
+            role="dialog" aria-labelledby="ACLs" aria-hidden="true">
+        <div class="modal-dialog" role="document">
+          <div class="modal-content">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+                <span class="sr-only">Close</span>
+              </button>
+              <h4 class="modal-title" id="myModalLabel">ACLs</h4>
+            </div>
+            <div class="modal-body">
+              <ul>
+                {% for acl in token.acls_list_pretty %}
+                  <li>{{ acl }}</li>
+                {% endfor %}
+              </ul>
             </div>
           </div>
         </div>
       </div>
+    </div>
 
-      <input class="form-control bg-white font-monospace" type="text" value="{{ token.id }}" readonly>
-      {% if token.expired %}
-        <span class="input-group-prepend">
-          <span class="input-group-text text-danger">
-            <small class="font-weight-bold">Expired on {{ token.expiration.date() }}</small>
-          </span>
+    <input class="form-control bg-white font-monospace" type="text" value="{{ token.id }}" readonly>
+    {% if token.expired %}
+      <span class="input-group-prepend">
+        <span class="input-group-text text-danger">
+          <small class="font-weight-bold">Expired on {{ token.expiration.date() }}</small>
         </span>
-      {% else %}
-        <span class="input-group-prepend">
-          <span class="input-group-text text-success">
-            <small class="font-weight-bold">Active until {{ token.expiration.date() }}</small>
-          </span>
+      </span>
+    {% else %}
+      <span class="input-group-prepend">
+        <span class="input-group-text text-success">
+          <small class="font-weight-bold">Active until {{ token.expiration.date() }}</small>
         </span>
-      {% endif %}
-      {% if not token.expired %}
-        {% if repo %}
-          <form action="{{ url_for(
-            'ui_ns.revoke_api_token',
-            repo=repo.name,
-            username=username,
-            namespace=repo.namespace,
-            token_id=token.id) }}"
-            method="post" class="icon">
-        {% else %}
-          <form action="{{ url_for(
-                'ui_ns.revoke_api_user_token', token_id=token.id) }}"
-            method="post" class="icon">
-        {% endif %}
-        <button class="btn btn-outline-danger revoke_token_btn" type="submit"
-            title="Revoke token">
-          <i class="fa fa-trash"></i>
-        </button>
-        {{ form.csrf_token }}
-      </form>
-      {% endif %}
+      </span>
+    {% endif %}
+    {% if not token.expired %}
       {% if repo %}
-      <form action="{{ url_for(
-          'ui_ns.renew_api_token',
+        <form action="{{ url_for(
+          'ui_ns.revoke_api_token',
           repo=repo.name,
           username=username,
           namespace=repo.namespace,
           token_id=token.id) }}"
           method="post" class="icon">
       {% else %}
-      <form action="{{ url_for('ui_ns.renew_api_user_token', token_id=token.id) }}"
+        <form action="{{ url_for(
+              'ui_ns.revoke_api_user_token', token_id=token.id) }}"
           method="post" class="icon">
       {% endif %}
-      <button class="btn btn-outline-primary renew_token_btn" type="submit"
-          title="Renew token">
-        <i class="fa fa-refresh"></i>
+      <button class="btn btn-outline-danger revoke_token_btn" type="submit"
+          title="Revoke token">
+        <i class="fa fa-trash"></i>
       </button>
       {{ form.csrf_token }}
-      </form>
-    </div>
+    </form>
+    {% endif %}
+    {% if repo %}
+    <form action="{{ url_for(
+        'ui_ns.renew_api_token',
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
+        token_id=token.id) }}"
+        method="post" class="icon">
+    {% else %}
+    <form action="{{ url_for('ui_ns.renew_api_user_token', token_id=token.id) }}"
+        method="post" class="icon">
+    {% endif %}
+    <button class="btn btn-outline-primary renew_token_btn" type="submit"
+        title="Renew token">
+      <i class="fa fa-refresh"></i>
+    </button>
+    {{ form.csrf_token }}
+    </form>
   </div>
+</div>
 {%- endmacro %}
 
diff --git a/pagure/templates/user_settings.html b/pagure/templates/user_settings.html
index 38cedd1..03fd668 100644
--- a/pagure/templates/user_settings.html
+++ b/pagure/templates/user_settings.html
@@ -123,50 +123,50 @@
           </div>
         </div>
         <div class="tab-pane fade" id="nav-api" role="tabpanel" aria-labelledby="nav-api-tab">
-         <div class="row mb-3">
-          <h3 class="col-6 font-weight-bold mb-3">
-            API Keys
-          </h3>
-          <div class="col-6 text-right">
-            <div class="btn-group">
-              <a href="{{ url_for('ui_ns.add_api_user_token') }}"
-                  class="btn btn-sm btn-outline-primary"
-                  title="Generate a new API token">
-                Create new API Key
-              </a>
+          <div class="row mb-3">
+            <h3 class="col-6 font-weight-bold mb-3">
+              API Keys
+            </h3>
+            <div class="col-6 text-right">
               <div class="btn-group">
-                <a method="post" class="btn btn-sm btn-outline-primary class"
-                  title="Show old API token" id="show_old_keys">
-                  Show old API Keys
+                <a href="{{ url_for('ui_ns.add_api_user_token') }}"
+                    class="btn btn-sm btn-outline-primary"
+                    title="Generate a new API token">
+                  Create new API Key
                 </a>
+                <div class="btn-group">
+                  <a method="post" class="btn btn-sm btn-outline-primary class"
+                    title="Show old API token" id="show_old_keys">
+                    Show old API Keys
+                  </a>
+                </div>
               </div>
             </div>
           </div>
-         </div>
           <div class="row">
             <div class="col">
-                    <p>
-                      API keys are tokens used to authenticate you on pagure. They can also
-                      be used to grant access to 3rd party application to behave on all
-                      {{projectstring(plural=True)}} in your name.
-                    </p>
-                    <p>
-                      These are your personal tokens; they are not visible to others.
-                    </p>
-                    <p>
-                      These keys are valid for <span class="strong">60</span> days.
-                    </p>
-                    <p>
-                      These keys are private, make sure to store in a safe place and
-                      do not share it.
-                    </p>
-                  {% if user.tokens %}
-                  {% for token in user.tokens %}
-                    {% if not token.project %}
-                      {{ render_api_token(token, repo, username, form) }}
-                    {% endif %}
-                  {% endfor %}
-                  {% endif %}
+              <p>
+                API keys are tokens used to authenticate you on pagure. They can also
+                be used to grant access to 3rd party application to behave on all
+                {{projectstring(plural=True)}} in your name.
+              </p>
+              <p>
+                These are your personal tokens; they are not visible to others.
+              </p>
+              <p>
+                These keys are valid for <span class="strong">60</span> days.
+              </p>
+              <p>
+                These keys are private, make sure to store in a safe place and
+                do not share it.
+              </p>
+              {% if user.tokens %}
+              {% for token in user.tokens %}
+                {% if not token.project %}
+                  {{ render_api_token(token, repo, username, form) }}
+                {% endif %}
+              {% endfor %}
+              {% endif %}
           </div>
         </div>
         </div>