From d71d101fb8d65409741ce628ad0738f0ad8fb5f5 Mon Sep 17 00:00:00 2001 From: Jan Philipp Timme Date: Sun, 27 Jul 2014 11:05:01 +0200 Subject: [PATCH] [TASK] Adapt .gitignore to only ignore the static directory used to collect things. --- .gitignore | 3 ++- README.md | 18 +++++++++++++++++- frontend/static/images/logo.png | Bin 0 -> 8681 bytes frontend/templates/base.html | 7 ++----- 4 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 frontend/static/images/logo.png diff --git a/.gitignore b/.gitignore index af06b9a..6ceb9bf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ .pydevproject *.pyc citavi_mapper/private_settings.py -static + +static/ diff --git a/README.md b/README.md index a620735..fe5d78b 100644 --- a/README.md +++ b/README.md @@ -1 +1,17 @@ -Use pip install -r requirements.txt to install this application. +Installation +============ + +You may (or may not) want to use a virtualenv for this. + +> pip install -r requirements.txt + +Do not forget to create your private_settings.py! + +> cp private_settings.example.py private_settings.py +> vi private_settings.py # Enter your secrets and your database connection. + +Before using in production (or development), run this: + +> python manage.py collectstatic + +Static files will be collected in /static, use this in your webserver configuration for production. diff --git a/frontend/static/images/logo.png b/frontend/static/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..b3e43dc379fada85a4a14c05fb2c95c4e9d1e036 GIT binary patch literal 8681 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 literal 0 HcmV?d00001 diff --git a/frontend/templates/base.html b/frontend/templates/base.html index 296c193..4709f62 100644 --- a/frontend/templates/base.html +++ b/frontend/templates/base.html @@ -21,14 +21,11 @@ class="icon-bar"> - sasas - - -
+