From 5bc3fc76eef3873384ccff5ace3fa8d1b5e0a5b8 Mon Sep 17 00:00:00 2001
From: clash99 <clash@cadasta.org>
Date: Tue, 5 Jul 2016 08:48:33 -0500
Subject: [PATCH] Organization page titles

New project wizard page titles

Project area titles work

Resources title - removed project titles

Resources & Map page title

Add relationships and resources to location titles

Change title to test tests

Page title changes

Project dashboard title - remove duplicate

Add records API URL unit tests

Update small table
---
 cadasta/templates/organization/organization_dashboard.html  | 3 ++-
 cadasta/templates/organization/organization_members.html    | 2 +-
 .../templates/organization/organization_members_edit.html   | 2 +-
 cadasta/templates/organization/project_add_details.html     | 2 ++
 cadasta/templates/organization/project_add_extents.html     | 4 +++-
 cadasta/templates/organization/project_add_permissions.html | 2 ++
 cadasta/templates/organization/project_add_wrapper.html     | 1 +
 cadasta/templates/organization/project_dashboard.html       | 1 +
 cadasta/templates/organization/project_edit_details.html    | 1 +
 cadasta/templates/organization/project_edit_geometry.html   | 2 ++
 .../templates/organization/project_edit_permissions.html    | 2 ++
 cadasta/templates/organization/project_wrapper.html         | 2 +-
 cadasta/templates/party/party_list.html                     | 2 +-
 cadasta/templates/resources/edit.html                       | 1 +
 cadasta/templates/resources/project_add_existing.html       | 1 +
 cadasta/templates/resources/project_add_new.html            | 1 +
 cadasta/templates/resources/project_detail.html             | 2 ++
 cadasta/templates/resources/project_list.html               | 1 +
 cadasta/templates/resources/table.html                      | 4 ++--
 cadasta/templates/resources/table_add_lib.html              | 2 +-
 cadasta/templates/resources/table_sm.html                   | 6 ++----
 cadasta/templates/spatial/location_add.html                 | 2 ++
 cadasta/templates/spatial/location_delete.html              | 2 ++
 cadasta/templates/spatial/location_detail.html              | 3 ++-
 cadasta/templates/spatial/location_edit.html                | 2 ++
 cadasta/templates/spatial/location_form.html                | 2 +-
 cadasta/templates/spatial/location_map.html                 | 1 +
 cadasta/templates/spatial/relationship_add.html             | 2 ++
 cadasta/templates/spatial/resources_add.html                | 2 ++
 cadasta/templates/spatial/resources_new.html                | 3 ++-
 30 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/cadasta/templates/organization/organization_dashboard.html b/cadasta/templates/organization/organization_dashboard.html
index c6cd227bf..72961e125 100644
--- a/cadasta/templates/organization/organization_dashboard.html
+++ b/cadasta/templates/organization/organization_dashboard.html
@@ -2,6 +2,7 @@
 
 {% load i18n %}
 
+{% block page_title %}Overview | {% endblock %}
 {% block left-nav %}overview{% endblock %}
 
 {% block content %}
@@ -26,7 +27,7 @@ <h2>{% trans "Organization Overview" %}</h2>
               </thead>
               <tbody>
                 {% for prj in projects %}
-                <tr onclick="window.document.location='{% url 'organization:project-dashboard' organization=organization.slug project=prj.slug %}';">
+                <tr class="linked" onclick="window.document.location='{% url 'organization:project-dashboard' organization=organization.slug project=prj.slug %}';">
                   <td>{{ prj.name }}</td>
                   <td>{{ prj.country }}</td>
                   <td>{{ prj.last_updated }}</td>
diff --git a/cadasta/templates/organization/organization_members.html b/cadasta/templates/organization/organization_members.html
index 83cce77a6..6dcc1b1fb 100644
--- a/cadasta/templates/organization/organization_members.html
+++ b/cadasta/templates/organization/organization_members.html
@@ -33,7 +33,7 @@ <h2>{% trans "Members" %}</h2>
         </thead>
         <tbody>
         {% for user in organization.users.all %}
-          <tr onclick="window.document.location='{% url 'organization:members_edit' slug=organization.slug username=user.username %}';">
+          <tr class="linked" onclick="window.document.location='{% url 'organization:members_edit' slug=organization.slug username=user.username %}';">
             <td>{{ user.get_full_name }}
               <div class="hidden-sm hidden-md hidden-lg">
                 {{ user.username }}<br />
