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

Update styling of My Tasks section (#3879) 

- ~Change the background of the page to light grey~
- Add border to each of the tasks
parent 7ed9d365
No related branches found
No related tags found
1 merge request!89Upgrade to 5.10.0
Hide whitespace changes
Inline Side-by-side
Showing
with 34 additions and 49 deletions
hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
+ 1
− 10
View file @ ee217a55
......@@ -26,16 +26,7 @@
<div class="wrapper wrapper--large wrapper--inner-space-medium">
{% if my_tasks.count %}
<div class="w-8/12 m-auto mb-10">
<h2 class="text-center font-light">{% trans "My tasks" %}</h2>
{% for task in my_tasks.data %}
<div class="bg-white p-1 flex mb-1 items-center">
<svg class="icon icon--dashboard-tasks"><use xlink:href="#{{ task.icon }}"></use></svg>
<div class="flex-1">{{ task.text|markdown|nh3 }}</div>
<a class="button button-primary m-2" href="{{ task.url }}">{% trans "View" %}</a>
</div>
{% endfor %}
</div>
{% include "dashboard/includes/my-tasks.html" with mytasks=mytasks %}
{% endif %}
{% if my_submissions_exists %}
......
hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
+ 2
− 10
View file @ ee217a55
......@@ -15,17 +15,9 @@
{% endadminbar %}
<div class="wrapper wrapper--large wrapper--inner-space-medium">
{% if my_tasks.count %}
<div class="w-8/12 m-auto mb-10">
<h2 class="text-center font-light">{% trans "My tasks" %}</h2>
{% for task in my_tasks.data %}
<div class="bg-white p-1 flex mb-1 items-center">
<svg class="icon icon--dashboard-tasks"><use xlink:href="#{{ task.icon }}"></use></svg>
<div class="flex-1">{{ task.text|markdown|nh3 }}</div>
<a class="button button-primary m-2" href="{{ task.url }}">{% trans "View" %}</a>
</div>
{% endfor %}
</div>
{% include "dashboard/includes/my-tasks.html" with mytasks=mytasks %}
{% endif %}
{% if paf_for_review.count %}
......
hypha/apply/dashboard/templates/dashboard/dashboard.html
+ 4
− 18
View file @ ee217a55
......@@ -25,39 +25,25 @@
<div class="wrapper wrapper--large wrapper--inner-space-medium">
<div class="wrapper wrapper--bottom-space">
{% if my_tasks.count %}
<div class="w-8/12 m-auto mb-10">
<h2 class="text-center font-light">{% trans "My tasks" %}</h2>
{% for task in my_tasks.data %}
<div class="bg-white p-1 flex mb-1 items-center border border-gray-600">
<svg class="icon icon--dashboard-tasks"><use xlink:href="#{{ task.icon }}"></use></svg>
<div class="flex flex-1 items-center">
{{ task.text|markdown|nh3 }}
{% if task.type == "Draft" %}
<span class="bg-red-200 hover:opacity-70 transition-opacity rounded-full whitespace-nowrap inline-block ms-1 my-2 px-2 pt-0.5 pb-1 text-sm font-medium text-gray-800">{{ task.type }}</span>
{% endif %}
</div>
<a class="button button-primary m-2" href="{{ task.url }}">{% trans "View" %}</a>
</div>
{% endfor %}
</div>
{% include "dashboard/includes/my-tasks.html" with mytasks=mytasks %}
{% endif %}
<div class="stat-block">
<a href="#submissions-awaiting-review" class="stat-block__item border">
<a href="#submissions-awaiting-review" class="stat-block__item border shadow-sm">
<p class="stat-block__number">{{ awaiting_reviews.count }}</p>
<p class="stat-block__text">{% trans "Submissions waiting for your review" %}</p>
{% if awaiting_reviews.count %}
<div class="stat-block__view">{% trans "View" %}</div>
{% endif %}
</a>
<a href="#active-projects" class="stat-block__item border">
<a href="#active-projects" class="stat-block__item border shadow-sm">
<p class="stat-block__number">{{ projects.count }}</p>
<p class="stat-block__text">{% trans "Live projects under your management" %}</p>
{% if projects.count %}
<div class="stat-block__view">{% trans "View" %}</div>
{% endif %}
</a>
<a href="#active-invoices" class="stat-block__item border">
<a href="#active-invoices" class="stat-block__item border shadow-sm">
<p class="stat-block__number">{{ active_invoices.count }}</p>
<p class="stat-block__text">{% trans "Requests for invoices requiring your attention" %}</p>
{% if active_invoices.count %}
......
hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
+ 2
− 10
View file @ ee217a55
......@@ -15,17 +15,9 @@
{% endadminbar %}
<div class="wrapper wrapper--large wrapper--inner-space-medium">
{% if my_tasks.count %}
<div class="w-8/12 m-auto mb-10">
<h2 class="text-center font-light">{% trans "My tasks" %}</h2>
{% for task in my_tasks.data %}
<div class="bg-white p-1 flex mb-1 items-center">
<svg class="icon icon--dashboard-tasks"><use xlink:href="#{{ task.icon }}"></use></svg>
<div class="flex-1">{{ task.text|markdown|nh3 }}</div>
<a class="button button-primary m-2" href="{{ task.url }}">{% trans "View" %}</a>
</div>
{% endfor %}
</div>
{% include "dashboard/includes/my-tasks.html" with mytasks=mytasks %}
{% endif %}
<div class="wrapper wrapper--bottom-space"
......
hypha/apply/dashboard/templates/dashboard/includes/my-tasks.html 0 → 100644
+ 24
− 0
View file @ ee217a55
{% load i18n markdown_tags nh3_tags %}
<div class="w-8/12 m-auto mb-10">
<h2 class="text-center font-light">{% trans "My tasks" %}</h2>
<div class="task--list border divide-y shadow-sm">
{% for task in my_tasks.data %}
<div class="bg-white p-2 flex items-center">
<svg class="icon icon--dashboard-tasks"><use xlink:href="#{{ task.icon }}"></use></svg>
<div class="flex flex-1 items-center">
<span>{{ task.text|markdown|nh3 }}</span>
{% if task.type == "Draft" %}
<span
class="bg-red-200 rounded-full whitespace-nowrap inline-block ms-1 my-2 px-2 pt-0.5 pb-1 text-sm font-medium text-gray-800"
>
{{ task.type }}
</span>
{% endif %}
</div>
<a class="button button-primary" href="{{ task.url }}">{% trans "View" %}</a>
</div>
{% endfor %}
</div>
</div>
hypha/apply/dashboard/templates/dashboard/includes/submissions-waiting-for-review.html
+ 1
− 1
View file @ ee217a55
......@@ -15,7 +15,7 @@
{% endif %}
{% else %}
<div class="border py-10 bg-white w-full text-center px-2">
<div class="border shadow-sm py-10 bg-white w-full text-center px-2">
<p class="text-base my-2">{% trans "Nice! You're all caught up. 🎉" %}</p>
<a class="button button--primary" href="{% url 'apply:submissions:list' %}" hx-boost='true'>{% trans "Find new applications to review" %}</a>
</div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment