diff --git a/cadasta/templates/organization/organization_dashboard.html b/cadasta/templates/organization/organization_dashboard.html index b54513618..404ad5f83 100644 --- a/cadasta/templates/organization/organization_dashboard.html +++ b/cadasta/templates/organization/organization_dashboard.html @@ -34,11 +34,14 @@

{% trans "Organization Overview" %}

{% else %}
False
{% endif %} - {{ prj.name }}{% if prj.archived %} - - Archived - - {% endif %} + + {{ prj.name }} + {% if prj.archived %} + + Archived + + {% endif %} + {{ prj.country }} {{ prj.last_updated }} diff --git a/cadasta/templates/organization/organization_list.html b/cadasta/templates/organization/organization_list.html index f54367db4..a96117f5b 100644 --- a/cadasta/templates/organization/organization_list.html +++ b/cadasta/templates/organization/organization_list.html @@ -52,7 +52,7 @@

{% trans "Organizations" %}

{% endif %}
-

{{ org.name }} +

{{ org.name }} {% if org.archived %} Archived {% endif %} diff --git a/cadasta/templates/organization/organization_members.html b/cadasta/templates/organization/organization_members.html index 202907914..974055405 100644 --- a/cadasta/templates/organization/organization_members.html +++ b/cadasta/templates/organization/organization_members.html @@ -34,7 +34,8 @@

{% trans "Members" %}

{% for user in organization.users.all %} - {{ user.get_display_name }} + + {{ user.get_display_name }}
-

{{ resource.name }} +

{{ resource.name }} {% if resource.archived %} {% trans "Deleted" %} {% endif %} diff --git a/cadasta/templates/resources/table_sm.html b/cadasta/templates/resources/table_sm.html index 4433746b2..403987bd1 100644 --- a/cadasta/templates/resources/table_sm.html +++ b/cadasta/templates/resources/table_sm.html @@ -10,13 +10,14 @@ {% for resource in resource_list %} - + {% url 'resources:project_detail' project=object.slug organization=object.organization.slug resource=resource.id as resource_url %} +

-

{{ resource.name }}

+

{{ resource.name }}

{{ resource.original_file }}

diff --git a/cadasta/templates/spatial/location_detail.html b/cadasta/templates/spatial/location_detail.html index ab5c5b06c..7d5d0b65a 100644 --- a/cadasta/templates/spatial/location_detail.html +++ b/cadasta/templates/spatial/location_detail.html @@ -69,8 +69,9 @@

{% trans "Location" %} {{ location.name }}

{% for rel in relationships %} - - {{ rel.tenure_type.label }} + {% url 'parties:relationship_detail' object.organization.slug object.slug rel.id as relationship_url %} + + {{ rel.tenure_type.label }} {{ rel.party.name }} {% endfor %}