Skip to content
Snippets Groups Projects
Unverified Commit 491fe61b authored by Saurabh Kumar's avatar Saurabh Kumar Committed by GitHub
Browse files

Improve UI of applicant dashboard (#3816)

- Update the spacing around "Edit" button of My Submissions
- Update the metadata font color and size, make it bit dark for
  readability, and reduce size to deemphasize.
- Add edit icon to "Edit" button
parent ebc46909
No related branches found
No related tags found
1 merge request!76Merge up to 5.6.0
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<h4 class="heading heading--no-margin font-bold"><a class="link" href="{{ invoice.get_absolute_url }}"> <h4 class="heading heading--no-margin font-bold"><a class="link" href="{{ invoice.get_absolute_url }}">
{% if invoice.invoice_number %}{{ invoice.invoice_number }}{% else %}{{ invoice.vendor_document_number }}{% endif %} {% if invoice.invoice_number %}{{ invoice.invoice_number }}{% else %}{{ invoice.vendor_document_number }}{% endif %}
</a></h4> </a></h4>
<p class="m-0 text-gray-400">{% trans "Date added: " %} {{ invoice.requested_at }}</p> <p class="m-0 text-fg-muted text-sm">{% trans "Date added: " %} {{ invoice.requested_at }}</p>
</div> </div>
<div class="max-w-[33%] w-full text-center my-auto"> <div class="max-w-[33%] w-full text-center my-auto">
<p class="text-2xl">{% if invoice.invoice_amount %}{{ invoice.invoice_amount | format_number_as_currency }}{% else %}-{% endif %}</p> <p class="text-2xl">{% if invoice.invoice_amount %}{{ invoice.invoice_amount | format_number_as_currency }}{% else %}-{% endif %}</p>
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<div class="wrapper wrapper--status-bar-outer"> <div class="wrapper wrapper--status-bar-outer">
<div class="wrapper wrapper--status-bar-inner"> <div class="wrapper wrapper--status-bar-inner">
<div class="mt-5 ms-4 lg:max-w-[30%]"> <div class="mt-5 ms-4 lg:max-w-[30%]">
<h4 class="heading mb-2 font-bold line-clamp-3 hover:line-clamp-none"><a class="link" href="{% url 'apply:projects:detail' project.id %}">{{ project.title }}</a></h4> <h4 class="heading mb-0 font-bold line-clamp-3 hover:line-clamp-none"><a class="link" href="{% url 'apply:projects:detail' project.id %}">{{ project.title }}</a></h4>
<p class="m-0 text-gray-400">{% trans "Project start date: " %} {{ project.created_at.date }}</p> <p class="m-0 text-fg-muted text-sm">{% trans "Project start date: " %} {{ project.created_at.date }}</p>
</div> </div>
{% project_status_bar project.status request.user css_class="status-bar--small" %} {% project_status_bar project.status request.user css_class="status-bar--small" %}
</div> </div>
......
{% load i18n dashboard_statusbar_tags statusbar_tags workflow_tags %} {% load i18n dashboard_statusbar_tags statusbar_tags workflow_tags heroicons %}
{% for submission in page.object_list %} {% for submission in page.object_list %}
<div class="wrapper wrapper--status-bar-outer"> <div class="wrapper wrapper--status-bar-outer">
<div class="wrapper wrapper--status-bar-inner"> <div class="wrapper wrapper--status-bar-inner">
<div class="mt-5 ms-4 lg:max-w-[30%]"> <div class="mt-5 ms-4 lg:max-w-[30%]">
<h4 class="heading mb-2 font-bold line-clamp-3 hover:line-clamp-none"><a class="link {% if not submission.is_active %} text-gray-400 {% endif %}" href="{% url 'funds:submissions:detail' submission.id %}">{{ submission.title }}</a></h4> <h4 class="heading mb-0 font-bold line-clamp-3 hover:line-clamp-none"><a class="link {% if not submission.is_active %} text-gray-400 {% endif %}" href="{% url 'funds:submissions:detail' submission.id %}">{{ submission.title }}</a></h4>
<p class="m-0 text-gray-400"> <p class="m-0 text-fg-muted mb-4 text-sm">
{% if submission.is_draft %} {% if submission.is_draft %}
{% trans "Drafted on " %} {% trans "Drafted on " %}
{% else %} {% else %}
...@@ -13,18 +13,19 @@ ...@@ -13,18 +13,19 @@
{% endif %} {% endif %}
{{ submission.submit_time.date }} {% trans "by" %} {{ submission.user.get_full_name }} {{ submission.submit_time.date }} {% trans "by" %} {{ submission.user.get_full_name }}
</p> </p>
{% if request.user|has_edit_perm:submission %}
<a class="button button--primary" href="{% url 'funds:submissions:edit' submission.id %}">
{% if submission.status == 'draft_proposal' %}
{% trans "Start your" %} {{ submission.stage }} {% trans "application" %}
{% else %}
{% heroicon_micro "pencil" class="w-4 h-4 me-1 inline align-middle" aria_hidden=true %}
{% trans "Edit" %}
{% endif %}
</a>
{% endif %}
</div> </div>
{% status_bar submission.workflow submission.phase request.user css_class="status-bar--small" %} {% status_bar submission.workflow submission.phase request.user css_class="status-bar--small" %}
</div> </div>
{% if request.user|has_edit_perm:submission %}
<a class="button button--primary ms-4" href="{% url 'funds:submissions:edit' submission.id %}">
{% if submission.status == 'draft_proposal' %}
{% trans "Start your" %} {{ submission.stage }} {% trans "application" %}
{% else %}
{% trans "Edit" %}
{% endif %}
</a>
{% endif %}
</div> </div>
{% empty %} {% empty %}
{% trans "No active submissions" %} {% trans "No active submissions" %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment