Skip to content

Commit f50b4c6

Browse files
theskumartheskumar
committed
adminbar update existing stuff
1 parent 4fd54b7 commit f50b4c6

60 files changed

Lines changed: 583 additions & 715 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎hypha/apply/activity/templates/activity/notifications.html‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,22 @@
33
{% block title %}{% trans "Notifications" %}{% endblock %}
44

55
{% block hero %}
6-
{% adminbar %}
7-
{% slot header %}{% trans "Notifications" %}{% endslot %}
8-
{% slot sub_heading %}
9-
{% if PROJECTS_ENABLED %}
10-
{% trans "Activity feed across all applications and projects" %}
11-
{% else %}
12-
{% trans "Activity feed across all the applications" %}
13-
{% endif %}
14-
{% endslot %}
15-
16-
<form
17-
class="[&>label]:sr-only text-base-content flex items-center justify-between gap-2"
18-
method="get"
6+
<c-hero>
7+
<c-hero.header
8+
title="{% trans 'Notifications' %}"
9+
subtitle="{% if PROJECTS_ENABLED %}{% trans 'Activity feed across all applications and projects' %}{% else %}{% trans 'Activity feed across all the applications' %}{% endif %}"
1910
>
20-
{{ filter.form }}
21-
<button class="btn btn-primary" type="submit" value="Filter">
22-
{% trans "Filter" %}
23-
</button>
24-
</form>
25-
{% endadminbar %}
11+
<form
12+
class="[&>label]:sr-only text-base-content flex items-center justify-between gap-2"
13+
method="get"
14+
>
15+
{{ filter.form }}
16+
<button class="btn btn-primary" type="submit" value="Filter">
17+
{% trans "Filter" %}
18+
</button>
19+
</form>
20+
</c-hero.header>
21+
</c-hero>
2622
{% endblock %}
2723

2824
{% block content %}

‎hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,27 @@
55
{% block title %}{% trans "Dashboard" %}{% endblock %}
66

77
{% block hero %}
8-
{% adminbar %}
9-
{% slot header %}{% trans "My dashboard" %}{% endslot %}
10-
{% slot sub_heading %}
11-
{% trans "An overview of active and past submissions and projects" %}
12-
{% endslot %}
13-
14-
<div class="flex items-center p-4 w-lg bg-base-100 text-base-content rounded-box">
15-
<div class="flex-1">
16-
<h3 class="text-xl font-semibold">{% trans "Submit a new application" %}</h3>
17-
<p class="text-sm">{% trans "Apply now for our open rounds" %}</p>
18-
</div>
19-
<div>
20-
<a
21-
class="btn btn-primary btn-outline"
22-
href="{% pageurl APPLY_SITE.root_page %}"
23-
>
24-
{% trans "Apply" %}
25-
</a>
8+
<c-hero>
9+
<c-hero.header
10+
title="{% trans 'My dashboard' %}"
11+
subtitle="{% trans 'An overview of active and past submissions and projects' %}"
12+
>
13+
<div class="flex items-center p-4 w-lg bg-base-100 text-base-content rounded-box">
14+
<div class="flex-1">
15+
<h3 class="text-xl font-semibold">{% trans "Submit a new application" %}</h3>
16+
<p class="text-sm">{% trans "Apply now for our open rounds" %}</p>
17+
</div>
18+
<div>
19+
<a
20+
class="btn btn-primary btn-outline"
21+
href="{% pageurl APPLY_SITE.root_page %}"
22+
>
23+
{% trans "Apply" %}
24+
</a>
25+
</div>
2626
</div>
27-
</div>
28-
29-
{% endadminbar %}
27+
</c-hero.header>
28+
</c-hero>
3029
{% endblock %}
3130

3231
{% block content %}

‎hypha/apply/dashboard/templates/dashboard/community_dashboard.html‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,24 @@
55
{% block title %}{% trans "Dashboard" %}{% endblock %}
66

