Reformatted code for easy reading.

2026-02-11 01:26:22 +01:00 · 2014-10-26 16:47:21 -07:00
parent 6e99823252
commit 19e19d89e4
97 changed files with 22820 additions and 10377 deletions
--- a/alliance_auth/settings.py
+++ b/alliance_auth/settings.py
@@ -10,7 +10,10 @@ https://docs.djangoproject.com/en/1.6/ref/settings/

 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
+
 import djcelery
+
+
 djcelery.setup_loader()
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))

@@ -154,7 +157,7 @@ STATIC_URL = '/static/'
 DEFAULT_ALLIANCE_GROUP = 'AllianceMember'

 # ALLIANCE INFO
-ALLIANCE_ID = '0'
+ALLIANCE_ID = '99001336'
 ALLIANCE_NAME = 'Somealliance'

 # Forum URL
@@ -167,7 +170,7 @@ JABBER_SERVER = "someadddress.com"
 OPENFIRE_ADDRESS = "http://someaddress.com:9090/"
 OPENFIRE_SECRET_KEY = "somekey"

-BROADCAST_USER = "broadcast@"+JABBER_URL
+BROADCAST_USER = "broadcast@" + JABBER_URL
 BROADCAST_USER_PASSWORD = "somepassword"

 # Mumble settings
--- a/alliance_auth/urls.py
+++ b/alliance_auth/urls.py
@@ -1,72 +1,96 @@
 from django.conf.urls import patterns, include, url

 from django.contrib import admin
