diff --git a/alliance_auth/urls.py b/alliance_auth/urls.py index 9306d3d1..0c573ee3 100644 --- a/alliance_auth/urls.py +++ b/alliance_auth/urls.py @@ -54,7 +54,7 @@ urlpatterns = patterns('', # Forum Service Control url(r'^activate_forum/$', 'services.views.activate_forum', name='auth_activate_forum'), url(r'^deactivate_forum/$', 'services.views.deactivate_forum', name='auth_deactivate_forum'), - url(r'reset_forum_password/$', 'services.views.reset_forum_password', name='auth_reset_forum_password'), + url(r'^reset_forum_password/$', 'services.views.reset_forum_password', name='auth_reset_forum_password'), # Jabber Service Control url(r'^activate_jabber/$', 'services.views.activate_jabber', name='auth_activate_jabber'), @@ -63,6 +63,10 @@ urlpatterns = patterns('', # Mumble service contraol url(r'^activate_mumble/$', 'services.views.activate_mumble', name='auth_activate_mumble'), - url(r'deactivate_mumble/$', 'services.views.deactivate_mumble', name='auth_deactivate_mumble'), - url(r'reset_mumble_password/$', 'services.views.reset_mumble_password', name='auth_reset_mumble_password'), + url(r'^deactivate_mumble/$', 'services.views.deactivate_mumble', name='auth_deactivate_mumble'), + url(r'^reset_mumble_password/$', 'services.views.reset_mumble_password', name='auth_reset_mumble_password'), + + # Tools + url(r'^tool/fleet_formatter_tool/$', 'services.views.fleet_formatter_view', name='auth_fleet_format_tool_view'), + ) diff --git a/services/forms.py b/services/forms.py index 48701969..cd322c0c 100644 --- a/services/forms.py +++ b/services/forms.py @@ -8,4 +8,19 @@ class JabberBroadcastForm(forms.Form): for group in Group.objects.all(): allchoices.append((str(group.name), str(group.name))) group = forms.ChoiceField(choices=allchoices, widget=forms.Select) - message = forms.CharField(widget = forms.Textarea) \ No newline at end of file + message = forms.CharField(widget=forms.Textarea) + + +class FleetFormatterForm(forms.Form): + fleet_name = forms.CharField(label='Name of Fleet:', required=True) + fleet_commander = forms.CharField(label='Fleet Commander:', required=True) + fleet_comms = forms.CharField(label='Fleet Comms:', required=True) + fleet_type = forms.CharField(label='Fleet Type:', required=True) + ship_priorities = forms.CharField(label='Ship Priorities:', required=True) + formup_location = forms.CharField(label='Formup Location:', required=True) + formup_time = forms.CharField(label='Formup Time:', required=True) + expected_duration = forms.CharField(label='Expected Duration:', required=True) + purpose = forms.CharField(label='Purpose:', required=True) + reimbursable = forms.ChoiceField(label='Reimbursable?*', choices=[('Yes', 'Yes'), ('No', 'No')], required=True) + important = forms.ChoiceField(label='Important?*', choices=[('Yes', 'Yes'), ('No', 'No')], required=True) + comments = forms.CharField(widget=forms.Textarea, required=False) diff --git a/services/views.py b/services/views.py index 2d0b92e5..a92a7b4a 100644 --- a/services/views.py +++ b/services/views.py @@ -17,6 +17,31 @@ from celerytask.tasks import update_mumble_groups from celerytask.tasks import update_forum_groups from forms import JabberBroadcastForm +from forms import FleetFormatterForm + + +@login_required +def fleet_formatter_view(request): + if request.method == 'POST': + form = FleetFormatterForm(request.POST) + if form.is_valid(): + generated = "Fleet Name: "+form.cleaned_data['fleet_name']+"\n" + generated = generated + "FC: "+form.cleaned_data['fleet_commander']+"\n" + generated = generated + "Comms: "+form.cleaned_data['fleet_comms']+"\n" + generated = generated + "Fleet Type: "+form.cleaned_data['fleet_type'] + " || " + form.cleaned_data['ship_priorities']+"\n" + generated = generated + "Form Up: "+form.cleaned_data['formup_location']+" @ "+form.cleaned_data['formup_time']+"\n" + generated = generated + "Duration: "+form.cleaned_data['expected_duration']+"\n" + generated = generated + "Reimbursable: "+form.cleaned_data['reimbursable']+"\n" + generated = generated + "Important: "+form.cleaned_data['important']+"\n" + if form.cleaned_data['comments'] != "": + generated = generated + "Why: "+form.cleaned_data['comments']+"\n" + else: + form = FleetFormatterForm() + generated = "" + + context = {'form': form, 'generated': generated} + + return render_to_response('registered/fleetformattertool.html', context, context_instance=RequestContext(request)) @login_required diff --git a/static/css/sb-admin-2.css b/static/css/sb-admin-2.css index 47e576d4..0286d96b 100644 --- a/static/css/sb-admin-2.css +++ b/static/css/sb-admin-2.css @@ -10,6 +10,7 @@ body { #wrapper { width: 100%; + height: 100%; } #page-wrapper { diff --git a/templates/public/base.html b/templates/public/base.html index 12790364..e9640501 100644 --- a/templates/public/base.html +++ b/templates/public/base.html @@ -92,7 +92,9 @@ Jabber Broadcast {% endif %} - +
  • + Fleet Broadcast Formatter +
    • diff --git a/templates/registered/fleetformattertool.html b/templates/registered/fleetformattertool.html new file mode 100644 index 00000000..7acd1576 --- /dev/null +++ b/templates/registered/fleetformattertool.html @@ -0,0 +1,36 @@ +{% extends "public/base.html" %} +{% load bootstrap %} +{% load staticfiles %} + +{% block title %}Alliance Auth{% endblock %} + +{% block page_title %}Fleet Formatter Tool{% endblock page_title %} +{% block extra_css %}{% endblock extra_css %} + +{% block content %} +
    +

    Fleet Broadcast Formatter Tool

    + +
    +
    + {% if generated != "" %} +
    + + {% else %} +
    +
    +
    + + +
    + {% endif %} +
    +
    +
    + +{% endblock content %}