diff --git a/cadasta/templates/organization/organization_members_edit.html b/cadasta/templates/organization/organization_members_edit.html
index 86180e489..8dda7423f 100644
--- a/cadasta/templates/organization/organization_members_edit.html
+++ b/cadasta/templates/organization/organization_members_edit.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load widget_tweaks %}
 
-{% block page_title %}Members |{% endblock %}
+{% block page_title %}Edit member | {% endblock %}
 
 {% block left-nav %}members{% endblock %}
 
diff --git a/cadasta/templates/organization/project_add_details.html b/cadasta/templates/organization/project_add_details.html
index d5cfcf893..8f91c0985 100644
--- a/cadasta/templates/organization/project_add_details.html
+++ b/cadasta/templates/organization/project_add_details.html
@@ -3,6 +3,8 @@
 {% load widget_tweaks %}
 {% load i18n %}
 
+{% block page_title %}| Add details{% endblock %}
+
 {% block extra_script %}
 {{ form.media }}
 <script>
diff --git a/cadasta/templates/organization/project_add_extents.html b/cadasta/templates/organization/project_add_extents.html
index eb9f64a69..158c97628 100644
--- a/cadasta/templates/organization/project_add_extents.html
+++ b/cadasta/templates/organization/project_add_extents.html
@@ -4,6 +4,8 @@
 {% load leaflet_tags %}
 {% load i18n %}
 
+{% block page_title %}| Draw map{% endblock %}
+
 {% block extra_head %}
 {% leaflet_css plugins="draw,forms" %}
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet-geocoder-mapzen/1.4.0/leaflet-geocoder-mapzen.css">
@@ -51,7 +53,7 @@
 {% block step_instructions %}
     <p>
       {% blocktrans %}
-      Use the map tools to outline your project location boundaries. Once complete, select the "Save and continue" button below.
+      Use the map tools to outline your project location boundaries. Once complete, select the save button below.
       {% endblocktrans %}
     </p>
 {% endblock %}
diff --git a/cadasta/templates/organization/project_add_permissions.html b/cadasta/templates/organization/project_add_permissions.html
index fad8c4a1d..c0ca3e866 100644
--- a/cadasta/templates/organization/project_add_permissions.html
+++ b/cadasta/templates/organization/project_add_permissions.html
@@ -3,6 +3,8 @@
 {% load i18n %}
 {% load widget_tweaks %}
 
+{% block page_title %}| Assign team{% endblock %}
+
 {% block step_content_1 %}
 
     <div class="row">
diff --git a/cadasta/templates/organization/project_add_wrapper.html b/cadasta/templates/organization/project_add_wrapper.html
index 8e67b3a4c..7311e5374 100644
--- a/cadasta/templates/organization/project_add_wrapper.html
+++ b/cadasta/templates/organization/project_add_wrapper.html
@@ -2,6 +2,7 @@
 
 {% load i18n %}
 
+{% block title %} | Add new project {% block page_title %}{% endblock %} {% endblock %}
 {% block top-nav %}project-wizard{% endblock %}
 
 {% block content %}
diff --git a/cadasta/templates/organization/project_dashboard.html b/cadasta/templates/organization/project_dashboard.html
index ea17a3596..59bf18967 100644
--- a/cadasta/templates/organization/project_dashboard.html
+++ b/cadasta/templates/organization/project_dashboard.html
@@ -23,6 +23,7 @@
 </script>
 {% endblock %}
 
+{% block page_title %}Overview | {% endblock %}
 {% block left-nav %}overview{% endblock %}
 
 {% block content %}
diff --git a/cadasta/templates/organization/project_edit_details.html b/cadasta/templates/organization/project_edit_details.html
index f350ec6e2..6bd335e5c 100644
--- a/cadasta/templates/organization/project_edit_details.html
+++ b/cadasta/templates/organization/project_edit_details.html
@@ -8,6 +8,7 @@
   {{ form.media }}
 {% endblock %}
 
+{% block page_title %}Edit project details | {% endblock %}
 {% block left-nav %}overview{% endblock %}
 
 {% block content %}
diff --git a/cadasta/templates/organization/project_edit_geometry.html b/cadasta/templates/organization/project_edit_geometry.html
index 3e77ec544..cb34c56b1 100644
--- a/cadasta/templates/organization/project_edit_geometry.html
+++ b/cadasta/templates/organization/project_edit_geometry.html
@@ -4,6 +4,8 @@
 {% load i18n %}
 {% load leaflet_tags %}
 