+
 admin.autodiscover()

 urlpatterns = patterns('',

-    # Admin urls
-    url(r'^admin/', include(admin.site.urls)),
+                       # Admin urls
+                       url(r'^admin/', include(admin.site.urls)),

-    # Index
-    url(r'^$', 'portal.views.index_view', name='auth_index'),
+                       # Index
+                       url(r'^$', 'portal.views.index_view', name='auth_index'),

-    # Authentication Urls
-    url(r'^login_user/', 'authentication.views.login_user', name='auth_login_user'),
-    url(r'^logout_user/', 'authentication.views.logout_user', name='auth_logout_user'),
-    url(r'^register_user/', 'registration.views.register_user_view', name='auth_register_user'),
+                       # Authentication Urls
+                       url(r'^login_user/', 'authentication.views.login_user', name='auth_login_user'),
+                       url(r'^logout_user/', 'authentication.views.logout_user', name='auth_logout_user'),
+                       url(r'^register_user/', 'registration.views.register_user_view', name='auth_register_user'),

-    url(r'^user/password/$', 'django.contrib.auth.views.password_change', name='password_change'),
-    url(r'^user/password/done/$', 'django.contrib.auth.views.password_change_done', name='password_change_done'),
-    url(r'^user/password/reset/$', 'django.contrib.auth.views.password_reset', name='password_reset'),
-    url(r'^user/password/password/reset/done/$', 'django.contrib.auth.views.password_reset_done', name='password_reset_done'),
-    url(r'^user/password/reset/complete/$', 'django.contrib.auth.views.password_reset_complete', name='password_reset_complete'),
-    url(r'^user/password/reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm', name='password_reset_confirm'),
+                       url(r'^user/password/$', 'django.contrib.auth.views.password_change', name='password_change'),
+                       url(r'^user/password/done/$', 'django.contrib.auth.views.password_change_done',
+                           name='password_change_done'),
+                       url(r'^user/password/reset/$', 'django.contrib.auth.views.password_reset',
+                           name='password_reset'),
+                       url(r'^user/password/password/reset/done/$', 'django.contrib.auth.views.password_reset_done',
+                           name='password_reset_done'),
+                       url(r'^user/password/reset/complete/$', 'django.contrib.auth.views.password_reset_complete',
+                           name='password_reset_complete'),
+                       url(r'^user/password/reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
+                           'django.contrib.auth.views.password_reset_confirm', name='password_reset_confirm'),

-    # Portal Urls
-    url(r'^dashboard/$', 'portal.views.dashboard_view', name='auth_dashboard'),
-    url(r'^help/$', 'portal.views.help_view', name='auth_help'),
+                       # Portal Urls
+                       url(r'^dashboard/$', 'portal.views.dashboard_view', name='auth_dashboard'),
+                       url(r'^help/$', 'portal.views.help_view', name='auth_help'),

-    # Eveonline Urls
-    url(r'^add_api_key/', 'eveonline.views.add_api_key', name='auth_add_api_key'),
-    url(r'^api_key_management/', 'eveonline.views.api_key_management_view', name='auth_api_key_management'),
-    url(r'^delete_api_pair/(\w+)/$', 'eveonline.views.api_key_removal', name='auth_api_key_removal'),
-    url(r'^characters/', 'eveonline.views.characters_view', name='auth_characters'),
-    url(r'^main_character_change/(\w+)/$', 'eveonline.views.main_character_change', name='auth_main_character_change'),
+                       # Eveonline Urls
+                       url(r'^add_api_key/', 'eveonline.views.add_api_key', name='auth_add_api_key'),
+                       url(r'^api_key_management/', 'eveonline.views.api_key_management_view',
+                           name='auth_api_key_management'),
+                       url(r'^delete_api_pair/(\w+)/$', 'eveonline.views.api_key_removal', name='auth_api_key_removal'),
+                       url(r'^characters/', 'eveonline.views.characters_view', name='auth_characters'),
+                       url(r'^main_character_change/(\w+)/$', 'eveonline.views.main_character_change',
+                           name='auth_main_character_change'),

-    # Group management
-    url(r'^groups/', 'groupmanagement.views.groups_view', name='auth_groups'),
-    url(r'^group/management/', 'groupmanagement.views.group_management', name='auth_group_management'),
-    url(r'^group/request_add/(\w+)', 'groupmanagement.views.group_request_add', name='auth_group_request_add'),
-    url(r'^group/request/accept/(\w+)', 'groupmanagement.views.group_accept_request', name='auth_group_accept_request'),
-    url(r'^group/request/reject/(\w+)', 'groupmanagement.views.group_reject_request', name='auth_group_reject_request'),
+                       # Group management
+                       url(r'^groups/', 'groupmanagement.views.groups_view', name='auth_groups'),
+                       url(r'^group/management/', 'groupmanagement.views.group_management',
+                           name='auth_group_management'),
+                       url(r'^group/request_add/(\w+)', 'groupmanagement.views.group_request_add',
+                           name='auth_group_request_add'),
+                       url(r'^group/request/accept/(\w+)', 'groupmanagement.views.group_accept_request',
+                           name='auth_group_accept_request'),
+                       url(r'^group/request/reject/(\w+)', 'groupmanagement.views.group_reject_request',
+                           name='auth_group_reject_request'),

-    url(r'^group/request_leave/(\w+)', 'groupmanagement.views.group_request_leave', name='auth_group_request_leave'),
-    url(r'group/leave_request/accept/(\w+)', 'groupmanagement.views.group_leave_accept_request',
-        name='auth_group_leave_accept_request'),
-    url(r'^group/leave_request/reject/(\w+)', 'groupmanagement.views.group_leave_reject_request',
-        name='auth_group_leave_reject_request'),
+                       url(r'^group/request_leave/(\w+)', 'groupmanagement.views.group_request_leave',
+                           name='auth_group_request_leave'),
+                       url(r'group/leave_request/accept/(\w+)', 'groupmanagement.views.group_leave_accept_request',
+                           name='auth_group_leave_accept_request'),
+                       url(r'^group/leave_request/reject/(\w+)', 'groupmanagement.views.group_leave_reject_request',
+                           name='auth_group_leave_reject_request'),

-    # Service Urls
-    url(r'^services/', 'services.views.services_view', name='auth_services'),
-    url(r'^serivces/jabber_broadcast/$', 'services.views.jabber_broadcast_view', name='auth_jabber_broadcast_view'),
+                       # HR Application Management
+                       url(r'^hr_application_management/', 'hrapplications.views.hr_application_management_view',
+                           name="auth_hrapplications_view"),
+                       url(r'^hr_application_create/', 'hrapplications.views.hr_application_create_view',
+                           name="auth_hrapplication_create_view"),

-    # 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'),
+                       # Service Urls
+                       url(r'^services/', 'services.views.services_view', name='auth_services'),
+                       url(r'^serivces/jabber_broadcast/$', 'services.views.jabber_broadcast_view',
+                           name='auth_jabber_broadcast_view'),

-    # Jabber Service Control
-    url(r'^activate_jabber/$', 'services.views.activate_jabber', name='auth_activate_jabber'),
-    url(r'^deactivate_jabber/$', 'services.views.deactivate_jabber', name='auth_deactivate_jabber'),
-    url(r'^reset_jabber_password/$', 'services.views.reset_jabber_password', name='auth_reset_jabber_password'),
+                       # 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'),

-    # 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'),
+                       # Jabber Service Control
+                       url(r'^activate_jabber/$', 'services.views.activate_jabber', name='auth_activate_jabber'),
+                       url(r'^deactivate_jabber/$', 'services.views.deactivate_jabber', name='auth_deactivate_jabber'),
+                       url(r'^reset_jabber_password/$', 'services.views.reset_jabber_password',
+                           name='auth_reset_jabber_password'),

-    # Tools
-    url(r'^tool/fleet_formatter_tool/$', 'services.views.fleet_formatter_view', name='auth_fleet_format_tool_view'),
+                       # 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'),
+
+                       # Tools
+                       url(r'^tool/fleet_formatter_tool/$', 'services.views.fleet_formatter_view',
+                           name='auth_fleet_format_tool_view'),

 )
--- a/alliance_auth/wsgi.py
+++ b/alliance_auth/wsgi.py
@@ -8,7 +8,9 @@ https://docs.djangoproject.com/en/1.6/howto/deployment/wsgi/
 """

 import os
+
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "alliance_auth.settings")

 from django.core.wsgi import get_wsgi_application
+
 application = get_wsgi_application()