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