+{% block page_title %}Edit project location | {% endblock %}
+
 {% block extra_head %}
 {% leaflet_css plugins="draw,forms" %}
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet-geocoder-mapzen/1.4.0/leaflet-geocoder-mapzen.css">
diff --git a/cadasta/templates/organization/project_edit_permissions.html b/cadasta/templates/organization/project_edit_permissions.html
index d464cffdd..2533b0c1d 100644
--- a/cadasta/templates/organization/project_edit_permissions.html
+++ b/cadasta/templates/organization/project_edit_permissions.html
@@ -4,6 +4,8 @@
 {% load i18n %}
 {% load widget_tweaks %}
 
+{% block page_title %}Edit member permissions | {% endblock %}
+
 {% block extra_head %}
   {{ form.media }}
 {% endblock %}
diff --git a/cadasta/templates/organization/project_wrapper.html b/cadasta/templates/organization/project_wrapper.html
index b176f912a..a98a9eacc 100644
--- a/cadasta/templates/organization/project_wrapper.html
+++ b/cadasta/templates/organization/project_wrapper.html
@@ -4,7 +4,7 @@
 
 {% block top-nav %}project-single{% endblock %}
 
-{% block title %} | {{ object.name }}{% endblock %}
+{% block title %} | {% block page_title %}{% endblock %} {{ object.name }}{% endblock %}
 
 {% block page-header %}
 
diff --git a/cadasta/templates/party/party_list.html b/cadasta/templates/party/party_list.html
index d68305f35..f3d7d7980 100644
--- a/cadasta/templates/party/party_list.html
+++ b/cadasta/templates/party/party_list.html
@@ -19,7 +19,7 @@ <h2>{% trans "Parties" %}</h2>
               </tr>
             </thead>
             {% for party in object_list %}
-            <tr onclick="window.document.location='{% url 'parties:detail' object.organization.slug object.slug party.id %}';">
+            <tr class="linked" onclick="window.document.location='{% url 'parties:detail' object.organization.slug object.slug party.id %}';">
               <td>{{ party.name }}</td>
               <td>{{ party.get_type_display }}</td>
             </tr>
diff --git a/cadasta/templates/resources/edit.html b/cadasta/templates/resources/edit.html
index 3f91bdcdf..e86545180 100644
--- a/cadasta/templates/resources/edit.html
+++ b/cadasta/templates/resources/edit.html
@@ -1,6 +1,7 @@
 {% extends "organization/project_wrapper.html" %}
 {% load i18n %}
 
+{% block page_title %}Edit resource | {% endblock %}
 {% block left-nav %}resources{% endblock %}
 
 {% block extra_script %}
diff --git a/cadasta/templates/resources/project_add_existing.html b/cadasta/templates/resources/project_add_existing.html
index b92a0ed2e..ee11cdbe1 100644
--- a/cadasta/templates/resources/project_add_existing.html
+++ b/cadasta/templates/resources/project_add_existing.html
@@ -2,6 +2,7 @@
 {% load i18n %}
 {% load widget_tweaks %}
 
+{% block page_title %}Add new resource | {% endblock %}
 {% block left-nav %}resources{% endblock %}
 
 {% block content %}
diff --git a/cadasta/templates/resources/project_add_new.html b/cadasta/templates/resources/project_add_new.html
index a5fd3db04..cd5ac012a 100644
--- a/cadasta/templates/resources/project_add_new.html
+++ b/cadasta/templates/resources/project_add_new.html
@@ -1,6 +1,7 @@
 {% extends "organization/project_wrapper.html" %}
 {% load i18n %}
 
+{% block page_title %}Upload new resource | {% endblock %}
 {% block left-nav %}resources{% endblock %}
 
 {% block extra_script %}
diff --git a/cadasta/templates/resources/project_detail.html b/cadasta/templates/resources/project_detail.html
index e23a54d8d..c7ee2a3f2 100644
--- a/cadasta/templates/resources/project_detail.html
+++ b/cadasta/templates/resources/project_detail.html
@@ -1,6 +1,8 @@
 {% extends "organization/project_wrapper.html" %}
 {% load i18n %}
 
+{% block page_title %}Resource detail | {% endblock %}
+
 {% block content %}
 
 <div class="col-md-12 content-single">
diff --git a/cadasta/templates/resources/project_list.html b/cadasta/templates/resources/project_list.html
index 0f806905e..3468aae61 100644
--- a/cadasta/templates/resources/project_list.html
+++ b/cadasta/templates/resources/project_list.html
@@ -1,6 +1,7 @@
 {% extends "organization/project_wrapper.html" %}
 {% load i18n %}
 
+{% block page_title %}Resources | {% endblock %}
 {% block left-nav %}resources{% endblock %}
 
 {% block content %}