77
{% block hero %}
8-
{% adminbar %}
9-
{% slot header %}{% trans "Dashboard" %}{% endslot %}
10-
{% slot sub_heading %}{% trans "An overview of active and past submissions" %}{% endslot %}
11-
12-
<div class="flex items-center p-4 w-lg bg-base-100 text-base-content rounded-box">
13-
<div class="flex-1">
14-
<h3 class="text-xl font-semibold">{% trans "Submit a new application" %}</h3>
15-
<p class="text-sm">{% trans "Apply now for our open rounds" %}</p>
16-
</div>
17-
<div>
18-
<a class="btn btn-primary btn-outline" href="{% pageurl APPLY_SITE.root_page %}">
19-
{% trans "Apply" %}
20-
</a>
8+
<c-hero>
9+
<c-hero.header
10+
title="{% trans 'Dashboard' %}"
11+
subtitle="{% trans 'An overview of active and past submissions' %}"
12+
>
13+
<div class="flex items-center p-4 w-lg bg-base-100 text-base-content rounded-box">
14+
<div class="flex-1">
15+
<h3 class="text-xl font-semibold">{% trans "Submit a new application" %}</h3>
16+
<p class="text-sm">{% trans "Apply now for our open rounds" %}</p>
17+
</div>
18+
<div>
19+
<a class="btn btn-primary btn-outline" href="{% pageurl APPLY_SITE.root_page %}">
20+
{% trans "Apply" %}
21+
</a>
22+
</div>
2123
</div>
22-
</div>
23-
{% endadminbar %}
24+
</c-hero.header>
25+
</c-hero>
2426
{% endblock %}
2527

2628
{% block content %}

‎hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@
55
{% block title %}{% trans "Dashboard" %}{% endblock %}
66

77
{% block hero %}
8-
{% adminbar %}
9-
{% slot header %}{% trans "Dashboard" %}{% endslot %}
10-
11-
{% if perms.wagtailadmin.access_admin %}
12-
<a href="{% url 'wagtailadmin_home' %}" class="btn btn-primary">
13-
{% heroicon_solid "cog-6-tooth" size=20 class="inline align-text-bottom me-1" aria_hidden=true %}
14-
{% trans "Administration" %}
15-
</a>
16-
{% endif %}
17-
{% endadminbar %}
8+
<c-hero>
9+
<c-hero.header
10+
title="{% trans 'Dashboard' %}"
11+
>
12+
{% if perms.wagtailadmin.access_admin %}
13+
<a href="{% url 'wagtailadmin_home' %}" class="btn btn-primary">
14+
{% heroicon_solid "cog-6-tooth" size=20 class="inline align-text-bottom me-1" aria_hidden=true %}
15+
{% trans "Administration" %}
16+
</a>
17+
{% endif %}
18+
</c-hero.header>
19+
</c-hero>
1820
{% endblock %}
1921

2022
{% block content %}

‎hypha/apply/dashboard/templates/dashboard/finance_dashboard.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
{% block title %}{% trans "Dashboard" %}{% endblock %}
66

77
{% block hero %}
8-
{% adminbar %}
9-
{% slot header %}{% trans "Dashboard" %}{% endslot %}
10-
11-
{% if perms.wagtailadmin.access_admin %}
12-
<a href="{% url 'wagtailadmin_home' %}" class="btn btn-primary">
13-
{% heroicon_solid "cog-6-tooth" size=20 class="inline align-text-bottom me-1" aria_hidden=true %}
14-
{% trans "Administration" %}
15-
</a>
16-
{% endif %}
17-
{% endadminbar %}
8+
<c-hero>
9+
<c-hero.header title="{% trans 'Dashboard' %}">
10+
{% if perms.wagtailadmin.access_admin %}
11+
<a href="{% url 'wagtailadmin_home' %}" class="btn btn-primary">
12+
{% heroicon_solid "cog-6-tooth" size=20 class="inline align-text-bottom me-1" aria_hidden=true %}
13+
{% trans "Administration" %}
14+
</a>
15+
{% endif %}
16+
</c-hero.header>
17+
</c-hero>
1818
{% endblock %}
1919

2020
{% block content %}

‎hypha/apply/dashboard/templates/dashboard/partner_dashboard.html‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
{% block title %}{% trans "Dashboard" %}{% endblock %}
66

77
{% block hero %}
8-
{% adminbar %}
9-
{% slot header %}{% trans "Dashboard" %}{% endslot %}
10-
{% slot sub_heading %}{% trans "Welcome" %}, {{ request.user }}!{% endslot %}
11-
{% endadminbar %}
8+
<c-hero>
9+
<c-hero.header
10+
title="{% trans 'Dashboard' %}"
11+
subtitle="{% trans 'Welcome' %}, {{ request.user }}!"
12+
/>
13+
</c-hero>
1214
{% endblock %}
1315

1416
{% block content %}

‎hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
{% block title %}{% trans "Dashboard" %}{% endblock %}
66

77
{% block hero %}
8-
{% adminbar %}
9-
{% slot header %}{% trans "Dashboard" %}{% endslot %}
10-
{% endadminbar %}
8+
<c-hero>
9+
<c-hero.header title="{% trans 'Dashboard' %}" />
10+
</c-hero>
1111
{% endblock %}
1212

1313
{% block content %}

‎hypha/apply/dashboard/templates/dashboard/staff_dashboard.html‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@
55
{% block title %}{% trans "Dashboard" %}{% endblock %}
66

