avoid showing long lists where it isn't so neccessary

busstops/templates/busstops/adminarea_detail.html

@@ -10,29 +10,34 @@
 <h1>{{ adminarea }}</h1>
 
 {% if districts %}
-	<h2>Districts in {{ adminarea }}</h2>
+    <h2>Districts in {{ adminarea }}</h2>
 
-	<ul>
-	{% for d in districts %}
-	    <li><a href="{{ d.get_absolute_url }}">{{ d }}</a></li>
-	{% endfor %}
-	</ul>
+    <ul>
+    {% for d in districts %}
+        <li><a href="{{ d.get_absolute_url }}">{{ d }}</a></li>
+    {% endfor %}
+    </ul>
 {% endif %}
 
-<h2>Localities in {{ adminarea }}</h2>
 
-<ul>
-{% for l in localities %}
-    <li><a href="{{ l.get_absolute_url }}">{{ l }}</a></li>
-{% endfor %}
-</ul>
+{% if localities %}
+    <h2>Localities in {{ adminarea }}</h2>
 
-<h2>Stops in {{ adminarea }}</h2>
+    <ul>
+    {% for l in localities %}
+        <li><a href="{{ l.get_absolute_url }}">{{ l }}</a></li>
+    {% endfor %}
+    </ul>
+{% endif %}
+
+{% if stops %}
+    <h2>Stops in {{ adminarea }}</h2>
 
-<ul>
-{% for s in stops %}
-    <li><a href="{{ s.get_absolute_url }}">{{ s }}</a></li>
-{% endfor %}
-</ul>
+    <ul>
+    {% for s in stops %}
+        <li><a href="{{ s.get_absolute_url }}">{{ s }}</a></li>
+    {% endfor %}
+    </ul>
+{% endif %}
 
 {% include 'footer.html' %}

busstops/views.py

@@ -29,9 +29,13 @@ class AdminAreaDetailView(DetailView):
 
     def get_context_data(self, **kwargs):
         context = super(AdminAreaDetailView, self).get_context_data(**kwargs)
-        context['districts'] = District.objects.filter(admin_area=self.object)#.order_by('name')
-        context['localities'] = Locality.objects.filter(admin_area=self.object).order_by('name')
-        context['stops'] = StopPoint.objects.filter(admin_area=self.object).order_by('common_name')
+        # Districts in this administrative area, if any
+        context['districts'] = District.objects.filter(admin_area=self.object)
+        # Localities in this administrative area that don't belong to any district, if any
+        context['localities'] = Locality.objects.filter(admin_area=self.object, district=None).order_by('name')
+        # Stops in this administrative area whose locality belongs to a different administrative area
+        # These are usually National Rail/Air/Ferry. The second .exclude() excludes stops near the boundary of two areas
+        context['stops'] = StopPoint.objects.filter(admin_area=self.object).exclude(locality__admin_area=self.object).exclude(locality__admin_area__region=self.object.region).order_by('common_name')
         return context