Make pseudo-links behave more traditionally #615

* Make pseudo-links behave more traditionally #615 * Add links to resource tables and relationship table
Cadasta · Sep 26, 2016 · ca5ac83 · ca5ac83
1 parent 25d299c
commit ca5ac83
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 15 deletions.
diff --git a/cadasta/templates/organization/organization_dashboard.html b/cadasta/templates/organization/organization_dashboard.html
@@ -34,11 +34,14 @@ <h2>{% trans "Organization Overview" %}</h2>
                   {% else %}
                     <td class="unarchived"><div>False</div></td>
                   {% endif %}
-                  <td>{{ prj.name }}{% if prj.archived %}
-                  <span class="label label-danger">
-                    Archived
-                  </span>
-                  {% endif %}</td>
+                  <td>
+                      <a href="{% url 'organization:project-dashboard' organization=organization.slug project=prj.slug %}">{{ prj.name }}</a>
+                      {% if prj.archived %}
+                      <span class="label label-danger">
+                        Archived
+                      </span>
+                      {% endif %}
+                  </td>
                   <td>{{ prj.country }}</td>
                   <td>{{ prj.last_updated }}</td>
                 </tr>

diff --git a/cadasta/templates/organization/organization_list.html b/cadasta/templates/organization/organization_list.html
@@ -52,7 +52,7 @@ <h1>{% trans "Organizations" %}</h1>
       </div>
       {% endif %}
       <div class="org-text">
-        <h4>{{ org.name }}
+        <h4><a href="{% url 'organization:dashboard' slug=org.slug %}">{{ org.name }}</a>
         {% if org.archived %}
           <span class="label label-danger">Archived</span>
         {% endif %}

diff --git a/cadasta/templates/organization/organization_members.html b/cadasta/templates/organization/organization_members.html
@@ -34,7 +34,8 @@ <h2>{% trans "Members" %}</h2>
             <tbody>
             {% for user in organization.users.all %}
               <tr class="linked" onclick="window.document.location='{% url 'organization:members_edit' slug=organization.slug username=user.username %}';">
-                <td>{{ user.get_display_name }}
+                <td>
+                  <a href="{% url 'organization:members_edit' slug=organization.slug username=user.username %}">{{ user.get_display_name }}</a>
                   <div class="hidden-sm hidden-md hidden-lg">
                     {{ user.username }}<br />
                     {{ user.email }}

diff --git a/cadasta/templates/organization/project_list.html b/cadasta/templates/organization/project_list.html
@@ -48,10 +48,11 @@ <h1>{% trans "Projects" %}</h1>
       <td class="unarchived"><div>False</div></td>
     {% endif %}
     <td>
-      <h4>{{ proj.name }}
-      {% if proj.archived %}
+      <h4>
+          <a href="{% url 'organization:project-dashboard' organization=proj.organization.slug project=proj.slug %}">{{ proj.name }}</a>
+          {% if proj.archived %}
           <span class="label label-danger">{% trans "Archived" %}</span>
-        {% endif %}
+          {% endif %}
         </h4>
       </h4>
       <p>{{ proj.description }}</p>

diff --git a/cadasta/templates/resources/table.html b/cadasta/templates/resources/table.html
@@ -20,7 +20,7 @@
           <img src="{{ resource.thumbnail }}" class="thumb-60">
         </div>
         <div class="resource-text">
-          <p><strong>{{ resource.name }}</strong>
+          <p><strong><a href="{% url 'resources:project_detail' project=object.slug organization=object.organization.slug resource=resource.id %}">{{ resource.name }}</a></strong>
             {% if resource.archived %}
               <span class="label label-danger">{% trans "Deleted" %}</span>
             {% endif %}

diff --git a/cadasta/templates/resources/table_sm.html b/cadasta/templates/resources/table_sm.html
@@ -10,13 +10,14 @@
   </thead>
   <tbody>
   {% for resource in resource_list %}
-    <tr class="linked" onclick="window.document.location='{% url 'resources:project_detail' project=object.slug organization=object.organization.slug resource=resource.id %}';">
+    {% url 'resources:project_detail' project=object.slug organization=object.organization.slug resource=resource.id as resource_url %}
+    <tr class="linked" onclick="window.document.location='{{ resource_url }}';">
       <td>
         <div class="resource-60">
           <img src="{{ resource.thumbnail }}" class="thumb-60">
         </div>
         <div class="resource-text">
-          <p><strong>{{ resource.name }}</strong></p>
+          <p><a href="{{ resource_url }}"><strong>{{ resource.name }}</strong></a></p>
           <p class="small">{{ resource.original_file }}</p>
         </div>
       </td>

diff --git a/cadasta/templates/spatial/location_detail.html b/cadasta/templates/spatial/location_detail.html
@@ -69,8 +69,9 @@ <h2><span>{% trans "Location" %} </span>{{ location.name }}</h2>
             </thead>
             <tbody>
               {% for rel in relationships %}
-              <tr class="linked" onclick="window.document.location='{% url 'parties:relationship_detail' object.organization.slug object.slug rel.id %}';">
-                <td>{{ rel.tenure_type.label }}</td>
+              {% url 'parties:relationship_detail' object.organization.slug object.slug rel.id as relationship_url %}
+              <tr class="linked" onclick="window.document.location='{{ relationship_url }}';">
+                <td><a href="{{ relationship_url }}">{{ rel.tenure_type.label }}</a></td>
                 <td><a href="{% url 'parties:detail' object.organization.slug object.slug rel.party.id %}">{{ rel.party.name }}</a></td>
               </tr>
               {% endfor %}