Merge pull request #100 from Adarnof/custom
Add ability to preserve customization between pulls
3
.gitignore
vendored
@ -57,3 +57,6 @@ target/
|
||||
alliance_auth/settings.py
|
||||
*Thumbs.db
|
||||
nginx_config.txt
|
||||
|
||||
# custom staticfiles
|
||||
static/*
|
||||
|
@ -122,11 +122,13 @@ TEMPLATE_CONTEXT_PROCESSORS = (
|
||||
)
|
||||
|
||||
TEMPLATE_DIRS = (
|
||||
'templates',
|
||||
'customization/templates',
|
||||
'stock/templates',
|
||||
)
|
||||
|
||||
STATICFILES_DIRS = (
|
||||
'static',
|
||||
'customization/static',
|
||||
'stock/static',
|
||||
)
|
||||
|
||||
LOGIN_URL = '/login_user/'
|
||||
@ -147,6 +149,7 @@ USE_TZ = True
|
||||
# Static files (CSS, JavaScript, Images)
|
||||
# https://docs.djangoproject.com/en/1.6/howto/static-files/
|
||||
STATIC_URL = '/static/'
|
||||
STATIC_ROOT = '/home/allianceserver/allianceauth/static/'
|
||||
|
||||
#####################################################
|
||||
##
|
||||
|
7
customization/.gitignore
vendored
Normal file
@ -0,0 +1,7 @@
|
||||
#Ignore everything
|
||||
*
|
||||
#Except these
|
||||
!.gitignore
|
||||
!README.md
|
||||
!templates
|
||||
!static
|
7
customization/README.md
Normal file
@ -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.
|
5
customization/static/.gitignore
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
# Ignore everything in this directory
|
||||
*
|
||||
# Except this file
|
||||
!.gitignore
|
||||
!README.md
|
7
customization/static/README.md
Normal file
@ -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.
|
5
customization/templates/.gitignore
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
#Ignore everything in this directory
|
||||
*
|
||||
# Except this file
|
||||
!.gitignore
|
||||
!README.md
|
7
customization/templates/README.md
Normal file
@ -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.
|
2
static/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
*
|
||||
!.gitignore
|
Before Width: | Height: | Size: 58 B After Width: | Height: | Size: 58 B |
Before Width: | Height: | Size: 75 B After Width: | Height: | Size: 75 B |
Before Width: | Height: | Size: 199 B After Width: | Height: | Size: 199 B |
Before Width: | Height: | Size: 212 B After Width: | Height: | Size: 212 B |
Before Width: | Height: | Size: 843 B After Width: | Height: | Size: 843 B |
Before Width: | Height: | Size: 844 B After Width: | Height: | Size: 844 B |
Before Width: | Height: | Size: 45 B After Width: | Height: | Size: 45 B |
Before Width: | Height: | Size: 711 B After Width: | Height: | Size: 711 B |
Before Width: | Height: | Size: 506 B After Width: | Height: | Size: 506 B |
Before Width: | Height: | Size: 176 B After Width: | Height: | Size: 176 B |
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 130 B |
Before Width: | Height: | Size: 299 B After Width: | Height: | Size: 299 B |
Before Width: | Height: | Size: 119 B After Width: | Height: | Size: 119 B |
Before Width: | Height: | Size: 145 B After Width: | Height: | Size: 145 B |
Before Width: | Height: | Size: 192 B After Width: | Height: | Size: 192 B |
Before Width: | Height: | Size: 119 B After Width: | Height: | Size: 119 B |
Before Width: | Height: | Size: 390 B After Width: | Height: | Size: 390 B |
Before Width: | Height: | Size: 181 B After Width: | Height: | Size: 181 B |
Before Width: | Height: | Size: 319 B After Width: | Height: | Size: 319 B |
Before Width: | Height: | Size: 667 B After Width: | Height: | Size: 667 B |
Before Width: | Height: | Size: 341 B After Width: | Height: | Size: 341 B |
Before Width: | Height: | Size: 477 B After Width: | Height: | Size: 477 B |
Before Width: | Height: | Size: 781 B After Width: | Height: | Size: 781 B |
Before Width: | Height: | Size: 447 B After Width: | Height: | Size: 447 B |
Before Width: | Height: | Size: 623 B After Width: | Height: | Size: 623 B |
Before Width: | Height: | Size: 102 B After Width: | Height: | Size: 102 B |
Before Width: | Height: | Size: 116 B After Width: | Height: | Size: 116 B |
Before Width: | Height: | Size: 186 B After Width: | Height: | Size: 186 B |
Before Width: | Height: | Size: 265 B After Width: | Height: | Size: 265 B |
Before Width: | Height: | Size: 273 B After Width: | Height: | Size: 273 B |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 552 B After Width: | Height: | Size: 552 B |
Before Width: | Height: | Size: 369 B After Width: | Height: | Size: 369 B |
Before Width: | Height: | Size: 197 B After Width: | Height: | Size: 197 B |
Before Width: | Height: | Size: 203 B After Width: | Height: | Size: 203 B |
Before Width: | Height: | Size: 198 B After Width: | Height: | Size: 198 B |
Before Width: | Height: | Size: 200 B After Width: | Height: | Size: 200 B |
Before Width: | Height: | Size: 932 B After Width: | Height: | Size: 932 B |
Before Width: | Height: | Size: 336 B After Width: | Height: | Size: 336 B |
Before Width: | Height: | Size: 351 B After Width: | Height: | Size: 351 B |
Before Width: | Height: | Size: 354 B After Width: | Height: | Size: 354 B |
Before Width: | Height: | Size: 248 KiB After Width: | Height: | Size: 248 KiB |
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 62 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 351 KiB After Width: | Height: | Size: 351 KiB |
Before Width: | Height: | Size: 304 KiB After Width: | Height: | Size: 304 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
BIN
stock/static/img/index_images/logo.png
Normal file
After Width: | Height: | Size: 7.0 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |