Ensure "coversations" tab is always last tab (#4465)

For visual consistency.

Also, fix "Project" tab link on project detail page

Author: theskumar

hypha/apply/funds/templates/funds/applicationsubmission_detail.html

@@ -25,13 +25,6 @@
                         {% trans "Application" %}
                     </a>
 
-                    <a
-                        class="tab__item"
-                        href="{% url 'funds:submissions:comments' pk=object.id %}"
-                    >
-                        {% trans "Conversations" %} ({{ comments_count }})
-                    </a>
-
                     {% if PROJECTS_ENABLED and object.project %}
                         <a
                             class="tab__item"
@@ -40,6 +33,14 @@
                             {% trans "Project" %}
                         </a>
                     {% endif %}
+
+                    <a
+                        class="tab__item"
+                        href="{% url 'funds:submissions:comments' pk=object.id %}"
+                    >
+                        {% trans "Conversation" %} ({{ comments_count }})
+                    </a>
+
                     {# is_staff is only used for Django Admin. #}
                     {% if request.user.is_staff %}
                         <a class="tab__item tab__item--right js-tabs-off" href="{% url 'admin:activity_event_changelist' %}?submission__id={{ object.id }}">

hypha/apply/funds/templates/funds/comments.html

@@ -21,13 +21,6 @@
                         {% trans "Application" %}
                     </a>
 
-                    <a class="tab__item tab__item--active"
-                       href="{% url 'funds:submissions:comments' pk=object.id %}"
-                       data-tab="tab-2"
-                    >
-                        {% trans "Conversations" %} ({{ comments_count }})
-                    </a>
-
                     {% if object.project and PROJECTS_ENABLED %}
                         <a class="tab__item"
                            href="{% url 'apply:projects:detail' pk=object.id %}"
@@ -36,6 +29,13 @@
                         </a>
                     {% endif %}
 
+                    <a class="tab__item tab__item--active"
+                       href="{% url 'funds:submissions:comments' pk=object.id %}"
+                       data-tab="tab-2"
+                    >
+                        {% trans "Conversation" %} ({{ comments_count }})
+                    </a>
+
                     {# is_staff is only used for Django Admin. #}
                     {% if request.user.is_staff %}
                         <a

hypha/apply/projects/templates/application_projects/project_detail.html

@@ -23,18 +23,19 @@
                     </a>
 
                     <a
-                        class="tab__item"
-                        href="{% url 'funds:submissions:comments' pk=object.submission.id %}"
+                        class="tab__item tab__item--active"
+                        href="{% url 'apply:projects:detail' pk=object.submission.id %}"
                     >
-                        {% trans "Conversations" %} ({{ comments_count }})
+                        {% trans "Project" %}
                     </a>
 
                     <a
-                        class="tab__item tab__item--active"
-                        href="{% url 'apply:projects:detail' pk=object.id %}"
+                        class="tab__item"
+                        href="{% url 'funds:submissions:comments' pk=object.submission.id %}"
                     >
-                        {% trans "Project" %}
+                        {% trans "Conversation" %} ({{ comments_count }})
                     </a>
+
                 </div>
             </div>
         </div>