remove *_list templates since they are no longer used

remove object_detail.html templates, and make all the *_detail.html templates dervice from app_base.html directly.  there was no functionality left worth having in the intermediate template

remove verbose_name from some models where it wasn't needed

add form_title variable to some forms where it was missing

svn path=/branches/tk329/; revision=4905

1 files changed, 13 insertions, 7 deletions

diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py
index 558fac1a..25540a81 100644
--- a/rpkid/rpki/gui/app/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -142,7 +142,7 @@ def generic_import(request, queryset, configure, form_class=None,
 
     return render(request, 'app/app_form.html', {
         'form': form,
-        'form_title': 'Import ' + queryset.model._meta.verbose_name,
+        'form_title': 'Import ' + queryset.model._meta.verbose_name.capitalize(),
     })
 
 
@@ -325,7 +325,7 @@ def child_add_prefix(request, pk):
     else:
         form = forms.AddNetForm(child=child)
     return render(request, 'app/app_form.html',
-                  {'object': child, 'form': form})
+                  {'object': child, 'form': form, 'form_title': 'Add Prefix'})
 
 
 @handle_required
@@ -344,7 +344,7 @@ def child_add_asn(request, pk):
     else:
         form = forms.AddASNForm(child=child)
     return render(request, 'app/app_form.html',
-                  {'object': child, 'form': form})
+                  {'object': child, 'form': form, 'form_title': 'Add ASN'})
 
 
 @handle_required
@@ -594,7 +594,8 @@ def ghostbuster_create(request):
             return http.HttpResponseRedirect(reverse(dashboard))
     else:
         form = forms.GhostbusterRequestForm(conf=conf)
-    return render(request, 'app/app_form.html', {'form': form})
+    return render(request, 'app/app_form.html',
+                  {'form': form, 'form_title': 'New Ghostbuster Request'})
 
 
 @handle_required
@@ -611,7 +612,8 @@ def ghostbuster_edit(request, pk):
             return http.HttpResponseRedirect(reverse(dashboard))
     else:
         form = forms.GhostbusterRequestForm(conf=conf, instance=obj)
-    return render(request, 'app/app_form.html', {'form': form})
+    return render(request, 'app/app_form.html',
+                  {'form': form, 'form_title': 'Edit Ghostbuster Request'})
 
 
 @handle_required
@@ -740,8 +742,12 @@ def repository_delete(request, pk):
             return http.HttpResponseRedirect(reverse(dashboard))
     else:
         form = forms.Empty()
-    return render(request, 'app/repository_detail.html',
-                  {'object': obj, 'form': form, 'confirm_delete': True})
+    return render(request, 'app/object_confirm_delete.html', {
+        'object': obj,
+        'form': form,
+        'parent_template':
+        'app/repository_detail.html',
+    })
 
 
 @handle_required