diff --git a/cadasta/templates/resources/table.html b/cadasta/templates/resources/table.html
index 79765dd6b..723667331 100644
--- a/cadasta/templates/resources/table.html
+++ b/cadasta/templates/resources/table.html
@@ -6,14 +6,14 @@
     <tr>
       <th class="col-md-4">{% trans "Resource" %}</th>
       <th class="col-md-2 hidden-xs hidden-sm">{% trans "Type" %}</th>
-      <th class="col-md-2 hidden-xs hidden-sm">{% trans "Entities associated" %}</th>
+      <th class="col-md-2 hidden-xs hidden-sm">{% trans "Connections" %}</th>
       <th class="col-md-2">{% trans "Contributor" %}</th>
       <th class="col-md-2 hidden-xs hidden-sm">{% trans "Last updated" %}</th>
     </tr>
   </thead>
   <tbody>
   {% for resource in object_list %}
-    <tr onclick="window.document.location='{% url 'resources:project_detail' project=object.slug organization=object.organization.slug resource=resource.id %}';">
+    <tr class="linked" onclick="window.document.location='{% url 'resources:project_detail' project=object.slug organization=object.organization.slug resource=resource.id %}';">
       <td>
         <div class="resource-60">
           <img src="{{ resource.thumbnail }}" class="thumb-60">
diff --git a/cadasta/templates/resources/table_add_lib.html b/cadasta/templates/resources/table_add_lib.html
index c9377f4b5..2646d84b9 100644
--- a/cadasta/templates/resources/table_add_lib.html
+++ b/cadasta/templates/resources/table_add_lib.html
@@ -7,7 +7,7 @@
       <th class="col-md-1"></th>
       <th class="col-md-4">{% trans "Resource" %}</th>
       <th class="col-md-1">{% trans "Type" %}</th>
-      <th class="col-md-2">{% trans "Entities associated" %}</th>
+      <th class="col-md-2">{% trans "Connections" %}</th>
       <th class="col-md-2">{% trans "Contributor" %}</th>
       <th class="col-md-2">{% trans "Last updated" %}</th>
     </tr>
diff --git a/cadasta/templates/resources/table_sm.html b/cadasta/templates/resources/table_sm.html
index b60c402cc..5ea54dea8 100644
--- a/cadasta/templates/resources/table_sm.html
+++ b/cadasta/templates/resources/table_sm.html
@@ -4,14 +4,13 @@
 <table class="table table-hover datatable" data-paging-type="simple">
   <thead>
     <tr>
-      <th class="col-md-8">{% trans "Resource" %}</th>
+      <th class="col-md-10">{% trans "Resource" %}</th>
       <th class="col-md-2">{% trans "Connections" %}</th>
-      <th class="col-md-2">{% trans "Contributor" %}</th>
     </tr>
   </thead>
   <tbody>
   {% for resource in object_list %}
-    <tr onclick="window.document.location='{% url 'resources:project_detail' project=object.slug organization=object.organization.slug resource=resource.id %}';">
+    <tr class="linked" onclick="window.document.location='{% url 'resources:project_detail' project=object.slug organization=object.organization.slug resource=resource.id %}';">
       <td>
         <div class="resource-60">
           <img src="{{ resource.thumbnail }}" class="thumb-60">
@@ -21,7 +20,6 @@
         </div>
       </td>
       <td>{{ resource.num_entities }}</td>
-      <td>{{ resource.contributor.full_name }}<br>{{ resource.contributor.username }}</td>
     </tr>
   {% endfor %}
   </tbody>
diff --git a/cadasta/templates/spatial/location_add.html b/cadasta/templates/spatial/location_add.html
index fb80fa7d3..cf6db8a7a 100644
--- a/cadasta/templates/spatial/location_add.html
+++ b/cadasta/templates/spatial/location_add.html
@@ -6,6 +6,8 @@
 {% load staticfiles %}
 {% load leaflet_tags %}
 
+{% block page_title %}Add new location | {% endblock %}
+
 {% block extra_head %}
 {% leaflet_css plugins="draw,forms" %}
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet-geocoder-mapzen/1.4.0/leaflet-geocoder-mapzen.css">
diff --git a/cadasta/templates/spatial/location_delete.html b/cadasta/templates/spatial/location_delete.html
index 36e16bf55..ef4b6ee30 100644
--- a/cadasta/templates/spatial/location_delete.html
+++ b/cadasta/templates/spatial/location_delete.html
@@ -1,6 +1,8 @@
 {% extends "spatial/location_detail.html" %}
 {% load i18n %}
 
+{% block page_title %}Delete location | {% endblock %}
+
 {% block modals %}
 
 <form method="POST" class="modal-backdrop">
