diff --git a/.gitignore b/.gitignore index 5e7f7823..111ee21b 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,6 @@ target/ alliance_auth/settings.py *Thumbs.db nginx_config.txt + +# custom staticfiles +static/* diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example index 26fcd0b5..4cc67219 100755 --- a/alliance_auth/settings.py.example +++ b/alliance_auth/settings.py.example @@ -122,11 +122,13 @@ TEMPLATE_CONTEXT_PROCESSORS = ( ) TEMPLATE_DIRS = ( - 'templates', + 'customization/templates', + 'stock/templates', ) STATICFILES_DIRS = ( - 'static', + 'customization/static', + 'stock/static', ) LOGIN_URL = '/login_user/' @@ -147,6 +149,7 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/1.6/howto/static-files/ STATIC_URL = '/static/' +STATIC_ROOT = '/home/allianceserver/allianceauth/static/' ##################################################### ## diff --git a/celerytask/tasks.py b/celerytask/tasks.py index db78f88b..bb8c4ffa 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -369,17 +369,22 @@ def run_corp_update(): # Update all allinace info's for all_alliance_info in EveManager.get_all_alliance_info(): - all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id) - if (not settings.IS_CORP and all_alliance_info.alliance_id == settings.ALLIANCE_ID): - EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], - all_alliance_api_info['member_count'], False) - elif standing_level in corp_standings: - if int(all_alliance_info.alliance_id) in corp_standings[standing_level]: - if int(corp_standings[standing_level][int(all_alliance_info.alliance_id)][ - 'standing']) >= settings.BLUE_STANDING: - EveManager.update_alliance_info(all_alliance_api_info['id'], - all_alliance_api_info['executor_id'], - all_alliance_api_info['member_count'], True) + if EveApiManager.check_if_alliance_exists(all_alliance_info.alliance_id): + all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id) + if (not settings.IS_CORP and all_alliance_info.alliance_id == settings.ALLIANCE_ID): + EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], + all_alliance_api_info['member_count'], False) + elif standing_level in corp_standings: + if int(all_alliance_info.alliance_id) in corp_standings[standing_level]: + if int(corp_standings[standing_level][int(all_alliance_info.alliance_id)][ + 'standing']) >= settings.BLUE_STANDING: + EveManager.update_alliance_info(all_alliance_api_info['id'], + all_alliance_api_info['executor_id'], + all_alliance_api_info['member_count'], True) + else: + EveManager.update_alliance_info(all_alliance_api_info['id'], + all_alliance_api_info['executor_id'], + all_alliance_api_info['member_count'], False) else: EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], @@ -389,41 +394,44 @@ def run_corp_update(): all_alliance_api_info['executor_id'], all_alliance_api_info['member_count'], False) else: - EveManager.update_alliance_info(all_alliance_api_info['id'], - all_alliance_api_info['executor_id'], - all_alliance_api_info['member_count'], False) + #alliance no longer exists + all_alliance_info.delete() # Update corp infos for all_corp_info in EveManager.get_all_corporation_info(): - alliance = None - corpinfo = EveApiManager.get_corporation_information(all_corp_info.corporation_id) - if corpinfo['alliance']['id'] is not None: - alliance = EveManager.get_alliance_info_by_id(corpinfo['alliance']['id']) + if EveApiManager.check_if_corp_exists(all_corp_info.corporation_id): + alliance = None + corpinfo = EveApiManager.get_corporation_information(all_corp_info.corporation_id) + if corpinfo['alliance']['id'] is not None: + alliance = EveManager.get_alliance_info_by_id(corpinfo['alliance']['id']) - if alliance is not None and all_corp_info.alliance is not None: + if alliance is not None and all_corp_info.alliance is not None: - if (not settings.IS_CORP) and (all_corp_info.alliance.alliance_id == settings.ALLIANCE_ID): - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False) - elif int(alliance.alliance_id) in corp_standings[standing_level]: - if int(corp_standings[standing_level][int(alliance.alliance_id)][ - 'standing']) >= settings.BLUE_STANDING: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, - True) + if (not settings.IS_CORP) and (all_corp_info.alliance.alliance_id == settings.ALLIANCE_ID): + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False) + elif int(alliance.alliance_id) in corp_standings[standing_level]: + if int(corp_standings[standing_level][int(alliance.alliance_id)][ + 'standing']) >= settings.BLUE_STANDING: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, + True) + else: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, + False) else: EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False) else: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, - False) - else: - if int(all_corp_info.corporation_id) in corp_standings[standing_level]: - if int(corp_standings[standing_level][int(all_corp_info.corporation_id)][ - 'standing']) >= settings.BLUE_STANDING: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True) + if int(all_corp_info.corporation_id) in corp_standings[standing_level]: + if int(corp_standings[standing_level][int(all_corp_info.corporation_id)][ + 'standing']) >= settings.BLUE_STANDING: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True) + else: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) else: EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) - else: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) + else: + #corp has closed + all_corp_info.delete() # Remove irrelevent corp and alliance models # Check the corps diff --git a/customization/.gitignore b/customization/.gitignore new file mode 100644 index 00000000..2120a1ca --- /dev/null +++ b/customization/.gitignore @@ -0,0 +1,7 @@ +#Ignore everything +* +#Except these +!.gitignore +!README.md +!templates +!static diff --git a/customization/README.md b/customization/README.md new file mode 100644 index 00000000..04749c5c --- /dev/null +++ b/customization/README.md @@ -0,0 +1,7 @@ +If you want to customize your site, place the custom files in the appropriate directories below. + +Place custom pages in the templates directory. + +Place custom images, css, etc in the static directory. + +Be sure to make folders are required to preserve the original file location. diff --git a/customization/static/.gitignore b/customization/static/.gitignore new file mode 100644 index 00000000..e15381a8 --- /dev/null +++ b/customization/static/.gitignore @@ -0,0 +1,5 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore +!README.md diff --git a/customization/static/README.md b/customization/static/README.md new file mode 100644 index 00000000..3edc5785 --- /dev/null +++ b/customization/static/README.md @@ -0,0 +1,7 @@ +Place your custom static files in this folder. Maintain the folder structure of the original static folder. + +For instance, if you have a custom background image for the index page, it would be located at: + +`customization/static/img/index_images/index_blank_bg.jpg` + +This directory will get searched first for the image, then fall back to the default. diff --git a/customization/templates/.gitignore b/customization/templates/.gitignore new file mode 100644 index 00000000..1d9c3463 --- /dev/null +++ b/customization/templates/.gitignore @@ -0,0 +1,5 @@ +#Ignore everything in this directory +* +# Except this file +!.gitignore +!README.md diff --git a/customization/templates/README.md b/customization/templates/README.md new file mode 100644 index 00000000..57cd34bc --- /dev/null +++ b/customization/templates/README.md @@ -0,0 +1,7 @@ +Place your custom templates in this folder. +Maintain the folder structure of the original templates folder. +For instance, if you have a custom index page, it would be located at: + +`customization/templates/public/index.html` + +This directory will get searched first, then fall back to the defaults. diff --git a/services/managers/eve_api_manager.py b/services/managers/eve_api_manager.py index bcba1e38..9c61455c 100644 --- a/services/managers/eve_api_manager.py +++ b/services/managers/eve_api_manager.py @@ -179,3 +179,38 @@ class EveApiManager(): return False return False + + @staticmethod + def check_if_alliance_exists(alliance_id): + try: + api = evelink.api.API() + eve = evelink.eve.EVE(api=api) + alliances = eve.alliances() + if int(alliance_id) in alliances[0]: + return True + else: + return False + except evelink.api.APIError as error: + print error + return False + except ValueError as error: + #attempts to catch error resulting from checking alliance_of nonetype models + print error + return False + return False + + @staticmethod + def check_if_corp_exists(corp_id): + try: + api = evelink.api.API() + corp = evelink.corp.Corp(api=api) + corpinfo = corp.corporation_sheet(corp_id=corp_id) + if corpinfo[0]['members']['current'] > 0: + return True + else: + return False + except evelink.api.APIError as error: + #could be smart and check for error code523 to verify error due to no corp instead of catch-all + print error + return False + return False diff --git a/static/.gitignore b/static/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/static/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/static/admin/css/base.css b/stock/static/admin/css/base.css similarity index 100% rename from static/admin/css/base.css rename to stock/static/admin/css/base.css diff --git a/static/admin/css/changelists.css b/stock/static/admin/css/changelists.css similarity index 100% rename from static/admin/css/changelists.css rename to stock/static/admin/css/changelists.css diff --git a/static/admin/css/dashboard.css b/stock/static/admin/css/dashboard.css similarity index 100% rename from static/admin/css/dashboard.css rename to stock/static/admin/css/dashboard.css diff --git a/static/admin/css/forms.css b/stock/static/admin/css/forms.css similarity index 100% rename from static/admin/css/forms.css rename to stock/static/admin/css/forms.css diff --git a/static/admin/css/ie.css b/stock/static/admin/css/ie.css similarity index 100% rename from static/admin/css/ie.css rename to stock/static/admin/css/ie.css diff --git a/static/admin/css/login.css b/stock/static/admin/css/login.css similarity index 100% rename from static/admin/css/login.css rename to stock/static/admin/css/login.css diff --git a/static/admin/css/rtl.css b/stock/static/admin/css/rtl.css similarity index 100% rename from static/admin/css/rtl.css rename to stock/static/admin/css/rtl.css diff --git a/static/admin/css/widgets.css b/stock/static/admin/css/widgets.css similarity index 100% rename from static/admin/css/widgets.css rename to stock/static/admin/css/widgets.css diff --git a/static/admin/img/changelist-bg.gif b/stock/static/admin/img/changelist-bg.gif similarity index 100% rename from static/admin/img/changelist-bg.gif rename to stock/static/admin/img/changelist-bg.gif diff --git a/static/admin/img/changelist-bg_rtl.gif b/stock/static/admin/img/changelist-bg_rtl.gif similarity index 100% rename from static/admin/img/changelist-bg_rtl.gif rename to stock/static/admin/img/changelist-bg_rtl.gif diff --git a/static/admin/img/chooser-bg.gif b/stock/static/admin/img/chooser-bg.gif similarity index 100% rename from static/admin/img/chooser-bg.gif rename to stock/static/admin/img/chooser-bg.gif diff --git a/static/admin/img/chooser_stacked-bg.gif b/stock/static/admin/img/chooser_stacked-bg.gif similarity index 100% rename from static/admin/img/chooser_stacked-bg.gif rename to stock/static/admin/img/chooser_stacked-bg.gif diff --git a/static/admin/img/default-bg-reverse.gif b/stock/static/admin/img/default-bg-reverse.gif similarity index 100% rename from static/admin/img/default-bg-reverse.gif rename to stock/static/admin/img/default-bg-reverse.gif diff --git a/static/admin/img/default-bg.gif b/stock/static/admin/img/default-bg.gif similarity index 100% rename from static/admin/img/default-bg.gif rename to stock/static/admin/img/default-bg.gif diff --git a/static/admin/img/deleted-overlay.gif b/stock/static/admin/img/deleted-overlay.gif similarity index 100% rename from static/admin/img/deleted-overlay.gif rename to stock/static/admin/img/deleted-overlay.gif diff --git a/static/admin/img/gis/move_vertex_off.png b/stock/static/admin/img/gis/move_vertex_off.png similarity index 100% rename from static/admin/img/gis/move_vertex_off.png rename to stock/static/admin/img/gis/move_vertex_off.png diff --git a/static/admin/img/gis/move_vertex_on.png b/stock/static/admin/img/gis/move_vertex_on.png similarity index 100% rename from static/admin/img/gis/move_vertex_on.png rename to stock/static/admin/img/gis/move_vertex_on.png diff --git a/static/admin/img/icon-no.gif b/stock/static/admin/img/icon-no.gif similarity index 100% rename from static/admin/img/icon-no.gif rename to stock/static/admin/img/icon-no.gif diff --git a/static/admin/img/icon-unknown.gif b/stock/static/admin/img/icon-unknown.gif similarity index 100% rename from static/admin/img/icon-unknown.gif rename to stock/static/admin/img/icon-unknown.gif diff --git a/static/admin/img/icon-yes.gif b/stock/static/admin/img/icon-yes.gif similarity index 100% rename from static/admin/img/icon-yes.gif rename to stock/static/admin/img/icon-yes.gif diff --git a/static/admin/img/icon_addlink.gif b/stock/static/admin/img/icon_addlink.gif similarity index 100% rename from static/admin/img/icon_addlink.gif rename to stock/static/admin/img/icon_addlink.gif diff --git a/static/admin/img/icon_alert.gif b/stock/static/admin/img/icon_alert.gif similarity index 100% rename from static/admin/img/icon_alert.gif rename to stock/static/admin/img/icon_alert.gif diff --git a/static/admin/img/icon_calendar.gif b/stock/static/admin/img/icon_calendar.gif similarity index 100% rename from static/admin/img/icon_calendar.gif rename to stock/static/admin/img/icon_calendar.gif diff --git a/static/admin/img/icon_changelink.gif b/stock/static/admin/img/icon_changelink.gif similarity index 100% rename from static/admin/img/icon_changelink.gif rename to stock/static/admin/img/icon_changelink.gif diff --git a/static/admin/img/icon_clock.gif b/stock/static/admin/img/icon_clock.gif similarity index 100% rename from static/admin/img/icon_clock.gif rename to stock/static/admin/img/icon_clock.gif diff --git a/static/admin/img/icon_deletelink.gif b/stock/static/admin/img/icon_deletelink.gif similarity index 100% rename from static/admin/img/icon_deletelink.gif rename to stock/static/admin/img/icon_deletelink.gif diff --git a/static/admin/img/icon_error.gif b/stock/static/admin/img/icon_error.gif similarity index 100% rename from static/admin/img/icon_error.gif rename to stock/static/admin/img/icon_error.gif diff --git a/static/admin/img/icon_searchbox.png b/stock/static/admin/img/icon_searchbox.png similarity index 100% rename from static/admin/img/icon_searchbox.png rename to stock/static/admin/img/icon_searchbox.png diff --git a/static/admin/img/icon_success.gif b/stock/static/admin/img/icon_success.gif similarity index 100% rename from static/admin/img/icon_success.gif rename to stock/static/admin/img/icon_success.gif diff --git a/static/admin/img/inline-delete-8bit.png b/stock/static/admin/img/inline-delete-8bit.png similarity index 100% rename from static/admin/img/inline-delete-8bit.png rename to stock/static/admin/img/inline-delete-8bit.png diff --git a/static/admin/img/inline-delete.png b/stock/static/admin/img/inline-delete.png similarity index 100% rename from static/admin/img/inline-delete.png rename to stock/static/admin/img/inline-delete.png diff --git a/static/admin/img/inline-restore-8bit.png b/stock/static/admin/img/inline-restore-8bit.png similarity index 100% rename from static/admin/img/inline-restore-8bit.png rename to stock/static/admin/img/inline-restore-8bit.png diff --git a/static/admin/img/inline-restore.png b/stock/static/admin/img/inline-restore.png similarity index 100% rename from static/admin/img/inline-restore.png rename to stock/static/admin/img/inline-restore.png diff --git a/static/admin/img/inline-splitter-bg.gif b/stock/static/admin/img/inline-splitter-bg.gif similarity index 100% rename from static/admin/img/inline-splitter-bg.gif rename to stock/static/admin/img/inline-splitter-bg.gif diff --git a/static/admin/img/nav-bg-grabber.gif b/stock/static/admin/img/nav-bg-grabber.gif similarity index 100% rename from static/admin/img/nav-bg-grabber.gif rename to stock/static/admin/img/nav-bg-grabber.gif diff --git a/static/admin/img/nav-bg-reverse.gif b/stock/static/admin/img/nav-bg-reverse.gif similarity index 100% rename from static/admin/img/nav-bg-reverse.gif rename to stock/static/admin/img/nav-bg-reverse.gif diff --git a/static/admin/img/nav-bg-selected.gif b/stock/static/admin/img/nav-bg-selected.gif similarity index 100% rename from static/admin/img/nav-bg-selected.gif rename to stock/static/admin/img/nav-bg-selected.gif diff --git a/static/admin/img/nav-bg.gif b/stock/static/admin/img/nav-bg.gif similarity index 100% rename from static/admin/img/nav-bg.gif rename to stock/static/admin/img/nav-bg.gif diff --git a/static/admin/img/selector-icons.gif b/stock/static/admin/img/selector-icons.gif similarity index 100% rename from static/admin/img/selector-icons.gif rename to stock/static/admin/img/selector-icons.gif diff --git a/static/admin/img/selector-search.gif b/stock/static/admin/img/selector-search.gif similarity index 100% rename from static/admin/img/selector-search.gif rename to stock/static/admin/img/selector-search.gif diff --git a/static/admin/img/sorting-icons.gif b/stock/static/admin/img/sorting-icons.gif similarity index 100% rename from static/admin/img/sorting-icons.gif rename to stock/static/admin/img/sorting-icons.gif diff --git a/static/admin/img/tool-left.gif b/stock/static/admin/img/tool-left.gif similarity index 100% rename from static/admin/img/tool-left.gif rename to stock/static/admin/img/tool-left.gif diff --git a/static/admin/img/tool-left_over.gif b/stock/static/admin/img/tool-left_over.gif similarity index 100% rename from static/admin/img/tool-left_over.gif rename to stock/static/admin/img/tool-left_over.gif diff --git a/static/admin/img/tool-right.gif b/stock/static/admin/img/tool-right.gif similarity index 100% rename from static/admin/img/tool-right.gif rename to stock/static/admin/img/tool-right.gif diff --git a/static/admin/img/tool-right_over.gif b/stock/static/admin/img/tool-right_over.gif similarity index 100% rename from static/admin/img/tool-right_over.gif rename to stock/static/admin/img/tool-right_over.gif diff --git a/static/admin/img/tooltag-add.gif b/stock/static/admin/img/tooltag-add.gif similarity index 100% rename from static/admin/img/tooltag-add.gif rename to stock/static/admin/img/tooltag-add.gif diff --git a/static/admin/img/tooltag-add_over.gif b/stock/static/admin/img/tooltag-add_over.gif similarity index 100% rename from static/admin/img/tooltag-add_over.gif rename to stock/static/admin/img/tooltag-add_over.gif diff --git a/static/admin/img/tooltag-arrowright.gif b/stock/static/admin/img/tooltag-arrowright.gif similarity index 100% rename from static/admin/img/tooltag-arrowright.gif rename to stock/static/admin/img/tooltag-arrowright.gif diff --git a/static/admin/img/tooltag-arrowright_over.gif b/stock/static/admin/img/tooltag-arrowright_over.gif similarity index 100% rename from static/admin/img/tooltag-arrowright_over.gif rename to stock/static/admin/img/tooltag-arrowright_over.gif diff --git a/static/admin/js/LICENSE-JQUERY.txt b/stock/static/admin/js/LICENSE-JQUERY.txt similarity index 100% rename from static/admin/js/LICENSE-JQUERY.txt rename to stock/static/admin/js/LICENSE-JQUERY.txt diff --git a/static/admin/js/SelectBox.js b/stock/static/admin/js/SelectBox.js similarity index 100% rename from static/admin/js/SelectBox.js rename to stock/static/admin/js/SelectBox.js diff --git a/static/admin/js/SelectFilter2.js b/stock/static/admin/js/SelectFilter2.js similarity index 100% rename from static/admin/js/SelectFilter2.js rename to stock/static/admin/js/SelectFilter2.js diff --git a/static/admin/js/actions.js b/stock/static/admin/js/actions.js similarity index 100% rename from static/admin/js/actions.js rename to stock/static/admin/js/actions.js diff --git a/static/admin/js/actions.min.js b/stock/static/admin/js/actions.min.js similarity index 100% rename from static/admin/js/actions.min.js rename to stock/static/admin/js/actions.min.js diff --git a/static/admin/js/admin/DateTimeShortcuts.js b/stock/static/admin/js/admin/DateTimeShortcuts.js similarity index 100% rename from static/admin/js/admin/DateTimeShortcuts.js rename to stock/static/admin/js/admin/DateTimeShortcuts.js diff --git a/static/admin/js/admin/RelatedObjectLookups.js b/stock/static/admin/js/admin/RelatedObjectLookups.js similarity index 100% rename from static/admin/js/admin/RelatedObjectLookups.js rename to stock/static/admin/js/admin/RelatedObjectLookups.js diff --git a/static/admin/js/calendar.js b/stock/static/admin/js/calendar.js similarity index 100% rename from static/admin/js/calendar.js rename to stock/static/admin/js/calendar.js diff --git a/static/admin/js/collapse.js b/stock/static/admin/js/collapse.js similarity index 100% rename from static/admin/js/collapse.js rename to stock/static/admin/js/collapse.js diff --git a/static/admin/js/collapse.min.js b/stock/static/admin/js/collapse.min.js similarity index 100% rename from static/admin/js/collapse.min.js rename to stock/static/admin/js/collapse.min.js diff --git a/static/admin/js/core.js b/stock/static/admin/js/core.js similarity index 100% rename from static/admin/js/core.js rename to stock/static/admin/js/core.js diff --git a/static/admin/js/inlines.js b/stock/static/admin/js/inlines.js similarity index 100% rename from static/admin/js/inlines.js rename to stock/static/admin/js/inlines.js diff --git a/static/admin/js/inlines.min.js b/stock/static/admin/js/inlines.min.js similarity index 100% rename from static/admin/js/inlines.min.js rename to stock/static/admin/js/inlines.min.js diff --git a/static/admin/js/jquery.init.js b/stock/static/admin/js/jquery.init.js similarity index 100% rename from static/admin/js/jquery.init.js rename to stock/static/admin/js/jquery.init.js diff --git a/static/admin/js/jquery.js b/stock/static/admin/js/jquery.js similarity index 100% rename from static/admin/js/jquery.js rename to stock/static/admin/js/jquery.js diff --git a/static/admin/js/jquery.min.js b/stock/static/admin/js/jquery.min.js similarity index 100% rename from static/admin/js/jquery.min.js rename to stock/static/admin/js/jquery.min.js diff --git a/static/admin/js/prepopulate.js b/stock/static/admin/js/prepopulate.js similarity index 100% rename from static/admin/js/prepopulate.js rename to stock/static/admin/js/prepopulate.js diff --git a/static/admin/js/prepopulate.min.js b/stock/static/admin/js/prepopulate.min.js similarity index 100% rename from static/admin/js/prepopulate.min.js rename to stock/static/admin/js/prepopulate.min.js diff --git a/static/admin/js/timeparse.js b/stock/static/admin/js/timeparse.js similarity index 100% rename from static/admin/js/timeparse.js rename to stock/static/admin/js/timeparse.js diff --git a/static/admin/js/urlify.js b/stock/static/admin/js/urlify.js similarity index 100% rename from static/admin/js/urlify.js rename to stock/static/admin/js/urlify.js diff --git a/static/css/bootstrap-theme.min.css b/stock/static/css/bootstrap-theme.min.css similarity index 100% rename from static/css/bootstrap-theme.min.css rename to stock/static/css/bootstrap-theme.min.css diff --git a/static/css/bootstrap.min.css b/stock/static/css/bootstrap.min.css similarity index 100% rename from static/css/bootstrap.min.css rename to stock/static/css/bootstrap.min.css diff --git a/static/css/font-awesome.min.css b/stock/static/css/font-awesome.min.css similarity index 100% rename from static/css/font-awesome.min.css rename to stock/static/css/font-awesome.min.css diff --git a/static/css/jquery.datetimepicker.css b/stock/static/css/jquery.datetimepicker.css similarity index 100% rename from static/css/jquery.datetimepicker.css rename to stock/static/css/jquery.datetimepicker.css diff --git a/static/css/sb-admin-2.css b/stock/static/css/sb-admin-2.css similarity index 100% rename from static/css/sb-admin-2.css rename to stock/static/css/sb-admin-2.css diff --git a/static/fonts/FontAwesome.otf b/stock/static/fonts/FontAwesome.otf similarity index 100% rename from static/fonts/FontAwesome.otf rename to stock/static/fonts/FontAwesome.otf diff --git a/static/fonts/fontawesome-webfont.eot b/stock/static/fonts/fontawesome-webfont.eot similarity index 100% rename from static/fonts/fontawesome-webfont.eot rename to stock/static/fonts/fontawesome-webfont.eot diff --git a/static/fonts/fontawesome-webfont.svg b/stock/static/fonts/fontawesome-webfont.svg similarity index 100% rename from static/fonts/fontawesome-webfont.svg rename to stock/static/fonts/fontawesome-webfont.svg diff --git a/static/fonts/fontawesome-webfont.ttf b/stock/static/fonts/fontawesome-webfont.ttf similarity index 100% rename from static/fonts/fontawesome-webfont.ttf rename to stock/static/fonts/fontawesome-webfont.ttf diff --git a/static/fonts/fontawesome-webfont.woff b/stock/static/fonts/fontawesome-webfont.woff similarity index 100% rename from static/fonts/fontawesome-webfont.woff rename to stock/static/fonts/fontawesome-webfont.woff diff --git a/static/fonts/glyphicons-halflings-regular.eot b/stock/static/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from static/fonts/glyphicons-halflings-regular.eot rename to stock/static/fonts/glyphicons-halflings-regular.eot diff --git a/static/fonts/glyphicons-halflings-regular.svg b/stock/static/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from static/fonts/glyphicons-halflings-regular.svg rename to stock/static/fonts/glyphicons-halflings-regular.svg diff --git a/static/fonts/glyphicons-halflings-regular.ttf b/stock/static/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from static/fonts/glyphicons-halflings-regular.ttf rename to stock/static/fonts/glyphicons-halflings-regular.ttf diff --git a/static/fonts/glyphicons-halflings-regular.woff b/stock/static/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from static/fonts/glyphicons-halflings-regular.woff rename to stock/static/fonts/glyphicons-halflings-regular.woff diff --git a/static/img/index_images/auth.png b/stock/static/img/index_images/auth.png similarity index 100% rename from static/img/index_images/auth.png rename to stock/static/img/index_images/auth.png diff --git a/static/img/index_images/forums.png b/stock/static/img/index_images/forums.png similarity index 100% rename from static/img/index_images/forums.png rename to stock/static/img/index_images/forums.png diff --git a/static/img/index_images/index_bg.jpg b/stock/static/img/index_images/index_bg.jpg similarity index 100% rename from static/img/index_images/index_bg.jpg rename to stock/static/img/index_images/index_bg.jpg diff --git a/static/img/index_images/index_blank_bg.jpg b/stock/static/img/index_images/index_blank_bg.jpg similarity index 100% rename from static/img/index_images/index_blank_bg.jpg rename to stock/static/img/index_images/index_blank_bg.jpg diff --git a/static/img/index_images/killboard.png b/stock/static/img/index_images/killboard.png similarity index 100% rename from static/img/index_images/killboard.png rename to stock/static/img/index_images/killboard.png diff --git a/stock/static/img/index_images/logo.png b/stock/static/img/index_images/logo.png new file mode 100644 index 00000000..b33ad850 Binary files /dev/null and b/stock/static/img/index_images/logo.png differ diff --git a/static/img/index_images/media.png b/stock/static/img/index_images/media.png similarity index 100% rename from static/img/index_images/media.png rename to stock/static/img/index_images/media.png diff --git a/static/js/bootstrap.min.js b/stock/static/js/bootstrap.min.js similarity index 100% rename from static/js/bootstrap.min.js rename to stock/static/js/bootstrap.min.js diff --git a/static/js/countdown.js b/stock/static/js/countdown.js similarity index 100% rename from static/js/countdown.js rename to stock/static/js/countdown.js diff --git a/static/js/dateformat.js b/stock/static/js/dateformat.js similarity index 100% rename from static/js/dateformat.js rename to stock/static/js/dateformat.js diff --git a/static/js/jquery.datetimepicker.js b/stock/static/js/jquery.datetimepicker.js similarity index 100% rename from static/js/jquery.datetimepicker.js rename to stock/static/js/jquery.datetimepicker.js diff --git a/static/js/jquery.min.js b/stock/static/js/jquery.min.js similarity index 100% rename from static/js/jquery.min.js rename to stock/static/js/jquery.min.js diff --git a/templates/public/base.html b/stock/templates/public/base.html similarity index 100% rename from templates/public/base.html rename to stock/templates/public/base.html diff --git a/templates/public/index.html b/stock/templates/public/index.html similarity index 100% rename from templates/public/index.html rename to stock/templates/public/index.html diff --git a/templates/public/login.html b/stock/templates/public/login.html similarity index 100% rename from templates/public/login.html rename to stock/templates/public/login.html diff --git a/templates/public/register.html b/stock/templates/public/register.html similarity index 100% rename from templates/public/register.html rename to stock/templates/public/register.html diff --git a/templates/registered/addapikey.html b/stock/templates/registered/addapikey.html similarity index 100% rename from templates/registered/addapikey.html rename to stock/templates/registered/addapikey.html diff --git a/templates/registered/addtimer.html b/stock/templates/registered/addtimer.html similarity index 100% rename from templates/registered/addtimer.html rename to stock/templates/registered/addtimer.html diff --git a/templates/registered/apikeymanagment.html b/stock/templates/registered/apikeymanagment.html similarity index 100% rename from templates/registered/apikeymanagment.html rename to stock/templates/registered/apikeymanagment.html diff --git a/templates/registered/characters.html b/stock/templates/registered/characters.html similarity index 100% rename from templates/registered/characters.html rename to stock/templates/registered/characters.html diff --git a/templates/registered/corpstats.html b/stock/templates/registered/corpstats.html similarity index 100% rename from templates/registered/corpstats.html rename to stock/templates/registered/corpstats.html diff --git a/templates/registered/dashboard.html b/stock/templates/registered/dashboard.html similarity index 100% rename from templates/registered/dashboard.html rename to stock/templates/registered/dashboard.html diff --git a/templates/registered/fleetfits.html b/stock/templates/registered/fleetfits.html similarity index 100% rename from templates/registered/fleetfits.html rename to stock/templates/registered/fleetfits.html diff --git a/templates/registered/fleetfits.html.example b/stock/templates/registered/fleetfits.html.example similarity index 100% rename from templates/registered/fleetfits.html.example rename to stock/templates/registered/fleetfits.html.example diff --git a/templates/registered/fleetformattertool.html b/stock/templates/registered/fleetformattertool.html similarity index 100% rename from templates/registered/fleetformattertool.html rename to stock/templates/registered/fleetformattertool.html diff --git a/templates/registered/groupmanagement.html b/stock/templates/registered/groupmanagement.html similarity index 100% rename from templates/registered/groupmanagement.html rename to stock/templates/registered/groupmanagement.html diff --git a/templates/registered/groups.html b/stock/templates/registered/groups.html similarity index 100% rename from templates/registered/groups.html rename to stock/templates/registered/groups.html diff --git a/templates/registered/help.html b/stock/templates/registered/help.html similarity index 100% rename from templates/registered/help.html rename to stock/templates/registered/help.html diff --git a/templates/registered/hrapplicationmanagement.html b/stock/templates/registered/hrapplicationmanagement.html similarity index 100% rename from templates/registered/hrapplicationmanagement.html rename to stock/templates/registered/hrapplicationmanagement.html diff --git a/templates/registered/hrapplicationsearchview.html b/stock/templates/registered/hrapplicationsearchview.html similarity index 100% rename from templates/registered/hrapplicationsearchview.html rename to stock/templates/registered/hrapplicationsearchview.html diff --git a/templates/registered/hrapplicationview.html b/stock/templates/registered/hrapplicationview.html similarity index 100% rename from templates/registered/hrapplicationview.html rename to stock/templates/registered/hrapplicationview.html diff --git a/templates/registered/hrcreateapplication.html b/stock/templates/registered/hrcreateapplication.html similarity index 100% rename from templates/registered/hrcreateapplication.html rename to stock/templates/registered/hrcreateapplication.html diff --git a/templates/registered/jabberbroadcast.html b/stock/templates/registered/jabberbroadcast.html similarity index 100% rename from templates/registered/jabberbroadcast.html rename to stock/templates/registered/jabberbroadcast.html diff --git a/templates/registered/services.html b/stock/templates/registered/services.html similarity index 100% rename from templates/registered/services.html rename to stock/templates/registered/services.html diff --git a/templates/registered/srpfleetadd.html b/stock/templates/registered/srpfleetadd.html similarity index 100% rename from templates/registered/srpfleetadd.html rename to stock/templates/registered/srpfleetadd.html diff --git a/templates/registered/srpfleetdata.html b/stock/templates/registered/srpfleetdata.html similarity index 100% rename from templates/registered/srpfleetdata.html rename to stock/templates/registered/srpfleetdata.html diff --git a/templates/registered/srpfleetrequest.html b/stock/templates/registered/srpfleetrequest.html similarity index 100% rename from templates/registered/srpfleetrequest.html rename to stock/templates/registered/srpfleetrequest.html diff --git a/templates/registered/srpfleetrequestamount.html b/stock/templates/registered/srpfleetrequestamount.html similarity index 100% rename from templates/registered/srpfleetrequestamount.html rename to stock/templates/registered/srpfleetrequestamount.html diff --git a/templates/registered/srpfleetupdate.html b/stock/templates/registered/srpfleetupdate.html similarity index 100% rename from templates/registered/srpfleetupdate.html rename to stock/templates/registered/srpfleetupdate.html diff --git a/templates/registered/srpmanagement.html b/stock/templates/registered/srpmanagement.html similarity index 100% rename from templates/registered/srpmanagement.html rename to stock/templates/registered/srpmanagement.html diff --git a/templates/registered/timermanagement.html b/stock/templates/registered/timermanagement.html similarity index 100% rename from templates/registered/timermanagement.html rename to stock/templates/registered/timermanagement.html diff --git a/templates/registration/password_change_done.html b/stock/templates/registration/password_change_done.html similarity index 100% rename from templates/registration/password_change_done.html rename to stock/templates/registration/password_change_done.html diff --git a/templates/registration/password_change_form.html b/stock/templates/registration/password_change_form.html similarity index 100% rename from templates/registration/password_change_form.html rename to stock/templates/registration/password_change_form.html diff --git a/templates/registration/password_reset_complete.html b/stock/templates/registration/password_reset_complete.html similarity index 100% rename from templates/registration/password_reset_complete.html rename to stock/templates/registration/password_reset_complete.html diff --git a/templates/registration/password_reset_confirm.html b/stock/templates/registration/password_reset_confirm.html similarity index 100% rename from templates/registration/password_reset_confirm.html rename to stock/templates/registration/password_reset_confirm.html diff --git a/templates/registration/password_reset_done.html b/stock/templates/registration/password_reset_done.html similarity index 100% rename from templates/registration/password_reset_done.html rename to stock/templates/registration/password_reset_done.html diff --git a/templates/registration/password_reset_email.html b/stock/templates/registration/password_reset_email.html similarity index 100% rename from templates/registration/password_reset_email.html rename to stock/templates/registration/password_reset_email.html diff --git a/templates/registration/password_reset_form.html b/stock/templates/registration/password_reset_form.html similarity index 100% rename from templates/registration/password_reset_form.html rename to stock/templates/registration/password_reset_form.html