77
{% block hero %}
8-
{% adminbar %}
9-
{% slot header %}{% trans "Dashboard" %}{% endslot %}
10-
{% slot sub_heading %}{% trans "Welcome" %}, {{ request.user }}!{% endslot %}
11-
12-
{% if perms.wagtailadmin.access_admin %}
13-
<a href="{% url 'wagtailadmin_home' %}" id="wagtail-admin-button" class="btn btn-primary">
14-
{% heroicon_solid "cog-6-tooth" size=20 class="inline align-text-bottom me-1" aria_hidden=true %}
15-
{% trans "Administration" %}
16-
</a>
17-
{% endif %}
18-
{% endadminbar %}
8+
<c-hero>
9+
<c-hero.header
10+
title="{% trans 'Dashboard' %}"
11+
subtitle="{% trans 'Welcome' %}, {{ request.user }}!"
12+
>
13+
{% if perms.wagtailadmin.access_admin %}
14+
<a href="{% url 'wagtailadmin_home' %}" id="wagtail-admin-button" class="btn btn-primary">
15+
{% heroicon_solid "cog-6-tooth" size=20 class="inline align-text-bottom me-1" aria_hidden=true %}
16+
{% trans "Administration" %}
17+
</a>
18+
{% endif %}
19+
</c-hero.header>
20+
</c-hero>
1921
{% endblock %}
2022

2123

‎hypha/apply/determinations/templates/determinations/base_determination_form.html‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,32 @@
44
{% block body_attrs %}x-data="{ showSubmission: false }"{% endblock %}
55

66
{% block hero %}
7-
{% adminbar %}
8-
{% slot header %}{% if object %}{% trans "Update Determination draft" %}{% else %}{% trans "Create Determination" %}{% endif %}{% endslot %}
9-
{% slot sub_heading %}
10-
{% if submission %}{% trans "For" %} <a class="link link-hover" href="{% url "funds:submissions:detail" submission.id %}">{{ submission.title_text_display }}</a>{% endif %}
11-
{% endslot %}
7+
<c-hero>
8+
<c-hero.header
9+
title="{% if object %}{% trans 'Update Determination draft' %}{% else %}{% trans 'Create Determination' %}{% endif %}"
10+
subtitle="{% if submission %}{% trans 'For' %} <a class='link link-hover' href='{% url 'funds:submissions:detail' submission.id %}'>{{ submission.title_text_display }}</a>{% endif %}"
11+
>
1212

13-
{% slot buttons %}
14-
<div class="tabs tabs-lift">
15-
<button
16-
class="tab tab-active text-base-content/70"
17-
@click="showSubmission = !showSubmission"
18-
:aria-selected="showSubmission"
19-
>
20-
<span x-show="!showSubmission" class="flex gap-2 items-center">
21-
{% heroicon_outline "eye" class="w-4 h-4" aria_hidden="true" %}
22-
{% trans "Show application" %}
23-
</span>
24-
<span x-show="showSubmission" class="flex gap-2 items-center" x-cloak>
25-
{% heroicon_outline "eye-slash" class="w-4 h-4" aria_hidden="true" %}
26-
{% trans "Hide application" %}
27-
</span>
28-
</button>
13+
<div class="self-end -mb-4">
14+
<div class="tabs tabs-lift">
15+
<button
16+
class="tab tab-active text-base-content/70"
17+
@click="showSubmission = !showSubmission"
18+
:aria-selected="showSubmission"
19+
>
20+
<span x-show="!showSubmission" class="flex gap-2 items-center">
21+
{% heroicon_outline "eye" class="w-4 h-4" aria_hidden="true" %}
22+
{% trans "Show application" %}
23+
</span>
24+
<span x-show="showSubmission" class="flex gap-2 items-center" x-cloak>
25+
{% heroicon_outline "eye-slash" class="w-4 h-4" aria_hidden="true" %}
26+
{% trans "Hide application" %}
27+
</span>
28+
</button>
29+
</div>
2930
</div>
30-
{% endslot %}
31-
{% endadminbar %}
31+
</c-hero.header>
32+
</c-hero>
3233
{% endblock %}
3334

3435
{% block content %}

‎hypha/apply/determinations/templates/determinations/batch_determination_form.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
{% endblock %}
77

88
{% block hero %}
9-
{% adminbar %}
10-
{% slot header %}{% trans "Add batch determination" %} - {{ action_name }}{% endslot %}
11-
{% endadminbar %}
9+
<c-hero>
10+
<c-hero.header title="{% trans 'Add batch determination' %} - {{ action_name }}" />
11+
</c-hero>
1212
{% endblock %}
1313

1414
{% block determination_information %}

0 commit comments

Comments
 (0)