From c0f01f380645c5a389297a450cd8149432caa8b1 Mon Sep 17 00:00:00 2001 From: orbitroom Date: Sat, 6 Dec 2014 17:52:19 -0500 Subject: [PATCH 01/10] Added Fleet Fittings Page --- templates/public/base.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/public/base.html b/templates/public/base.html index 0c4c76a7..a13664a1 100755 --- a/templates/public/base.html +++ b/templates/public/base.html @@ -128,7 +128,11 @@ {% endif %} {% if perms.auth.alliance_member or perms.auth.blue_member %} - +
  • + Fleet Doctrines +
  • Date: Sat, 6 Dec 2014 17:53:52 -0500 Subject: [PATCH 02/10] Added Fleet Fittings Page --- alliance_auth/urls.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/alliance_auth/urls.py b/alliance_auth/urls.py index 3c749519..f6b75ae4 100755 --- a/alliance_auth/urls.py +++ b/alliance_auth/urls.py @@ -152,6 +152,8 @@ urlpatterns = patterns('', name='auth_srp_request_approve'), url(r'srp_request_reject/(\w+)', 'srp.views.srp_request_reject', name='auth_srp_request_reject'), url(r'srp_request_amount_update/(\w+)', 'srp.views.srp_request_update_amount_view', - name="auth_srp_request_update_amount_view") - -) \ No newline at end of file + name="auth_srp_request_update_amount_view"), + + # FLEET FITTINGS + url(r'^fits/$', 'services.views.fleet_fits', name='auth_fleet_fits'), +) From 9aaa88048d71120cc28e878668bfad855805f522 Mon Sep 17 00:00:00 2001 From: orbitroom Date: Sat, 6 Dec 2014 17:54:55 -0500 Subject: [PATCH 03/10] Added Fleet Fittings Page --- services/views.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/services/views.py b/services/views.py index bf7e4e84..8783882f 100755 --- a/services/views.py +++ b/services/views.py @@ -305,4 +305,10 @@ def reset_teamspeak3_perm(request): AuthServicesInfoManager.update_user_teamspeak3_info(result[0], result[1], request.user) update_teamspeak3_groups(request.user) return HttpResponseRedirect("/services/") - return HttpResponseRedirect("/") \ No newline at end of file + return HttpResponseRedirect("/") + +@login_required +def fleet_fits(request): + context = {} + return render_to_response('registered/fleetfits.html', context, +context_instance=RequestContext(request)) From 186fb71c58adb04b984f71890672b08f134e6398 Mon Sep 17 00:00:00 2001 From: orbitroom Date: Sat, 6 Dec 2014 18:19:20 -0500 Subject: [PATCH 04/10] Added Fleet Fits Page --- templates/registered/fleetfits.html | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 templates/registered/fleetfits.html diff --git a/templates/registered/fleetfits.html b/templates/registered/fleetfits.html new file mode 100644 index 00000000..d008b0e9 --- /dev/null +++ b/templates/registered/fleetfits.html @@ -0,0 +1,3 @@ + Date: Sun, 14 Dec 2014 02:22:06 -0500 Subject: [PATCH 05/10] Updated to use exisiting style Stays in frame of Auth --- templates/registered/fleetfits.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/templates/registered/fleetfits.html b/templates/registered/fleetfits.html index d008b0e9..84bf9f90 100644 --- a/templates/registered/fleetfits.html +++ b/templates/registered/fleetfits.html @@ -1,3 +1,15 @@ +{% extends "public/base.html" %} +{% load bootstrap %} +{% load staticfiles %} + +{% block title %}Alliance Auth{% endblock %} + +{% block page_title %}Alliance Fleet Doctrines{% endblock page_title %} +{% block extra_css %}{% endblock extra_css %} + +{% block content %} + Date: Sun, 14 Dec 2014 02:26:53 -0500 Subject: [PATCH 06/10] Updated Services Icon Added Different Icon For Fleet Fittings --- templates/public/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/public/base.html b/templates/public/base.html index a13664a1..8967d4ee 100755 --- a/templates/public/base.html +++ b/templates/public/base.html @@ -131,7 +131,7 @@
  • Fleet Doctrines + class="fa fa-bolt fa-fw grayiconecolor"> Fleet Doctrines
  • Date: Thu, 8 Jan 2015 07:58:11 -0500 Subject: [PATCH 07/10] Rename fleetfits.html to fleetfits.html.example --- templates/registered/{fleetfits.html => fleetfits.html.example} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename templates/registered/{fleetfits.html => fleetfits.html.example} (100%) diff --git a/templates/registered/fleetfits.html b/templates/registered/fleetfits.html.example similarity index 100% rename from templates/registered/fleetfits.html rename to templates/registered/fleetfits.html.example From ead7e0d0b2e09cdeb3f1069159458b1db0ab057a Mon Sep 17 00:00:00 2001 From: orbitroom Date: Thu, 8 Jan 2015 07:59:59 -0500 Subject: [PATCH 08/10] Added Better Examples Added better Examples and changed the file extension so it will not overwrite the current fits. --- templates/registered/fleetfits.html.example | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/templates/registered/fleetfits.html.example b/templates/registered/fleetfits.html.example index 84bf9f90..74a44c5f 100644 --- a/templates/registered/fleetfits.html.example +++ b/templates/registered/fleetfits.html.example @@ -9,7 +9,11 @@ {% block content %} - +Vexor Navy Issue
    +Ishtar
    +Scimitar
    +Scythe
    +
    +Ship DNA can be exported by different tools I recommend using FleetUp.com to get the Ship DNA {% endblock content %} From c9459a2b834d1bd8cbf445178df5379f2d825091 Mon Sep 17 00:00:00 2001 From: orbitroom Date: Thu, 8 Jan 2015 08:22:22 -0500 Subject: [PATCH 09/10] Changed formatting for in game browser changed the break code syntax to allow for in game browser compatability --- templates/registered/fleetfits.html.example | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/registered/fleetfits.html.example b/templates/registered/fleetfits.html.example index 74a44c5f..b26f479f 100644 --- a/templates/registered/fleetfits.html.example +++ b/templates/registered/fleetfits.html.example @@ -9,11 +9,11 @@ {% block content %} -Main bash/defense doctrine (SHIELD)
    -Vexor Navy Issue
    -Ishtar
    -Scimitar
    -Scythe
    -
    +Main bash/defense doctrine (SHIELD)
    +Vexor Navy Issue
    +Ishtar
    +Scimitar
    +Scythe
    +
    Ship DNA can be exported by different tools I recommend using FleetUp.com to get the Ship DNA {% endblock content %} From cd8de6d19ef40928101f99de16661fd632175bb0 Mon Sep 17 00:00:00 2001 From: orbitroom Date: Thu, 8 Jan 2015 17:59:27 -0500 Subject: [PATCH 10/10] Update fleetfits.html.example --- templates/registered/fleetfits.html.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/registered/fleetfits.html.example b/templates/registered/fleetfits.html.example index b26f479f..47b59748 100644 --- a/templates/registered/fleetfits.html.example +++ b/templates/registered/fleetfits.html.example @@ -15,5 +15,5 @@ Main bash/defense doctrine (SHIELD)
    Scimitar
    Scythe

    -Ship DNA can be exported by different tools I recommend using FleetUp.com to get the Ship DNA +Ship DNA can be exported by different tools I recommend using fleetup.com OR https://www.fuzzwork.co.uk/ships/dnagen.php to get the Ship DNA {% endblock content %}