users: improve phab task display

WikipediaLibrary · Oct 6, 2022 · a2d2571 · a2d2571
1 parent 086ae6f
commit a2d2571
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/TWLight/resources/models.py b/TWLight/resources/models.py
@@ -459,7 +459,9 @@ def get_access_url(self):
 
     @property
     def phab_task_qs(self):
-        return PhabricatorTask.objects.filter(partners__pk=self.pk)
+        return PhabricatorTask.objects.filter(partners__pk=self.pk).order_by(
+            "-task_type"
+        )
 
 
 class PartnerLogo(models.Model):

diff --git a/TWLight/static/css/new-local.css b/TWLight/static/css/new-local.css
@@ -1027,6 +1027,15 @@ NEW MY LIBRARY COLLECTION TILES CSS
     background-color: #FFFFFF;
 }
 
+.phab-task-wrapper{
+    padding: 0;
+    margin-bottom: 0.75rem;
+}
+
+.phab-task-card{
+    width: 98%;
+}
+
 .phab-task-button:hover{
     text-decoration: underline;
 }

diff --git a/TWLight/users/templates/users/available_collection_tile.html b/TWLight/users/templates/users/available_collection_tile.html
@@ -58,21 +58,21 @@
       </p>
     </div>
     <div class="card-footer">
-      <div class="col-12" style="padding: 0px;margin-bottom: 0.75rem;">
-          {% for task in available_collection.partner_phabricator_tasks %}
+      {% for task in available_collection.partner_phabricator_tasks %}
+        <div class="col-12 phab-task-wrapper">
           <a href="#P{{ available_collection.partner_pk }}{{ task.id }}" aria-controls="P{{ available_collection.partner_pk }}{{ task.id }}" data-toggle="collapse" role="button" aria-expanded="false" class="btn btn-sm phab-task-button phab-task-{{ task.severity }}">
             {{ task.display }}
           </a>
           <div class="collapse" id="P{{ available_collection.partner_pk }}{{ task.id }}">
-            <div class="card card-body phab-task-{{ task.severity }}" style="width: 98%;">
+            <div class="card card-body phab-task-card phab-task-{{ task.severity }}">
               {{ task.help }}
               <a href="{{ task.url }}" target="_blank" rel="noopener">
                 {{ task.id }}
               </a>
             </div>
           </div>
-          {% endfor %}
-      </div>
+        </div>
+      {% endfor %}
       <a href="{% url 'applications:apply_single' available_collection.partner_pk %}"
           class="btn btn-sm twl-btn access-apply-button {% if available_collection.is_not_available %} disabled {% endif %}"
           type="button" name="button">

diff --git a/TWLight/users/templates/users/user_collection_tile.html b/TWLight/users/templates/users/user_collection_tile.html
@@ -71,21 +71,21 @@
   </div>
   <div class="card-footer">
     <div class="container">
-        <div class="col-12" style="padding: 0px;margin-bottom: 0.75rem;">
-            {% for task in user_collection.partner_phabricator_tasks %}
+      {% for task in user_collection.partner_phabricator_tasks %}
+        <div class="col-12 phab-task-wrapper">
             <a href="#P{{ user_collection.partner_pk }}{{ task.id }}" aria-controls="P{{ user_collection.partner_pk }}{{ task.id }}" data-toggle="collapse" role="button" aria-expanded="false" class="btn btn-sm phab-task-button phab-task-{{ task.severity }}">
               {{ task.display }}
             </a>
             <div class="collapse" id="P{{ user_collection.partner_pk }}{{ task.id }}">
-              <div class="card card-body phab-task-{{ task.severity }}" style="width: 98%;">
+              <div class="card card-body phab-task-card phab-task-{{ task.severity }}">
                 {{ task.help }}
                 <a href="{{ task.url }}" target="_blank" rel="noopener">
                   {{ task.id }}
                 </a>
               </div>
             </div>
-            {% endfor %}
         </div>
+      {% endfor %}
       {% if user_collection.partner_authorization_method != bundle_authorization %}
         {% if user_collection.auth_date_expires %}
           <p class="expiry-date-text">