Move templates and urls to apps.

Implement url hooks.
Many apps are now removable.
Default to assuming services have been migrated.

srp/auth_hooks.py

@@ -0,0 +1,26 @@
+from services.hooks import MenuItemHook, UrlHook
+from alliance_auth import hooks
+from srp import urls
+
+
+class SrpMenu(MenuItemHook):
+    def __init__(self):
+        MenuItemHook.__init__(self, 'Ship Replacement',
+                              'fa fa-money fa-fw grayiconecolor',
+                              'srp:management',
+                              navactive=['srp:'])
+
+    def render(self, request):
+        if request.user.has_perm('srp.access_srp'):
+            return MenuItemHook.render(self, request)
+        return ''
+
+
+@hooks.register('menu_item_hook')
+def register_menu():
+    return SrpMenu()
+
+
+@hooks.register('url_hook')
+def register_url():
+    return UrlHook(urls, 'srp', r'^srp/')

srp/templates/srp/add.html

@@ -0,0 +1,55 @@
+{% extends "registered/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+{% load i18n %}
+
+{% block title %}Alliance Auth - SRP Fleet Create{% endblock %}
+
+{% block page_title %}{% trans "SRP Fleet Create" %}{% endblock page_title %}
+{% block extra_css %}
+    {% include 'bundles/jquery-datetimepicker-css.html' %}
+{% endblock extra_css %}
+
+{% block content %}
+
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">{% trans "Create SRP Fleet" %}</h1>
+
+        <div class="container-fluid">
+            <div class="col-md-4 col-md-offset-4">
+                <div class="row">
+                    {% if completed == False %}
+                        <form class="form-signin" role="form" action="" method="POST">
+                            {% csrf_token %}
+                            {{ form|bootstrap }}
+                            <br/>
+                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Create SRP Fleet" %}</button>
+                        </form>
+                    {% else %}
+                        <div class="alert alert-info" role="alert">{% blocktrans %}Give this link to the line members{% endblocktrans %}.</div>
+                        <div class="alert alert-info" role="alert">
+                            http://{{ request.get_host }}{% url 'srp:request' completed_srp_code %}</div>
+                        <div class="text-center">
+                            <a href="{% url 'srp:management' %}" class="btn btn-primary btn-lg">{% trans "Continue" %}</a>
+                        </div>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+{% endblock content %}
+
+{% block extra_javascript %}
+    {% include 'bundles/jquery-datetimepicker-js.html' %}
+{% endblock %}
+
+{% block extra_script %}
+
+    $('#id_fleet_time').datetimepicker({
+    maskInput: true,
+    format: 'Y-m-d H:i'
+    });
+
+{% endblock extra_script %}

srp/templates/srp/data.html

@@ -0,0 +1,208 @@
+{% extends "registered/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+{% load i18n %}
+
+{% load humanize %}
+{% block title %}Alliance Auth{% endblock %}
+
+{% block page_title %}Srp Fleet Data{% endblock page_title %}
+{% block extra_css %}
+  {% include 'bundles/x-editable.css.html' %}
+  <link href="{% static 'css/checkbox.css' %}" rel="stylesheet" type="text/css">
+  <style>
+  .radio label, .checkbox label {
+      padding-left: 10px;
+  }
+  .editable {
+    width:150px;
+    text-align: center;
+  }
+  .editableform .form-control {
+      width: 95%;
+      text-align: center;
+      margin-left: 10px;
+  }
+
+  .editable-input {
+      width: 95%;
+  }
+  .radio, .checkbox {
+      margin-top: 0px;
+      margin-bottom: 0px;
+  }
+  .editable-error-block {
+      white-space: nowrap;
+  }
+  .editable-click, a.editable-click, a.editable-click:hover {
+      border-bottom: none;
+  }
+  .tooltip-inner {
+    white-space:pre;
+    max-width: none;
+  }
+  </style>
+{% endblock extra_css %}
+
+{% block content %}
+    <div class="col-lg-12">
+        <div class="row">
+            <h1 class="page-header text-center">{% trans "SRP Fleet Data" %}
+                <div class="text-right">
+                    {% if perms.auth.srp_management %}
+                        {% if fleet_status == "Completed" %}
+                            <a href="{% url 'srp:mark_uncompleted' fleet_id %}" class="btn btn-warning">
+                                {% trans "Mark Incomplete" %}
+                            </a>
+                        {% else %}
+                            <a href="{% url 'srp:mark_completed' fleet_id %}" class="btn btn-success">
+                                {% trans "Mark Completed" %}
+                            </a>
+                        {% endif %}
+                    {% endif %}
+                </div>
+            </h1>
+            
+            {% if srpfleetrequests %}
+            <form method="POST">
+                {% csrf_token %}
+                <div class="alert alert-info" role="alert">
+                    <div class="text-right">
+                        <b><span style="padding-right:2.5em">{% trans "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
+                        <b><span style="padding-right:2.5em">{% trans "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
+                        {% if perms.auth.srp_management %}
+                            <button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
+                                <span class="glyphicon glyphicon-ok"></span>
+                            </button>
+                            <button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
+                                <span class="glyphicon glyphicon-remove"></span>
+                            </button>
+                            <button type="submit" title="Remove" onclick="return confirm('{% trans "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
+                                <span class="glyphicon glyphicon-trash"></span>
+                            </button>
+                        {% endif %}
+                    </div>
+                </div>
+            
+                <table class="table">
+                    <tr>
+                        <th class="text-center">{% trans "Pilot Name" %}</th>
+                        <th class="text-center">{% trans "Killboard Link" %}</th>
+                        <th class="text-center">{% trans "Additional Info" %}</th>
+                        <th class="text-center">{% trans "Ship Type" %}</th>
+                        <th class="text-center">{% trans "Killboard Loss Amt" %}</th>
+                        <th class="text-center">{% trans "SRP ISK Cost" %}
+                        {% blocktrans %}<i class="glyphicon glyphicon-question-sign" rel="tooltip" title="Click value to edit
+Enter to save&next
+ESC to cancel"
+                        id="blah"></i></th>{% endblocktrans %}
+                        <th class="text-center">{% trans "Post Time" %}</th>
+                        <th class="text-center">{% trans "Status" %}</th>
+                        {% if perms.auth.srp_management %}
+                            <th class="text-center">{% trans "Actions" %}</th>
+                        {% endif %}
+                    </tr>
+                    {% for srpfleetrequest in srpfleetrequests %}
+                        <tr>
+                            <td class="text-center">{{ srpfleetrequest.character.character_name }}</td>
+                            <td class="text-center">
+                                <a href="{{ srpfleetrequest.killboard_link }}"
+                                   target="_blank" class="label label-warning">Link</a>
+                            </td>
+                            <td class="text-center">{{ srpfleetrequest.additional_info }}</td>
+                            <td class="text-center">{{ srpfleetrequest.srp_ship_name }}</td>
+                            <td class="text-center">{{ srpfleetrequest.kb_total_loss | intcomma }} ISK</td>
+                            <td class="srp" data-name="srp_total_amount" data-type="number" data-pk="{{srpfleetrequest.id}}" data-url="{% url 'srp:request_update_amount' srpfleetrequest.id %}" data-params="{csrfmiddlewaretoken:'{{csrf_token}}'}" class="text-center">{{ srpfleetrequest.srp_total_amount | intcomma }} ISK</td>
+                            <td class="text-center">{{ srpfleetrequest.post_time | date:"Y-m-d H:i" }}</td>
+                            <td class="text-center">
+                                {% if srpfleetrequest.srp_status == "Approved" %}
+                                    <div class="label label-success">
+                                        {% trans "Approved" %}
+                                    </div>
+                                {% elif srpfleetrequest.srp_status == "Rejected" %}
+                                    <div class="label label-danger">
+                                        {% trans "Rejected" %}
+                                    </div>
+                                {% else %}
+                                    <div class="label label-warning">
+                                        {% trans "Pending" %}
+                                    </div>
+                                {% endif %}
+                            </td>
+                            {% if perms.auth.srp_management %}
+                                <td class="text-center">
+                                    <div class="checkbox">
+                                        <label style="font-size: 1.5em">
+                                            <input type="checkbox" name="{{srpfleetrequest.id}}">
+                                            <span class="cr"><i class="cr-icon fa fa-check"></i></span>
+                                        </label>
+                                    </div>                            
+                                </td>
+                            {% endif %}
+                        </tr>
+                    {% endfor %}   
+                </table>
+                <div class="alert alert-info" role="alert">
+                    <div class="text-right">
+                        <b><span style="padding-right:2.5em">{% trans "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
+                        <b><span style="padding-right:2.5em">{% trans "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
+                        {% if perms.auth.srp_management %}
+                            <button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
+                                <span class="glyphicon glyphicon-ok"></span>
+                            </button>
+                            <button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
+                                <span class="glyphicon glyphicon-remove"></span>
+                            </button>
+                            <button type="submit" title="Remove" onclick="return confirm('{% trans "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
+                                <span class="glyphicon glyphicon-trash"></span>
+                            </button>
+                        {% endif %}
+                    </div>
+                </div>
+            </form>
+            {% else %}
+            <div class="alert alert-warning text-center">{% trans "No SRP requests for this fleet." %}</div>
+            {% endif %}
+        </div>
+    </div>
+{% endblock content %}
+
+{% block extra_javascript %}
+    {% include 'bundles/x-editable-js.html' %}
+{% endblock %}
+
+{% block extra_script %}
+  $(document).ready(function() {
+      $.fn.editable.defaults.mode = 'inline';
+      $.fn.editable.defaults.showbuttons = false;
+      $.fn.editable.defaults.highlight = "#AAFF80";
+
+
+      $('.srp').editable({
+          display: function(value, response) {
+              return false;
+          },
+          success: function(response, newValue) {
+              newValue = parseInt(newValue);
+              newvalue = newValue.toLocaleString() + " ISK";
+              $(this).html(newvalue.bold());
+          },
+          validate: function(value) {
+              if (value === null || value === '') {
+                  return 'Empty values not allowed';
+              }
+          }
+      });
+      $('.srp').on('hidden', function(e, reason){
+              if(reason === 'save' || reason === 'nochange') {
+              var $next = $(this).closest('tr').next().find('.editable');
+              setTimeout(function() {
+                  $next.editable('show');
+              }, 400); 
+          }
+     });
+  });
+  $(document).ready(function(){
+    $("[rel=tooltip]").tooltip({ placement: 'top'});
+});
+{% endblock extra_script %}

srp/templates/srp/management.html

@@ -0,0 +1,125 @@
+{% extends "registered/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+{% load i18n %}
+
+{% load humanize %}
+{% block title %}Alliance Auth{% endblock %}
+
+{% block page_title %}{% trans "Srp Management" %}{% endblock page_title %}
+{% block extra_css %}{% endblock extra_css %}
+
+{% block content %}
+    <div class="col-lg-12">
+        <div class="row">
+            <h1 class="page-header text-center">{% trans "SRP Management" %}
+                <div class="text-right">
+                    {% if perms.auth.srp_management %}
+                        <a href="{% url 'srp:all' %}" class="btn btn-primary">
+                            {% trans "View All" %}
+                        </a>
+                        <a href="{% url 'srp:add' %}" class="btn btn-success">
+                            {% trans "Add SRP Fleet" %}
+                        </a>
+                    {% endif %}
+                </div>
+            </h1>
+            <div class="alert alert-info" role="alert">
+                <div class="text-right">
+                    <b>{% trans "Total ISK Cost:" %} {{ totalcost | intcomma }}</b>
+                </div>
+            </div>
+            {% if srpfleets %}
+            <table class="table">
+                <tr>
+                    <th class="text-center">{% trans "Fleet Name" %}</th>
+                    <th class="text-center">{% trans "Fleet Time" %}</th>
+                    <th class="text-center">{% trans "Fleet Doctrine" %}</th>
+                    <th class="text-center">{% trans "Fleet Commander" %}</th>
+                    <th class="text-center">{% trans "Fleet AAR" %}</th>
+                    <th class="text-center">{% trans "Fleet SRP Code" %}</th>
+                    <th class="text-center">{% trans "Fleet ISK Cost" %}</th>
+                    <th class="text-center">{% trans "SRP Status" %}</th>
+                    <th class="text-center">{% trans "Pending Requests" %}</th>
+                    <th width="100px" class="text-center">{% trans "Actions" %}</th>
+                </tr>
+                {% for srpfleet in srpfleets %}
+                    <tr>
+                        <td class="text-center">
+                            <div class="label label-info">
+                                {{ srpfleet.fleet_name }}
+                            </div>
+                        </td>
+                        <td class="text-center">{{ srpfleet.fleet_time | date:"Y-m-d H:i" }}</td>
+                        <td class="text-center">{{ srpfleet.fleet_doctrine }}</td>
+                        <td class="text-center">
+                            <div class="label label-success">
+                                {{ srpfleet.fleet_commander.character_name }}
+                            </div>
+                        </td>
+                        <td class="text-center">
+                            {%  if srpfleet.fleet_srp_aar_link %}
+                                <a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="label label-primary">{% trans 'Link' %}</a>
+                            {%  endif %}
+                        </td>
+                        <td class="text-center">
+                            {% if srpfleet.fleet_srp_code %}
+                                <a class="label label-warning" href="{% url 'srp:request' srpfleet.fleet_srp_code %}">{{ srpfleet.fleet_srp_code }}</a>
+                            {% else %}
+                                <div class="label label-danger">
+                                    {% trans "Disabled" %}
+                                </div>
+                            {% endif %}
+                        </td>
+                        <td class="text-center">ISK: {{ srpfleet.total_cost | intcomma }}</td>
+
+                        <td class="text-center">
+                            {% if srpfleet.fleet_srp_status == "" %}
+                                <div class="label label-warning">
+                                    {% trans "Pending" %}
+                                </div>
+                            {% else %}
+                                <div class="label label-success">
+                                    {% trans "Completed" %}
+                                </div>
+                            {% endif %}
+                        </td>
+                        <td class="text-center">
+                            <div class="label label-warning">{{ srpfleet.pending_requests }}</div>
+                        </td>
+                        <td class="text-center">
+
+                            <a href="{% url 'srp:fleet' srpfleet.id %}" class="btn btn-primary" title="View">
+                                <span class="glyphicon glyphicon-eye-open"></span>
+                            </a>
+
+                            {% if perms.auth.srp_management %}
+                                <a href="{% url 'srp:edit' srpfleet.id %}" class="btn btn-info" title="Edit">
+                                    <span class="glyphicon glyphicon-pencil"></span>
+                                </a>
+
+                                <a href="{% url 'srp:remove' srpfleet.id %}" onclick="return confirm('{% trans "Are you sure you want to delete this SRP code and its contents?" %}')" class="btn btn-danger" title="Remove">
+                                    <span class="glyphicon glyphicon-trash"></span>
+                                </a>
+                                {% if srpfleet.fleet_srp_code %}
+                                    <a href="{% url 'srp:disable' srpfleet.id %}" class="btn btn-warning" title="Disable">
+                                        <span class="glyphicon glyphicon-remove-sign"></span>
+                                    </a>
+                                {% else %}
+                                    <a href="{% url 'srp:enable' srpfleet.id %}" class="btn btn-success" title="Enable">
+                                        <span class="glyphicon glyphicon-ok-sign"></span>
+                                    </a>
+                                {% endif %}
+
+                            {% endif %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </table>
+            {% else %}
+            <div class="alert alert-warning text-center">{% trans "No SRP fleets created." %}</div>
+            {% endif %}
+        </div>
+    </div>
+
+{% endblock content %}

srp/templates/srp/request.html

@@ -0,0 +1,31 @@
+{% extends "registered/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+{% load i18n %}
+
+{% block title %}SRP Request{% endblock %}
+
+{% block page_title %}{% trans "SRP Request" %}{% endblock page_title %}
+
+{% block content %}
+
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">{% trans "Create SRP Request" %}</h1>
+
+        <div class="container-fluid">
+            <div class="col-md-4 col-md-offset-4">
+                <div class="row">
+                    <form class="form-signin" role="form" action="" method="POST">
+                        {% csrf_token %}
+                        {{ form|bootstrap }}
+                        <br/>
+                        <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Create SRP Request" %}
+                        </button>
+                    </form>
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+{% endblock content %}

srp/templates/srp/update.html

@@ -0,0 +1,35 @@
+{% extends "registered/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+{% load i18n %}
+
+{% block title %}Alliance Auth - Update AAR Link{% endblock %}
+
+{% block page_title %}{% trans "Update AAR Link" %}{% endblock page_title %}
+
+{% block content %}
+
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">{% trans "Update AAR Link" %}</h1>
+
+        <div class="container-fluid">
+            <div class="col-md-4 col-md-offset-4">
+                <div class="row">
+                    {% if no_fleet_id %}
+                        <div class="alert alert-danger" role="alert">{% trans "SRP Fleet Does Not Exist" %}</div>
+                    {% else %}
+                        <form class="form-signin" role="form" action="" method="POST">
+                            {% csrf_token %}
+                            {{ form|bootstrap }}
+                            <br/>
+                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Update AAR Link" %}
+                            </button>
+                        </form>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+{% endblock content %}

srp/urls.py

@@ -0,0 +1,31 @@
+from django.conf.urls import url
+import srp.views
+
+app_name = 'srp'
+
+urlpatterns = [
+    # SRP URLS
+    url(r'^$', srp.views.srp_management, name='management'),
+    url(r'^all/$', srp.views.srp_management_all, name='all'),
+    url(r'^(\w+)/view$', srp.views.srp_fleet_view, name='fleet'),
+    url(r'^add/$', srp.views.srp_fleet_add_view, name='add'),
+    url(r'^(\w+)/edit$', srp.views.srp_fleet_edit_view, name='edit'),
+    url(r'^(\w+)/request', srp.views.srp_request_view, name='request'),
+
+    # SRP URLS
+    url(r'^(\w+)/remove$', srp.views.srp_fleet_remove, name='remove'),
+    url(r'^(\w+)/disable$', srp.views.srp_fleet_disable, name='disable'),
+    url(r'^(\w+)/enable$', srp.views.srp_fleet_enable, name='enable'),
+    url(r'^(\w+)/complete$', srp.views.srp_fleet_mark_completed,
+        name='mark_completed'),
+    url(r'^(\w+)/incomplete$', srp.views.srp_fleet_mark_uncompleted,
+        name='mark_uncompleted'),
+    url(r'^request/remove/', srp.views.srp_request_remove,
+        name="request_remove"),
+    url(r'request/approve/', srp.views.srp_request_approve,
+        name='request_approve'),
+    url(r'request/reject/', srp.views.srp_request_reject,
+        name='request_reject'),
+    url(r'^request/(\w+)/update', srp.views.srp_request_update_amount,
+        name="request_update_amount"),
+    ]

srp/views.py

@@ -37,7 +37,7 @@ def srp_management(request):
     fleets = SrpFleetMain.objects.filter(fleet_srp_status="")
     totalcost = sum([int(fleet.total_cost) for fleet in fleets])
     context = {"srpfleets": fleets, "totalcost": totalcost}
-    return render(request, 'registered/srpmanagement.html', context=context)
+    return render(request, 'srp/management.html', context=context)
 
 
 @login_required
@@ -47,7 +47,7 @@ def srp_management_all(request):
     fleets = SrpFleetMain.objects.all()
     totalcost = sum([int(fleet.total_cost) for fleet in fleets])
     context = {"srpfleets": SrpFleetMain.objects.all(), "totalcost": totalcost}
-    return render(request, 'registered/srpmanagement.html', context=context)
+    return render(request, 'srp/management.html', context=context)
 
 
 @login_required
@@ -59,7 +59,7 @@ def srp_fleet_view(request, fleet_id):
                "srpfleetrequests": fleet_main.srpuserrequest_set.order_by('srp_ship_name'),
                "totalcost": fleet_main.total_cost}
 
-    return render(request, 'registered/srpfleetdata.html', context=context)
+    return render(request, 'srp/data.html', context=context)
 
 
 @login_required
@@ -93,7 +93,7 @@ def srp_fleet_add_view(request):
 
     render_items = {'form': form, "completed": completed, "completed_srp_code": completed_srp_code}
 
-    return render(request, 'registered/srpfleetadd.html', context=render_items)
+    return render(request, 'srp/add.html', context=render_items)
 
 
 @login_required
@@ -104,7 +104,7 @@ def srp_fleet_remove(request, fleet_id):
     srpfleetmain.delete()
     logger.info("SRP Fleet %s deleted by user %s" % (srpfleetmain.fleet_name, request.user))
     messages.success(request, _('Removed SRP fleet %(fleetname)s.') % {"fleetname": srpfleetmain.fleet_name})
-    return redirect("auth_srp_management_view")
+    return redirect("srp:management")
 
 
 @login_required
@@ -116,7 +116,7 @@ def srp_fleet_disable(request, fleet_id):
     srpfleetmain.save()
     logger.info("SRP Fleet %s disabled by user %s" % (srpfleetmain.fleet_name, request.user))
     messages.success(request, _('Disabled SRP fleet %(fleetname)s.') % {"fleetname": srpfleetmain.fleet_name})
-    return redirect("auth_srp_management_view")
+    return redirect("srp:management")
 
 
 @login_required
@@ -128,7 +128,7 @@ def srp_fleet_enable(request, fleet_id):
     srpfleetmain.save()
     logger.info("SRP Fleet %s enable by user %s" % (srpfleetmain.fleet_name, request.user))
     messages.success(request, _('Enabled SRP fleet %(fleetname)s.') % {"fleetname": srpfleetmain.fleet_name})
-    return redirect("auth_srp_management_view")
+    return redirect("srp:management")
 
 
 @login_required
@@ -141,7 +141,7 @@ def srp_fleet_mark_completed(request, fleet_id):
     logger.info("Marked SRP Fleet %s as completed by user %s" % (srpfleetmain.fleet_name, request.user))
     messages.success(request,
                      _('Marked SRP fleet %(fleetname)s as completed.') % {"fleetname": srpfleetmain.fleet_name})
-    return redirect("auth_srp_fleet_view", fleet_id)
+    return redirect("srp:fleet", fleet_id)
 
 
 @login_required
@@ -154,7 +154,7 @@ def srp_fleet_mark_uncompleted(request, fleet_id):
     logger.info("Marked SRP Fleet %s as incomplete for user %s" % (fleet_id, request.user))
     messages.success(request,
                      _('Marked SRP fleet %(fleetname)s as incomplete.') % {"fleetname": srpfleetmain.fleet_name})
-    return redirect("auth_srp_fleet_view", fleet_id)
+    return redirect("srp:fleet", fleet_id)
 
 
 @login_required
@@ -166,7 +166,7 @@ def srp_request_view(request, fleet_srp):
         logger.error("Unable to locate SRP Fleet using code %s for user %s" % (fleet_srp, request.user))
         messages.error(request,
                        _('Unable to locate SRP code with ID %(srpfleetid)s') % {"srpfleetid": fleet_srp})
-        return redirect("auth_srp_management_view")
+        return redirect("srp:management")
 
     if request.method == 'POST':
         form = SrpFleetUserRequestForm(request.POST)
@@ -176,7 +176,7 @@ def srp_request_view(request, fleet_srp):
             if SrpUserRequest.objects.filter(killboard_link=form.cleaned_data['killboard_link']).exists():
                 messages.error(request,
                                _("This Killboard link has already been posted."))
-                return redirect("auth_srp_management_view")
+                return redirect("srp:management")
 
             character = request.user.profile.main_character
             srp_fleet_main = SrpFleetMain.objects.get(fleet_srp_code=fleet_srp)
@@ -198,41 +198,43 @@ def srp_request_view(request, fleet_srp):
                 messages.error(request,
                                _(
                                    "Your SRP request Killmail link is invalid. Please make sure you are using zKillboard."))
-                return redirect("auth_srp_management_view")
+                return redirect("srp:management")
 
-            if request.user.characterownership_set.filter(character__character_name=victim_name).exists():
+            if request.user.character_ownerships.filter(character__character_name=victim_name).exists():
                 srp_request.srp_ship_name = EveManager.get_itemtype(ship_type_id).name
                 srp_request.kb_total_loss = ship_value
                 srp_request.post_time = post_time
                 srp_request.save()
                 logger.info("Created SRP Request on behalf of user %s for fleet name %s" % (
                     request.user, srp_fleet_main.fleet_name))
-                messages.success(request, _('Submitted SRP request for your %(ship)s.') % {"ship": srp_request.srp_ship_name})
-                return redirect("auth_srp_management_view")
+                messages.success(request,
+                                 _('Submitted SRP request for your %(ship)s.') % {"ship": srp_request.srp_ship_name})
+                return redirect("srp:management")
             else:
                 messages.error(request,
-                             _("%(charname)s does not belong to your Auth account. Please add the API key for this character and try again")
+                               _(
+                                   "%(charname)s does not belong to your Auth account. Please add the API key for this character and try again")
                                % {"charname": victim_name})
-            return redirect("auth_srp_management_view")
+            return redirect("srp:management")
     else:
         logger.debug("Returning blank SrpFleetUserRequestForm")
         form = SrpFleetUserRequestForm()
 
     render_items = {'form': form}
 
-    return render(request, 'registered/srpfleetrequest.html', context=render_items)
+    return render(request, 'srp/request.html', context=render_items)
 
 
 @login_required
 @permission_required('auth.srp_management')
 def srp_request_remove(request):
-    numrequests = len(request.POST)-1
+    numrequests = len(request.POST) - 1
     logger.debug("srp_request_remove called by user %s for %s srp request id's" % (request.user, numrequests))
     stored_fleet_view = None
     for srp_request_id in request.POST:
         if numrequests == 0:
             messages.warning(request, _("No SRP requests selected"))
-            return redirect("auth_srp_management_view")
+            return redirect("srp:management")
         if srp_request_id == "csrfmiddlewaretoken":
             continue
         if SrpUserRequest.objects.filter(id=srp_request_id).exists():
@@ -241,25 +243,24 @@ def srp_request_remove(request):
             srpuserrequest.delete()
             logger.info("Deleted SRP request id %s for user %s" % (srp_request_id, request.user))
     if stored_fleet_view is None:
-        logger.error("Unable to delete srp request id %s for user %s - request matching id not found." % (
-            srp_request_id, request.user))
-        messages.error(request, _('Unable to locate SRP request with ID %(requestid)s') % {"requestid": srp_request_id})
-        return redirect("auth_srp_management_view")
+        logger.error("Unable to delete srp requests for user %s - request matching id not found." % (request.user))
+        messages.error(request, _('Unable to locate selected SRP request.'))
+        return redirect("srp:management")
     else:
         messages.success(request, _('Deleted %(numrequests)s SRP requests') % {"numrequests": numrequests})
-        return redirect("auth_srp_fleet_view", stored_fleet_view)
+        return redirect("srp:fleet", stored_fleet_view)
 
 
 @login_required
 @permission_required('auth.srp_management')
 def srp_request_approve(request):
-    numrequests = len(request.POST)-1
+    numrequests = len(request.POST) - 1
     logger.debug("srp_request_approve called by user %s for %s srp request id's" % (request.user, numrequests))
     stored_fleet_view = None
     for srp_request_id in request.POST:
         if numrequests == 0:
             messages.warning(request, _("No SRP requests selected"))
-            return redirect("auth_srp_management_view")
+            return redirect("srp:management")
         if srp_request_id == "csrfmiddlewaretoken":
             continue
         if SrpUserRequest.objects.filter(id=srp_request_id).exists():
@@ -276,28 +277,28 @@ def srp_request_approve(request):
                 'SRP Request Approved',
                 level='success',
                 message='Your SRP request for a %s lost during %s has been approved for %s ISK.' % (
-                    srpuserrequest.srp_ship_name, srpuserrequest.srp_fleet_main.fleet_name, intcomma(srpuserrequest.srp_total_amount))
+                    srpuserrequest.srp_ship_name, srpuserrequest.srp_fleet_main.fleet_name,
+                    intcomma(srpuserrequest.srp_total_amount))
             )
     if stored_fleet_view is None:
-        logger.error("Unable to approve srp request id %s on behalf of user %s - request matching id not found." % (
-            srp_request_id, request.user))
-        messages.error(request, _('Unable to locate SRP request with ID %(requestid)s') % {"requestid": srp_request_id})
-        return redirect("auth_srp_management_view")
+        logger.error("Unable to approve srp request on behalf of user %s - request matching id not found." % (request.user))
+        messages.error(request, _('Unable to locate selected SRP request.'))
+        return redirect("srp:management")
     else:
         messages.success(request, _('Approved %(numrequests)s SRP requests') % {"numrequests": numrequests})
-        return redirect("auth_srp_fleet_view", stored_fleet_view)
+        return redirect("srp:fleet", stored_fleet_view)
 
 
 @login_required
 @permission_required('auth.srp_management')
 def srp_request_reject(request):
-    numrequests = len(request.POST)-1
+    numrequests = len(request.POST) - 1
     logger.debug("srp_request_reject called by user %s for %s srp request id's" % (request.user, numrequests))
     stored_fleet_view = None
     for srp_request_id in request.POST:
         if numrequests == 0:
             messages.warning(request, _("No SRP requests selected"))
-            return redirect("auth_srp_management_view")
+            return redirect("srp:management")
         if srp_request_id == "csrfmiddlewaretoken":
             continue
         if SrpUserRequest.objects.filter(id=srp_request_id).exists():
@@ -315,13 +316,12 @@ def srp_request_reject(request):
                     srpuserrequest.srp_ship_name, srpuserrequest.srp_fleet_main.fleet_name)
             )
     if stored_fleet_view is None:
-        logger.error("Unable to reject SRP request id %s on behalf of user %s - request matching id not found." % (
-            srp_request_id, request.user))
-        messages.error(request, _('Unable to locate SRP request with ID %(requestid)s') % {"requestid": srp_request_id})
-        return redirect("auth_srp_management_view")
+        logger.error("Unable to reject SRP request on behalf of user %s - request matching id not found." % (request.user))
+        messages.error(request, _('Unable to locate selected SRP request'))
+        return redirect("srp:management")
     else:
         messages.success(request, _('Rejected %(numrequests)s SRP requests.') % {"numrequests": numrequests})
-        return redirect("auth_srp_fleet_view", stored_fleet_view)
+        return redirect("srp:fleet", stored_fleet_view)
 
 
 @login_required
@@ -332,15 +332,16 @@ def srp_request_update_amount(request, fleet_srp_request_id):
 
     if SrpUserRequest.objects.filter(id=fleet_srp_request_id).exists() is False:
         logger.error("Unable to locate SRP request id %s for user %s" % (fleet_srp_request_id, request.user))
-        messages.error(request, _('Unable to locate SRP request with ID %(requestid)s') % {"requestid": fleet_srp_request_id})
-        return redirect("auth_srp_management_view")
+        messages.error(request,
+                       _('Unable to locate SRP request with ID %(requestid)s') % {"requestid": fleet_srp_request_id})
+        return redirect("srp:management")
 
     srp_request = SrpUserRequest.objects.get(id=fleet_srp_request_id)
     srp_request.srp_total_amount = request.POST['value']
     srp_request.save()
     logger.info("Updated srp request id %s total to %s by user %s" % (
         fleet_srp_request_id, request.POST['value'], request.user))
-    return JsonResponse({"success":True,"pk":fleet_srp_request_id,"newValue":request.POST['value']})
+    return JsonResponse({"success": True, "pk": fleet_srp_request_id, "newValue": request.POST['value']})
 
 
 @login_required
@@ -357,8 +358,8 @@ def srp_fleet_edit_view(request, fleet_id):
             logger.info("User %s edited SRP Fleet %s" % (request.user, srpfleetmain.fleet_name))
             messages.success(request,
                              _('Saved changes to SRP fleet %(fleetname)s') % {"fleetname": srpfleetmain.fleet_name})
-            return redirect("auth_srp_management_view")
+            return redirect("srp:management")
     else:
         logger.debug("Returning blank SrpFleetMainUpdateForm")
         form = SrpFleetMainUpdateForm()
-    return render(request, 'registered/srpfleetupdate.html', context={'form': form})
+    return render(request, 'srp/update.html', context={'form': form})