Merge branch 'fix/contract-row-layout' into test

HyphaApp · Jan 9, 2025 · c4da287 · c4da287
2 parents 74ed414 + 8001a52
commit c4da287
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/...pply/projects/templates/application_projects/partials/contracting_category_documents.html b/...pply/projects/templates/application_projects/partials/contracting_category_documents.html
@@ -12,7 +12,6 @@
     {% can_update_contracting_documents object user as can_update_documents %}
 
     {% if all_contract_document_categories %}
-
         <div class="w-full ps-7">
             <ul class="space-y-2 pt-3">
                 {% for document_category in all_contract_document_categories %}
@@ -54,10 +53,7 @@
                             {% contract_category_latest_file object document_category as latest_file %}
                             {% if latest_file %}
                                 <div class="docs-block__document-inner__actions">
-                                    <a class="docs-block__icon-link"
-                                       href="{% url 'apply:projects:contract_document' pk=object.pk file_pk=latest_file.pk %}"
-                                       target="_blank"
-                                    >
+                                    <a class="docs-block__icon-link" href="{% url 'apply:projects:contract_document' pk=object.pk file_pk=latest_file.pk %}" target="_blank">
                                         {% heroicon_micro "eye" class="inline me-1 w-4 h-4" aria_hidden=true %}
                                         {% trans "View" %}
                                     </a>

diff --git a/hypha/apply/projects/templates/application_projects/partials/supporting_documents.html b/hypha/apply/projects/templates/application_projects/partials/supporting_documents.html
@@ -1,4 +1,4 @@
-{% load i18n approval_tools project_tags heroicons %}
+{% load i18n approval_tools apply_tags project_tags heroicons %}
 {% load can from permission_tags %}
 
 <li class="docs-block__row">
@@ -13,16 +13,15 @@
 
     {% if all_document_categories %}
 
-        <div class="w-full ps-9">
-            <p></p>
-            <ul>
+        <div class="w-full ps-7">
+            <ul class="space-y-2 pt-3">
                 {% for document_category in all_document_categories %}
-                    <li class="docs-block__document">
+                    <li class="flex justify-between bg-gray-100 px-3 py-2 rounded">
                         <div class="docs-block__document-inner">
-                            <p class="docs-block__document-info">{{ document_category.name }}
+                            <span>{{ document_category.name }}
                                 {% if document_category.required %}<span class="text-red-700">*</span>{% endif %}
                                 {% if document_category.template %}
-                                    <a class="font-bold hover:opacity-70 transition-opacity"
+                                    <a class="font-semibold hover:opacity-70 transition-opacity"
                                        href="{% url 'apply:projects:category_template' pk=object.pk type='project_document' category_pk=document_category.pk %}"
                                        target="_blank"
                                     >
@@ -31,10 +30,12 @@
                                         </span>{% heroicon_mini "information-circle" class="fill-light-blue inline align-middle me-1" aria_hidden=true %}
                                     </a>
                                 {% endif %}
-                            </p>
+                            </span>
                             {% if document_category not in remaining_document_categories %}
                                 {% category_latest_file object document_category as latest_file %}
-                                <p class="docs-block__document-info"><b>{{ latest_file.title }}</b> - {{ latest_file.created_at }}</p>
+                                <div class="text-sm">
+                                    <span>{{ latest_file.title|truncatechars_middle:45 }}</span> - <span class="text-fg-muted">{{ latest_file.created_at }}</span>
+                                </div>
                             {% endif %}
                         </div>
                         {% can "upload_project_documents" object as can_upload_documents %}