From 87075dc3710c58d9bd75608ef2d4cb2633ed14cf Mon Sep 17 00:00:00 2001
From: TrevorOctober <trevor@praekeltconsulting.com>
Date: Fri, 19 Aug 2016 10:56:22 +0200
Subject: [PATCH 1/3] use namespaced URLs

---
 .../servicedirectory/templates/servicedirectory/home.html | 6 +++---
 .../servicedirectory/includes/location_search_form.html   | 2 +-
 .../templates/servicedirectory/location_results.html      | 2 +-
 .../templates/servicedirectory/organisation_detail.html   | 8 ++++----
 .../templates/servicedirectory/organisation_results.html  | 6 +++---
 .../templates/servicedirectory/organisation_self_sms.html | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/molo/servicedirectory/templates/servicedirectory/home.html b/molo/servicedirectory/templates/servicedirectory/home.html
index c8521fe..c2d983d 100644
--- a/molo/servicedirectory/templates/servicedirectory/home.html
+++ b/molo/servicedirectory/templates/servicedirectory/home.html
@@ -4,7 +4,7 @@
 
     <p class="sd-help-text search">Search by typing something, or choose a category below:</p>
 
-    <form action="{% url 'location-search' %}" method="get" class="sd-search-form">
+    <form action="{% url 'molo.servicedirectory:location-search' %}" method="get" class="sd-search-form">
 
         <input type="text" name="search" placeholder="I'm looking for..." />
         <input type="submit" value="Search" />
@@ -15,10 +15,10 @@
     <div class="sd-categories">
         {% for category in categories_keywords %}
             <h1 class="sd-heading category-grouping">
-                <a href="{% url 'location-search' %}?search={{ category.name }}">{{ category.name }}</a>
+                <a href="{% url 'molo.servicedirectory:location-search' %}?search={{ category.name }}">{{ category.name }}</a>
                 <br>
                 {% for keyword in category.keywords %}
-                    <a href="{% url 'location-search' %}?search={{ keyword }}" class="sd-cat-keyword">{{ keyword }}</a>{% if not forloop.last or and_more %}, {% endif %}
+                    <a href="{% url 'molo.servicedirectory:location-search' %}?search={{ keyword }}" class="sd-cat-keyword">{{ keyword }}</a>{% if not forloop.last or and_more %}, {% endif %}
                 {% endfor %}
                 {% if and_more %}
                     <a href="{% url 'home' %}?category={{ category.name }}" class="sd-cat-keyword">and more...</a>
diff --git a/molo/servicedirectory/templates/servicedirectory/includes/location_search_form.html b/molo/servicedirectory/templates/servicedirectory/includes/location_search_form.html
index 27ddff2..6f0d942 100644
--- a/molo/servicedirectory/templates/servicedirectory/includes/location_search_form.html
+++ b/molo/servicedirectory/templates/servicedirectory/includes/location_search_form.html
@@ -4,7 +4,7 @@
     In which area would you like to find a service?
 </p>
 
-<form action="{% url 'location-results'  %}" method="get" class="sd-search-form">
+<form action="{% url 'molo.servicedirectory:location-results'  %}" method="get" class="sd-search-form">
 
     <input type="text" name="location" value="{{ location_term }}"/>
     <input type="submit" value="Search" />
diff --git a/molo/servicedirectory/templates/servicedirectory/location_results.html b/molo/servicedirectory/templates/servicedirectory/location_results.html
index d617567..c296eb5 100644
--- a/molo/servicedirectory/templates/servicedirectory/location_results.html
+++ b/molo/servicedirectory/templates/servicedirectory/location_results.html
@@ -23,7 +23,7 @@ <h6 class="sd-heading choose-location">Choose a location:</h6>
     <ul class="sd-search-results">
         {% for prediction in autocomplete_suggestions.predictions %}
             <li>
-                <a href="{% url 'organisation-results' %}?place_id={{ prediction.place_id }}&location={{ location_term }}&search={{ search_term }}">{{ prediction.description }}</a>
+                <a href="{% url 'molo.servicedirectory:organisation-results' %}?place_id={{ prediction.place_id }}&location={{ location_term }}&search={{ search_term }}">{{ prediction.description }}</a>
                 <br/>
             </li>
         {% endfor %}
diff --git a/molo/servicedirectory/templates/servicedirectory/organisation_detail.html b/molo/servicedirectory/templates/servicedirectory/organisation_detail.html
index 77f6923..143a349 100644
--- a/molo/servicedirectory/templates/servicedirectory/organisation_detail.html
+++ b/molo/servicedirectory/templates/servicedirectory/organisation_detail.html
@@ -83,17 +83,17 @@ <h1 class="sd-heading service-tradinghours">Trading Hours</h1>
         </div>
     {% endif %}
 
-    <a class="sd-report-link" href="{% url 'organisation-report' organisation.id %}?org_name={{ organisation.name | urlencode }}">Report incorrect info</a>
+    <a class="sd-report-link" href="{% url 'molo.servicedirectory:organisation-report' organisation.id %}?org_name={{ organisation.name | urlencode }}">Report incorrect info</a>
 
-    <a href="{% url 'organisation-sms' organisation.id %}" class="sd-sms-button primary">Send Service to Someone</a>
+    <a href="{% url 'molo.servicedirectory:organisation-sms' organisation.id %}" class="sd-sms-button primary">Send Service to Someone</a>
 
-    <a href="{% url 'organisation-sms-self' organisation.id %}" class="sd-sms-button secondary">Send This Service to Yourself</a>
+    <a href="{% url 'molo.servicedirectory:organisation-sms-self' organisation.id %}" class="sd-sms-button secondary">Send This Service to Yourself</a>
 
     <hr/>
 
     <h1 class="sd-heading service-rating">How helpful was this?</h1>
 
-    <form method="post" action="{% url 'organisation-rate' organisation.id %}">
+    <form method="post" action="{% url 'molo.servicedirectory:organisation-rate' organisation.id %}">
         {% csrf_token %}
         <div class="org-rate-container">
             <div class="org-rate-faces">
diff --git a/molo/servicedirectory/templates/servicedirectory/organisation_results.html b/molo/servicedirectory/templates/servicedirectory/organisation_results.html
index 295e0cb..cdf32d1 100644
--- a/molo/servicedirectory/templates/servicedirectory/organisation_results.html
+++ b/molo/servicedirectory/templates/servicedirectory/organisation_results.html
@@ -4,7 +4,7 @@
 
     <p class="sd-back"><a href="{{ change_location_url }}">< Back</a></p>
 
-    <form action="{% url 'organisation-results' %}" method="get" class="sd-search-form">
+    <form action="{% url 'molo.servicedirectory:organisation-results' %}" method="get" class="sd-search-form">
 
         <input type="text" name="search" value="{{ search_term }}" />
         <input type="submit" value="Search" />
@@ -31,7 +31,7 @@
     <hr/>
 
     {% for organisation in search_results %}
-        <a href="{% url 'organisation-detail' organisation.id %}" class="sd-service-result">
+        <a href="{% url 'molo.servicedirectory:organisation-detail' organisation.id %}" class="sd-service-result">
             <h1 class="sd-heading svc-org-name">
                 {{ organisation.name }}
             </h1>
@@ -69,7 +69,7 @@ <h1 class="sd-heading svc-org-name">
                     <li>
                         Search a category:
                         {% for category in categories_keywords %}
-                            <a href="{% url 'organisation-results' %}?search={{ category.name }}&location={{ location_term }}&place_id={{ place_id }}{% if place_latlng %}&place_latlng={{ place_latlng }}{% endif %}{% if place_formatted_address %}&place_formatted_address={{ place_formatted_address }}{% endif %}">
+                            <a href="{% url 'molo.servicedirectory:organisation-results' %}?search={{ category.name }}&location={{ location_term }}&place_id={{ place_id }}{% if place_latlng %}&place_latlng={{ place_latlng }}{% endif %}{% if place_formatted_address %}&place_formatted_address={{ place_formatted_address }}{% endif %}">
                                 {{ category.name }}
                             </a>{% if not forloop.last %}, {% endif %}
                         {% endfor %}
