diff --git a/app/dashboard/templates/bounty/details2.html b/app/dashboard/templates/bounty/details2.html index 59ea0c166fb..69b3b54ef45 100644 --- a/app/dashboard/templates/bounty/details2.html +++ b/app/dashboard/templates/bounty/details2.html @@ -980,7 +980,7 @@
Projects
{% endif %}
- {{project.name}} + {{project.name}}
Team Members
diff --git a/app/dashboard/templates/bounty/new_bounty.html b/app/dashboard/templates/bounty/new_bounty.html index cdd13d553bc..2b71c97e1eb 100644 --- a/app/dashboard/templates/bounty/new_bounty.html +++ b/app/dashboard/templates/bounty/new_bounty.html @@ -394,7 +394,7 @@

Fund Issue

- [[form.hours]] hrs at $[[form.amountusd]]/hr leads to [[ successRate]]% success rate. Read our pricing guide. + [[form.hours]] hrs at $[[form.amountusd / form.hours | decimals(2)]]/hr leads to [[ successRate]]% success rate. Read our pricing guide. USD payment is powered by PayPal. Please note that there might be a small fee for payment to contributors in outside of the US. diff --git a/app/dashboard/templates/dashboard/hackathon/projects.html b/app/dashboard/templates/dashboard/hackathon/projects.html index a4e3c34d966..99738d31e62 100644 --- a/app/dashboard/templates/dashboard/hackathon/projects.html +++ b/app/dashboard/templates/dashboard/hackathon/projects.html @@ -169,7 +169,7 @@

{{hackathon.name}} Projects

{{ project.name }}
- Project Home + Project Home
Project Summary

diff --git a/app/dashboard/templates/project/detail/info.html b/app/dashboard/templates/project/detail/info.html index a82759bb073..db7b9d40b50 100644 --- a/app/dashboard/templates/project/detail/info.html +++ b/app/dashboard/templates/project/detail/info.html @@ -24,13 +24,14 @@

- -
diff --git a/app/dashboard/views.py b/app/dashboard/views.py index 43159a6e6cc..c017cc083ca 100644 --- a/app/dashboard/views.py +++ b/app/dashboard/views.py @@ -4304,6 +4304,9 @@ def hackathon_project_page(request, hackathon, project_id, project_name, tab='') if tab == 'activity': active = 1 + if not hackathon: + hackathon = project.hackathon + hackathon_obj = HackathonEventSerializer(project.hackathon).data, what = f'project:{project_id}' params = { @@ -4321,7 +4324,7 @@ def hackathon_project_page(request, hackathon, project_id, project_name, tab='') 'winner': project.winner, 'looking_members': project.looking_members, 'work_url': project.work_url, - 'logo_url': project.logo.url if project.logo else staticfiles_storage.url(f'v2/images/projects/logos/${project.id}.png'), + 'logo_url': project.logo.url if project.logo else '', 'prize': { 'id': project.bounty.id, 'title': project.bounty.title, diff --git a/app/retail/templates/shared/activity.html b/app/retail/templates/shared/activity.html index 5dcec5d5edd..efb80d71839 100644 --- a/app/retail/templates/shared/activity.html +++ b/app/retail/templates/shared/activity.html @@ -58,23 +58,27 @@
- {% include 'profiles/presence_indicator.html' with last_chat_status=row.profile.last_chat_status chat_id=row.profile.chat_id handle=row.profile.handle additionalclasses="mini" show_even_if_offline=1 %} + {% include 'profiles/presence_indicator.html' with last_chat_status=row.profile.last_chat_status chat_id=row.profile.chat_id handle=row.profile.handle additionalclasses="mini" show_even_if_offline=1 %} {% firstof row.profile.data.name or row.profile.handle %} - @{{ row.profile.handle }} - {% if row.metadata.looking_team_members %} - is - - Looking for Team Members - - {% elif row.metadata.looking_project %} - is - - Looking for a Project - -
- {% endif %} - {% if row.hackathonevent %} + @{{ row.profile.handle }} + {% if row.metadata.looking_team_members %} + is + + Looking for Team Members + + {% elif row.metadata.looking_project %} + is + + Looking for a Project + +
+ {% endif %} + {% if row.project %} + via {{ row.project.name }} + {% endif %} + + {% if row.hackathonevent %} via {{ row.hackathonevent.name }}