Merge pull request #100 from Adarnof/custom

Add ability to preserve customization between pulls

.gitignore

@@ -57,3 +57,6 @@ target/
 alliance_auth/settings.py
 *Thumbs.db
 nginx_config.txt
+
+# custom staticfiles
+static/*

alliance_auth/settings.py.example

@@ -122,11 +122,13 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 )
 
 TEMPLATE_DIRS = (
-    'templates',
+    'customization/templates',
+    'stock/templates',
 )
 
 STATICFILES_DIRS = (
-    'static',
+    'customization/static',
+    'stock/static',
 )
 
 LOGIN_URL = '/login_user/'
@@ -147,6 +149,7 @@ USE_TZ = True
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.6/howto/static-files/
 STATIC_URL = '/static/'
+STATIC_ROOT = '/home/allianceserver/allianceauth/static/'
 
 #####################################################
 ##

customization/.gitignore

@@ -0,0 +1,7 @@
+#Ignore everything
+*
+#Except these
+!.gitignore
+!README.md
+!templates
+!static

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.

customization/static/.gitignore

@@ -0,0 +1,5 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
+!README.md

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.

customization/templates/.gitignore

@@ -0,0 +1,5 @@
+#Ignore everything in this directory
+*
+# Except this file
+!.gitignore
+!README.md

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.

static/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore