From 0f19d9572350fecfdc9cd8d6728ade9a944af634 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Sat, 14 Nov 2015 09:58:22 +0000 Subject: [PATCH 01/12] Corrected nested loop in run_corp_update --- celerytask/tasks.py | 80 ++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/celerytask/tasks.py b/celerytask/tasks.py index 8c7f8717..db78f88b 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -367,23 +367,19 @@ def run_corp_update(): blue_info['ticker'], blue_info['members']['current'], True, blue_alliance) - # 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) - else: - EveManager.update_alliance_info(all_alliance_api_info['id'], - all_alliance_api_info['executor_id'], - all_alliance_api_info['member_count'], False) + # 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) else: EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], @@ -392,38 +388,42 @@ def run_corp_update(): 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'], + all_alliance_api_info['member_count'], False) - # 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']) + # 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 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) - else: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, - False) + 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: - 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) + 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) else: EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) + else: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) # Remove irrelevent corp and alliance models # Check the corps From b36890ea9b74e8186a4ba1dffb6c3987fb1fe7fe Mon Sep 17 00:00:00 2001 From: Adarnof Date: Thu, 19 Nov 2015 05:35:39 +0000 Subject: [PATCH 02/12] Moved alliance/corp blue status update logic within block verifying corp standings exist --- celerytask/tasks.py | 80 ++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/celerytask/tasks.py b/celerytask/tasks.py index db78f88b..8c7f8717 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -367,19 +367,23 @@ def run_corp_update(): blue_info['ticker'], blue_info['members']['current'], True, blue_alliance) - # 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) + # 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) + 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'], @@ -388,42 +392,38 @@ def run_corp_update(): 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'], - all_alliance_api_info['member_count'], False) - # 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']) + # 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 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) # Remove irrelevent corp and alliance models # Check the corps From f3d2a9cca5c797033b6d260e4aac551b0b29e63b Mon Sep 17 00:00:00 2001 From: Adarnof Date: Tue, 24 Nov 2015 02:45:36 +0000 Subject: [PATCH 03/12] Added logic to check if corp or alliance exists Prevents errors in celery task from prevention execution Addresses issues #68 and #93 --- celerytask/tasks.py | 78 +++++++++++++++------------- services/managers/eve_api_manager.py | 35 +++++++++++++ 2 files changed, 78 insertions(+), 35 deletions(-) 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/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 From 745a5ceca82ffa7178d3fda9ff733c97286d3050 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Tue, 24 Nov 2015 05:10:53 +0000 Subject: [PATCH 04/12] Added empty directories for custom templates and images Added template directories to settings.py to be searched first Addresses issue #99 --- alliance_auth/settings.py.example | 2 ++ custom_static/.gitignore | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 custom_static/.gitignore diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example index 26fcd0b5..1154de71 100755 --- a/alliance_auth/settings.py.example +++ b/alliance_auth/settings.py.example @@ -122,10 +122,12 @@ TEMPLATE_CONTEXT_PROCESSORS = ( ) TEMPLATE_DIRS = ( + 'custom_templates', 'templates', ) STATICFILES_DIRS = ( + 'custom_static', 'static', ) diff --git a/custom_static/.gitignore b/custom_static/.gitignore new file mode 100644 index 00000000..5e7d2734 --- /dev/null +++ b/custom_static/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore From 59af53537fe0435bf3b4f57c176c1b244282cc18 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Tue, 24 Nov 2015 05:14:06 +0000 Subject: [PATCH 05/12] Includes a directory I forgot in my last commit. Oops. --- custom_templates/.gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 custom_templates/.gitignore diff --git a/custom_templates/.gitignore b/custom_templates/.gitignore new file mode 100644 index 00000000..b0407719 --- /dev/null +++ b/custom_templates/.gitignore @@ -0,0 +1,4 @@ +#Ignore everything in this directory +* +# Except this file +!.gitignore From b669fafad64cf94aaf94d20fcf2d9a32e92f7992 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Tue, 24 Nov 2015 05:18:15 +0000 Subject: [PATCH 06/12] Added a basic readme to explain how to use custom directories. --- custom_static/.gitignore | 1 + custom_static/README.md | 7 +++++++ custom_templates/.gitignore | 1 + custom_templates/README.md | 7 +++++++ 4 files changed, 16 insertions(+) create mode 100644 custom_static/README.md create mode 100644 custom_templates/README.md diff --git a/custom_static/.gitignore b/custom_static/.gitignore index 5e7d2734..e15381a8 100644 --- a/custom_static/.gitignore +++ b/custom_static/.gitignore @@ -2,3 +2,4 @@ * # Except this file !.gitignore +!README.md diff --git a/custom_static/README.md b/custom_static/README.md new file mode 100644 index 00000000..a07eaf1e --- /dev/null +++ b/custom_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: + +custom_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/custom_templates/.gitignore b/custom_templates/.gitignore index b0407719..1d9c3463 100644 --- a/custom_templates/.gitignore +++ b/custom_templates/.gitignore @@ -2,3 +2,4 @@ * # Except this file !.gitignore +!README.md diff --git a/custom_templates/README.md b/custom_templates/README.md new file mode 100644 index 00000000..0dca78f4 --- /dev/null +++ b/custom_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: + +custom_templates/public/index.html + +This directory will get searched first, then fall back to the defaults. From acc320a695265a7308b1a3640b0293f13cb336db Mon Sep 17 00:00:00 2001 From: Adarnof Date: Tue, 24 Nov 2015 05:52:22 +0000 Subject: [PATCH 07/12] Relocated custom folders to a friendlier customization folder with appropriate readme --- alliance_auth/settings.py.example | 4 ++-- customization/README.md | 7 +++++++ customization/static/.gitignore | 5 +++++ customization/static/README.md | 7 +++++++ customization/templates/.gitignore | 5 +++++ customization/templates/README.md | 7 +++++++ 6 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 customization/README.md create mode 100644 customization/static/.gitignore create mode 100644 customization/static/README.md create mode 100644 customization/templates/.gitignore create mode 100644 customization/templates/README.md diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example index 1154de71..1f1b50e3 100755 --- a/alliance_auth/settings.py.example +++ b/alliance_auth/settings.py.example @@ -122,12 +122,12 @@ TEMPLATE_CONTEXT_PROCESSORS = ( ) TEMPLATE_DIRS = ( - 'custom_templates', + 'customization/templates', 'templates', ) STATICFILES_DIRS = ( - 'custom_static', + 'customization/static', '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. From db9439e468af97c7e6f0f581ce575dc744ad30c9 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Tue, 24 Nov 2015 05:54:33 +0000 Subject: [PATCH 08/12] Removed old custom directories. --- custom_static/.gitignore | 5 ----- custom_static/README.md | 7 ------- custom_templates/.gitignore | 5 ----- custom_templates/README.md | 7 ------- 4 files changed, 24 deletions(-) delete mode 100644 custom_static/.gitignore delete mode 100644 custom_static/README.md delete mode 100644 custom_templates/.gitignore delete mode 100644 custom_templates/README.md diff --git a/custom_static/.gitignore b/custom_static/.gitignore deleted file mode 100644 index e15381a8..00000000 --- a/custom_static/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Ignore everything in this directory -* -# Except this file -!.gitignore -!README.md diff --git a/custom_static/README.md b/custom_static/README.md deleted file mode 100644 index a07eaf1e..00000000 --- a/custom_static/README.md +++ /dev/null @@ -1,7 +0,0 @@ -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: - -custom_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/custom_templates/.gitignore b/custom_templates/.gitignore deleted file mode 100644 index 1d9c3463..00000000 --- a/custom_templates/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -#Ignore everything in this directory -* -# Except this file -!.gitignore -!README.md diff --git a/custom_templates/README.md b/custom_templates/README.md deleted file mode 100644 index 0dca78f4..00000000 --- a/custom_templates/README.md +++ /dev/null @@ -1,7 +0,0 @@ -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: - -custom_templates/public/index.html - -This directory will get searched first, then fall back to the defaults. From 1d1d4f6851fde2f90f81fbd2ceb3d6bf4d311f03 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Tue, 24 Nov 2015 05:55:48 +0000 Subject: [PATCH 09/12] Added missing gitignore --- customization/.gitignore | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 customization/.gitignore 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 From 0607ad9bdeb26a9bdab67d6f55bba9bf8724749b Mon Sep 17 00:00:00 2001 From: Adarnof Date: Tue, 24 Nov 2015 05:58:52 +0000 Subject: [PATCH 10/12] Added a placeholder logo. --- static/img/index_images/logo.png | Bin 0 -> 7184 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 static/img/index_images/logo.png diff --git a/static/img/index_images/logo.png b/static/img/index_images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..b33ad850c3e8b5c97484850d1c07d9c9408f9a79 GIT binary patch literal 7184 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 literal 0 HcmV?d00001 From cf8d5b748b63c8acc70e595169754f95a1a1a018 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Tue, 24 Nov 2015 23:20:50 +0000 Subject: [PATCH 11/12] Moved staticfiles to stock/static Added STATIC_ROOT to enable collection of staticfiles Ignored static/ directory so changes by end user go untracked Now required python manage.py collectstatic during install procedure --- .gitignore | 3 +++ alliance_auth/settings.py.example | 3 ++- static/.gitignore | 2 ++ {static => stock/static}/admin/css/base.css | 0 {static => stock/static}/admin/css/changelists.css | 0 {static => stock/static}/admin/css/dashboard.css | 0 {static => stock/static}/admin/css/forms.css | 0 {static => stock/static}/admin/css/ie.css | 0 {static => stock/static}/admin/css/login.css | 0 {static => stock/static}/admin/css/rtl.css | 0 {static => stock/static}/admin/css/widgets.css | 0 .../static}/admin/img/changelist-bg.gif | Bin .../static}/admin/img/changelist-bg_rtl.gif | Bin {static => stock/static}/admin/img/chooser-bg.gif | Bin .../static}/admin/img/chooser_stacked-bg.gif | Bin .../static}/admin/img/default-bg-reverse.gif | Bin {static => stock/static}/admin/img/default-bg.gif | Bin .../static}/admin/img/deleted-overlay.gif | Bin .../static}/admin/img/gis/move_vertex_off.png | Bin .../static}/admin/img/gis/move_vertex_on.png | Bin {static => stock/static}/admin/img/icon-no.gif | Bin {static => stock/static}/admin/img/icon-unknown.gif | Bin {static => stock/static}/admin/img/icon-yes.gif | Bin {static => stock/static}/admin/img/icon_addlink.gif | Bin {static => stock/static}/admin/img/icon_alert.gif | Bin .../static}/admin/img/icon_calendar.gif | Bin .../static}/admin/img/icon_changelink.gif | Bin {static => stock/static}/admin/img/icon_clock.gif | Bin .../static}/admin/img/icon_deletelink.gif | Bin {static => stock/static}/admin/img/icon_error.gif | Bin .../static}/admin/img/icon_searchbox.png | Bin {static => stock/static}/admin/img/icon_success.gif | Bin .../static}/admin/img/inline-delete-8bit.png | Bin .../static}/admin/img/inline-delete.png | Bin .../static}/admin/img/inline-restore-8bit.png | Bin .../static}/admin/img/inline-restore.png | Bin .../static}/admin/img/inline-splitter-bg.gif | Bin .../static}/admin/img/nav-bg-grabber.gif | Bin .../static}/admin/img/nav-bg-reverse.gif | Bin .../static}/admin/img/nav-bg-selected.gif | Bin {static => stock/static}/admin/img/nav-bg.gif | Bin .../static}/admin/img/selector-icons.gif | Bin .../static}/admin/img/selector-search.gif | Bin .../static}/admin/img/sorting-icons.gif | Bin {static => stock/static}/admin/img/tool-left.gif | Bin .../static}/admin/img/tool-left_over.gif | Bin {static => stock/static}/admin/img/tool-right.gif | Bin .../static}/admin/img/tool-right_over.gif | Bin {static => stock/static}/admin/img/tooltag-add.gif | Bin .../static}/admin/img/tooltag-add_over.gif | Bin .../static}/admin/img/tooltag-arrowright.gif | Bin .../static}/admin/img/tooltag-arrowright_over.gif | Bin .../static}/admin/js/LICENSE-JQUERY.txt | 0 {static => stock/static}/admin/js/SelectBox.js | 0 {static => stock/static}/admin/js/SelectFilter2.js | 0 {static => stock/static}/admin/js/actions.js | 0 {static => stock/static}/admin/js/actions.min.js | 0 .../static}/admin/js/admin/DateTimeShortcuts.js | 0 .../static}/admin/js/admin/RelatedObjectLookups.js | 0 {static => stock/static}/admin/js/calendar.js | 0 {static => stock/static}/admin/js/collapse.js | 0 {static => stock/static}/admin/js/collapse.min.js | 0 {static => stock/static}/admin/js/core.js | 0 {static => stock/static}/admin/js/inlines.js | 0 {static => stock/static}/admin/js/inlines.min.js | 0 {static => stock/static}/admin/js/jquery.init.js | 0 {static => stock/static}/admin/js/jquery.js | 0 {static => stock/static}/admin/js/jquery.min.js | 0 {static => stock/static}/admin/js/prepopulate.js | 0 .../static}/admin/js/prepopulate.min.js | 0 {static => stock/static}/admin/js/timeparse.js | 0 {static => stock/static}/admin/js/urlify.js | 0 .../static}/css/bootstrap-theme.min.css | 0 {static => stock/static}/css/bootstrap.min.css | 0 {static => stock/static}/css/font-awesome.min.css | 0 .../static}/css/jquery.datetimepicker.css | 0 {static => stock/static}/css/sb-admin-2.css | 0 {static => stock/static}/fonts/FontAwesome.otf | Bin .../static}/fonts/fontawesome-webfont.eot | Bin .../static}/fonts/fontawesome-webfont.svg | 0 .../static}/fonts/fontawesome-webfont.ttf | Bin .../static}/fonts/fontawesome-webfont.woff | Bin .../static}/fonts/glyphicons-halflings-regular.eot | Bin .../static}/fonts/glyphicons-halflings-regular.svg | 0 .../static}/fonts/glyphicons-halflings-regular.ttf | Bin .../static}/fonts/glyphicons-halflings-regular.woff | Bin {static => stock/static}/img/index_images/auth.png | Bin .../static}/img/index_images/forums.png | Bin .../static}/img/index_images/index_bg.jpg | Bin .../static}/img/index_images/index_blank_bg.jpg | Bin .../static}/img/index_images/killboard.png | Bin {static => stock/static}/img/index_images/logo.png | Bin {static => stock/static}/img/index_images/media.png | Bin {static => stock/static}/js/bootstrap.min.js | 0 {static => stock/static}/js/countdown.js | 0 {static => stock/static}/js/dateformat.js | 0 .../static}/js/jquery.datetimepicker.js | 0 {static => stock/static}/js/jquery.min.js | 0 98 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 static/.gitignore rename {static => stock/static}/admin/css/base.css (100%) rename {static => stock/static}/admin/css/changelists.css (100%) rename {static => stock/static}/admin/css/dashboard.css (100%) rename {static => stock/static}/admin/css/forms.css (100%) rename {static => stock/static}/admin/css/ie.css (100%) rename {static => stock/static}/admin/css/login.css (100%) rename {static => stock/static}/admin/css/rtl.css (100%) rename {static => stock/static}/admin/css/widgets.css (100%) rename {static => stock/static}/admin/img/changelist-bg.gif (100%) rename {static => stock/static}/admin/img/changelist-bg_rtl.gif (100%) rename {static => stock/static}/admin/img/chooser-bg.gif (100%) rename {static => stock/static}/admin/img/chooser_stacked-bg.gif (100%) rename {static => stock/static}/admin/img/default-bg-reverse.gif (100%) rename {static => stock/static}/admin/img/default-bg.gif (100%) rename {static => stock/static}/admin/img/deleted-overlay.gif (100%) rename {static => stock/static}/admin/img/gis/move_vertex_off.png (100%) rename {static => stock/static}/admin/img/gis/move_vertex_on.png (100%) rename {static => stock/static}/admin/img/icon-no.gif (100%) rename {static => stock/static}/admin/img/icon-unknown.gif (100%) rename {static => stock/static}/admin/img/icon-yes.gif (100%) rename {static => stock/static}/admin/img/icon_addlink.gif (100%) rename {static => stock/static}/admin/img/icon_alert.gif (100%) rename {static => stock/static}/admin/img/icon_calendar.gif (100%) rename {static => stock/static}/admin/img/icon_changelink.gif (100%) rename {static => stock/static}/admin/img/icon_clock.gif (100%) rename {static => stock/static}/admin/img/icon_deletelink.gif (100%) rename {static => stock/static}/admin/img/icon_error.gif (100%) rename {static => stock/static}/admin/img/icon_searchbox.png (100%) rename {static => stock/static}/admin/img/icon_success.gif (100%) rename {static => stock/static}/admin/img/inline-delete-8bit.png (100%) rename {static => stock/static}/admin/img/inline-delete.png (100%) rename {static => stock/static}/admin/img/inline-restore-8bit.png (100%) rename {static => stock/static}/admin/img/inline-restore.png (100%) rename {static => stock/static}/admin/img/inline-splitter-bg.gif (100%) rename {static => stock/static}/admin/img/nav-bg-grabber.gif (100%) rename {static => stock/static}/admin/img/nav-bg-reverse.gif (100%) rename {static => stock/static}/admin/img/nav-bg-selected.gif (100%) rename {static => stock/static}/admin/img/nav-bg.gif (100%) rename {static => stock/static}/admin/img/selector-icons.gif (100%) rename {static => stock/static}/admin/img/selector-search.gif (100%) rename {static => stock/static}/admin/img/sorting-icons.gif (100%) rename {static => stock/static}/admin/img/tool-left.gif (100%) rename {static => stock/static}/admin/img/tool-left_over.gif (100%) rename {static => stock/static}/admin/img/tool-right.gif (100%) rename {static => stock/static}/admin/img/tool-right_over.gif (100%) rename {static => stock/static}/admin/img/tooltag-add.gif (100%) rename {static => stock/static}/admin/img/tooltag-add_over.gif (100%) rename {static => stock/static}/admin/img/tooltag-arrowright.gif (100%) rename {static => stock/static}/admin/img/tooltag-arrowright_over.gif (100%) rename {static => stock/static}/admin/js/LICENSE-JQUERY.txt (100%) rename {static => stock/static}/admin/js/SelectBox.js (100%) rename {static => stock/static}/admin/js/SelectFilter2.js (100%) rename {static => stock/static}/admin/js/actions.js (100%) rename {static => stock/static}/admin/js/actions.min.js (100%) rename {static => stock/static}/admin/js/admin/DateTimeShortcuts.js (100%) rename {static => stock/static}/admin/js/admin/RelatedObjectLookups.js (100%) rename {static => stock/static}/admin/js/calendar.js (100%) rename {static => stock/static}/admin/js/collapse.js (100%) rename {static => stock/static}/admin/js/collapse.min.js (100%) rename {static => stock/static}/admin/js/core.js (100%) rename {static => stock/static}/admin/js/inlines.js (100%) rename {static => stock/static}/admin/js/inlines.min.js (100%) rename {static => stock/static}/admin/js/jquery.init.js (100%) rename {static => stock/static}/admin/js/jquery.js (100%) rename {static => stock/static}/admin/js/jquery.min.js (100%) rename {static => stock/static}/admin/js/prepopulate.js (100%) rename {static => stock/static}/admin/js/prepopulate.min.js (100%) rename {static => stock/static}/admin/js/timeparse.js (100%) rename {static => stock/static}/admin/js/urlify.js (100%) rename {static => stock/static}/css/bootstrap-theme.min.css (100%) rename {static => stock/static}/css/bootstrap.min.css (100%) rename {static => stock/static}/css/font-awesome.min.css (100%) rename {static => stock/static}/css/jquery.datetimepicker.css (100%) rename {static => stock/static}/css/sb-admin-2.css (100%) rename {static => stock/static}/fonts/FontAwesome.otf (100%) rename {static => stock/static}/fonts/fontawesome-webfont.eot (100%) rename {static => stock/static}/fonts/fontawesome-webfont.svg (100%) rename {static => stock/static}/fonts/fontawesome-webfont.ttf (100%) rename {static => stock/static}/fonts/fontawesome-webfont.woff (100%) rename {static => stock/static}/fonts/glyphicons-halflings-regular.eot (100%) rename {static => stock/static}/fonts/glyphicons-halflings-regular.svg (100%) rename {static => stock/static}/fonts/glyphicons-halflings-regular.ttf (100%) rename {static => stock/static}/fonts/glyphicons-halflings-regular.woff (100%) rename {static => stock/static}/img/index_images/auth.png (100%) rename {static => stock/static}/img/index_images/forums.png (100%) rename {static => stock/static}/img/index_images/index_bg.jpg (100%) rename {static => stock/static}/img/index_images/index_blank_bg.jpg (100%) rename {static => stock/static}/img/index_images/killboard.png (100%) rename {static => stock/static}/img/index_images/logo.png (100%) rename {static => stock/static}/img/index_images/media.png (100%) rename {static => stock/static}/js/bootstrap.min.js (100%) rename {static => stock/static}/js/countdown.js (100%) rename {static => stock/static}/js/dateformat.js (100%) rename {static => stock/static}/js/jquery.datetimepicker.js (100%) rename {static => stock/static}/js/jquery.min.js (100%) 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 1f1b50e3..cdc106bc 100755 --- a/alliance_auth/settings.py.example +++ b/alliance_auth/settings.py.example @@ -128,7 +128,7 @@ TEMPLATE_DIRS = ( STATICFILES_DIRS = ( 'customization/static', - 'static', + 'stock/static', ) LOGIN_URL = '/login_user/' @@ -149,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/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/static/img/index_images/logo.png b/stock/static/img/index_images/logo.png similarity index 100% rename from static/img/index_images/logo.png rename to stock/static/img/index_images/logo.png 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 From db7b6265e51f9561973df11e56b2c9ef3fe954b1 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Tue, 24 Nov 2015 23:26:05 +0000 Subject: [PATCH 12/12] Moved templates to stock folder for uniformity. Updated settings.py.example to reflect this. --- alliance_auth/settings.py.example | 2 +- {templates => stock/templates}/public/base.html | 0 {templates => stock/templates}/public/index.html | 0 {templates => stock/templates}/public/login.html | 0 {templates => stock/templates}/public/register.html | 0 {templates => stock/templates}/registered/addapikey.html | 0 {templates => stock/templates}/registered/addtimer.html | 0 {templates => stock/templates}/registered/apikeymanagment.html | 0 {templates => stock/templates}/registered/characters.html | 0 {templates => stock/templates}/registered/corpstats.html | 0 {templates => stock/templates}/registered/dashboard.html | 0 {templates => stock/templates}/registered/fleetfits.html | 0 .../templates}/registered/fleetfits.html.example | 0 .../templates}/registered/fleetformattertool.html | 0 {templates => stock/templates}/registered/groupmanagement.html | 0 {templates => stock/templates}/registered/groups.html | 0 {templates => stock/templates}/registered/help.html | 0 .../templates}/registered/hrapplicationmanagement.html | 0 .../templates}/registered/hrapplicationsearchview.html | 0 .../templates}/registered/hrapplicationview.html | 0 .../templates}/registered/hrcreateapplication.html | 0 {templates => stock/templates}/registered/jabberbroadcast.html | 0 {templates => stock/templates}/registered/services.html | 0 {templates => stock/templates}/registered/srpfleetadd.html | 0 {templates => stock/templates}/registered/srpfleetdata.html | 0 {templates => stock/templates}/registered/srpfleetrequest.html | 0 .../templates}/registered/srpfleetrequestamount.html | 0 {templates => stock/templates}/registered/srpfleetupdate.html | 0 {templates => stock/templates}/registered/srpmanagement.html | 0 {templates => stock/templates}/registered/timermanagement.html | 0 .../templates}/registration/password_change_done.html | 0 .../templates}/registration/password_change_form.html | 0 .../templates}/registration/password_reset_complete.html | 0 .../templates}/registration/password_reset_confirm.html | 0 .../templates}/registration/password_reset_done.html | 0 .../templates}/registration/password_reset_email.html | 0 .../templates}/registration/password_reset_form.html | 0 37 files changed, 1 insertion(+), 1 deletion(-) rename {templates => stock/templates}/public/base.html (100%) rename {templates => stock/templates}/public/index.html (100%) rename {templates => stock/templates}/public/login.html (100%) rename {templates => stock/templates}/public/register.html (100%) rename {templates => stock/templates}/registered/addapikey.html (100%) rename {templates => stock/templates}/registered/addtimer.html (100%) rename {templates => stock/templates}/registered/apikeymanagment.html (100%) rename {templates => stock/templates}/registered/characters.html (100%) rename {templates => stock/templates}/registered/corpstats.html (100%) rename {templates => stock/templates}/registered/dashboard.html (100%) rename {templates => stock/templates}/registered/fleetfits.html (100%) rename {templates => stock/templates}/registered/fleetfits.html.example (100%) rename {templates => stock/templates}/registered/fleetformattertool.html (100%) rename {templates => stock/templates}/registered/groupmanagement.html (100%) rename {templates => stock/templates}/registered/groups.html (100%) rename {templates => stock/templates}/registered/help.html (100%) rename {templates => stock/templates}/registered/hrapplicationmanagement.html (100%) rename {templates => stock/templates}/registered/hrapplicationsearchview.html (100%) rename {templates => stock/templates}/registered/hrapplicationview.html (100%) rename {templates => stock/templates}/registered/hrcreateapplication.html (100%) rename {templates => stock/templates}/registered/jabberbroadcast.html (100%) rename {templates => stock/templates}/registered/services.html (100%) rename {templates => stock/templates}/registered/srpfleetadd.html (100%) rename {templates => stock/templates}/registered/srpfleetdata.html (100%) rename {templates => stock/templates}/registered/srpfleetrequest.html (100%) rename {templates => stock/templates}/registered/srpfleetrequestamount.html (100%) rename {templates => stock/templates}/registered/srpfleetupdate.html (100%) rename {templates => stock/templates}/registered/srpmanagement.html (100%) rename {templates => stock/templates}/registered/timermanagement.html (100%) rename {templates => stock/templates}/registration/password_change_done.html (100%) rename {templates => stock/templates}/registration/password_change_form.html (100%) rename {templates => stock/templates}/registration/password_reset_complete.html (100%) rename {templates => stock/templates}/registration/password_reset_confirm.html (100%) rename {templates => stock/templates}/registration/password_reset_done.html (100%) rename {templates => stock/templates}/registration/password_reset_email.html (100%) rename {templates => stock/templates}/registration/password_reset_form.html (100%) diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example index cdc106bc..4cc67219 100755 --- a/alliance_auth/settings.py.example +++ b/alliance_auth/settings.py.example @@ -123,7 +123,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( TEMPLATE_DIRS = ( 'customization/templates', - 'templates', + 'stock/templates', ) STATICFILES_DIRS = ( 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