diff --git a/cadasta/templates/spatial/location_detail.html b/cadasta/templates/spatial/location_detail.html
index 090d4d991..572f81fc8 100644
--- a/cadasta/templates/spatial/location_detail.html
+++ b/cadasta/templates/spatial/location_detail.html
@@ -2,6 +2,7 @@
 {% load i18n %}
 {% load widget_tweaks %}
 
+{% block page_title %}Location detail | {% endblock %}
 
 {% block location_panel %}
 
@@ -50,7 +51,7 @@ <h2>Location</h2>
       </thead>
       <tbody>
         {% for rel in relationships %}
-        <tr onclick="window.document.location='{% url 'parties:relationship_detail' object.organization.slug object.slug rel.id %}';">
+        <tr class="linked" onclick="window.document.location='{% url 'parties:relationship_detail' object.organization.slug object.slug rel.id %}';">
           <td>{{ rel.tenure_type.label }}</td>
           <td><a href="{% url 'parties:detail' object.organization.slug object.slug rel.party.id %}">{{ rel.party.name }}</a></td>
         </tr>
diff --git a/cadasta/templates/spatial/location_edit.html b/cadasta/templates/spatial/location_edit.html
index 40b49f7e5..ef5370720 100644
--- a/cadasta/templates/spatial/location_edit.html
+++ b/cadasta/templates/spatial/location_edit.html
@@ -4,6 +4,8 @@
 {% load widget_tweaks %}
 {% load staticfiles %}
 
+{% block page_title %}Edit location | {% endblock %}
+
 {% block extra_head %}
 {% leaflet_css plugins="draw,forms" %}
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet-geocoder-mapzen/1.4.0/leaflet-geocoder-mapzen.css">
diff --git a/cadasta/templates/spatial/location_form.html b/cadasta/templates/spatial/location_form.html
index 7cc685192..f252e420f 100644
--- a/cadasta/templates/spatial/location_form.html
+++ b/cadasta/templates/spatial/location_form.html
@@ -16,7 +16,7 @@ <h2>{{ title }}</h2>
         <div class="panel panel-default">
           <div class="panel-body">
 
-          <h3>Create location on map</h3>
+          <h3>Draw location on map</h3>
           <p>
             {% blocktrans %}Use the map tools to mark your new location. Next select the location type below.  Once complete, select the save button.<br /><br />{% endblocktrans %}
           </p>
diff --git a/cadasta/templates/spatial/location_map.html b/cadasta/templates/spatial/location_map.html
index f6c9fd7a0..11a42d146 100644
--- a/cadasta/templates/spatial/location_map.html
+++ b/cadasta/templates/spatial/location_map.html
@@ -1,6 +1,7 @@
 {% extends "organization/project_wrapper.html" %}
 {% load i18n %}
 
+{% block page_title %}Project Map | {% endblock %}
 {% block left-nav %}map{% endblock %}
 
 {% load leaflet_tags %}
diff --git a/cadasta/templates/spatial/relationship_add.html b/cadasta/templates/spatial/relationship_add.html
index 9aba3814e..9e29595d8 100644
--- a/cadasta/templates/spatial/relationship_add.html
+++ b/cadasta/templates/spatial/relationship_add.html
@@ -2,6 +2,8 @@
 {% load i18n %}
 {% load widget_tweaks %}
 
+{% block page_title %}Add new relationship | {% endblock %}
+
 {% block form_script %}
   {{ form.media }}
 {% endblock %}
diff --git a/cadasta/templates/spatial/resources_add.html b/cadasta/templates/spatial/resources_add.html
index 9eaba9332..9ff3a81d5 100644
--- a/cadasta/templates/spatial/resources_add.html
+++ b/cadasta/templates/spatial/resources_add.html
@@ -2,6 +2,8 @@
 {% load i18n %}
 {% load widget_tweaks %}
 
+{% block page_title %}Add new resource | {% endblock %}
+
 {% block modals %}
 <div class="modal-backdrop">
   <div class="modal show" data-backdrop="true">
diff --git a/cadasta/templates/spatial/resources_new.html b/cadasta/templates/spatial/resources_new.html
index df3bc5687..bd3684c42 100644
--- a/cadasta/templates/spatial/resources_new.html
+++ b/cadasta/templates/spatial/resources_new.html
@@ -2,12 +2,13 @@
 {% load i18n %}
 {% load widget_tweaks %}
 
+{% block page_title %}Upload new resource | {% endblock %}
+
 {% block form_script %}
   {{ form.media }}
   {% include "resources/scripts.html" %}
 {% endblock %}
 
-
 {% block modals %}
 
 <div class="modal-backdrop">