diff --git a/molo/servicedirectory/templates/servicedirectory/organisation_self_sms.html b/molo/servicedirectory/templates/servicedirectory/organisation_self_sms.html
index 12d2113..64a8642 100644
--- a/molo/servicedirectory/templates/servicedirectory/organisation_self_sms.html
+++ b/molo/servicedirectory/templates/servicedirectory/organisation_self_sms.html
@@ -6,7 +6,7 @@ <h1 class="sd-heading send-sms">
         Do you want to send this service to yourself? It's free!
     </h1>
 
-    <form action="{% url 'organisation-sms' organisation_id %}" method="post">
+    <form action="{% url 'molo.servicedirectory:organisation-sms' organisation_id %}" method="post">
         {% csrf_token %}
         <div class="sd-input">
             <label for="cell_number">Your cellphone number</label>

From 2059736b34f969b444c400282609b98cb1c6c013 Mon Sep 17 00:00:00 2001
From: TrevorOctober <trevor@praekeltconsulting.com>
Date: Fri, 19 Aug 2016 14:01:01 +0200
Subject: [PATCH 2/3] update django version

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index c79b739..afd5822 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-Django==1.8.8
+Django==1.9.8

From 0b9e3473f30e192cf620e03dae1615f13ddbd840 Mon Sep 17 00:00:00 2001
From: TrevorOctober <trevor@praekeltconsulting.com>
Date: Fri, 19 Aug 2016 14:03:37 +0200
Subject: [PATCH 3/3] added namespace

---
 molo/servicedirectory/templates/servicedirectory/home.html      | 2 +-
 .../servicedirectory/includes/location_search_form.html         | 2 +-
 .../templates/servicedirectory/organisation_results.html        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/molo/servicedirectory/templates/servicedirectory/home.html b/molo/servicedirectory/templates/servicedirectory/home.html
index c2d983d..72e4611 100644
--- a/molo/servicedirectory/templates/servicedirectory/home.html
+++ b/molo/servicedirectory/templates/servicedirectory/home.html
@@ -21,7 +21,7 @@ <h1 class="sd-heading category-grouping">
                     <a href="{% url 'molo.servicedirectory:location-search' %}?search={{ keyword }}" class="sd-cat-keyword">{{ keyword }}</a>{% if not forloop.last or and_more %}, {% endif %}
                 {% endfor %}
                 {% if and_more %}
-                    <a href="{% url 'home' %}?category={{ category.name }}" class="sd-cat-keyword">and more...</a>
+                    <a href="{% url 'molo.servicedirectory:home' %}?category={{ category.name }}" class="sd-cat-keyword">and more...</a>
                 {% endif %}
             </h1>
         {% endfor %}
diff --git a/molo/servicedirectory/templates/servicedirectory/includes/location_search_form.html b/molo/servicedirectory/templates/servicedirectory/includes/location_search_form.html
index 6f0d942..95c54f4 100644
--- a/molo/servicedirectory/templates/servicedirectory/includes/location_search_form.html
+++ b/molo/servicedirectory/templates/servicedirectory/includes/location_search_form.html
@@ -1,4 +1,4 @@
-<p class="sd-back"><a href="{% url 'home' %}">< Back</a></p>
+<p class="sd-back"><a href="{% url 'molo.servicedirectory:home' %}">< Back</a></p>
 
 <p class="sd-heading search">
     In which area would you like to find a service?
diff --git a/molo/servicedirectory/templates/servicedirectory/organisation_results.html b/molo/servicedirectory/templates/servicedirectory/organisation_results.html
index cdf32d1..f9a5f14 100644
--- a/molo/servicedirectory/templates/servicedirectory/organisation_results.html
+++ b/molo/servicedirectory/templates/servicedirectory/organisation_results.html
@@ -64,7 +64,7 @@ <h1 class="sd-heading svc-org-name">
                         Check your spelling
                     </li>
                     <li>
-                        <a href="{% url 'home' %}">Search for something else</a>
+                        <a href="{% url 'molo.servicedirectory:home' %}">Search for something else</a>
                     </li>
                     <li>
                         Search a category: