From 484b16eca194516c6a14ad1e000eeef24aa41fd6 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 20 Nov 2012 17:17:16 +0100 Subject: [PATCH] enabled django-staticfiles and added logo --- devel/django-install.txt | 4 ++++ devel/push-debian.sh | 2 +- devel/server-loop.sh | 2 +- myslice/settings.py | 5 +++-- myslice/static/foo.html | 15 +++++++++++++++ myslice/static/myslice-logo.png | Bin 0 -> 4595 bytes templates/auth.html | 1 + 7 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 myslice/static/foo.html create mode 100644 myslice/static/myslice-logo.png diff --git a/devel/django-install.txt b/devel/django-install.txt index 87896b8d..3bb153ff 100644 --- a/devel/django-install.txt +++ b/devel/django-install.txt @@ -38,3 +38,7 @@ I found it useful to also do the following at some point The thing is I enter my debian box from a MAC through ssh, and the MAC has this set: LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 and I was getting a lot of warnings relating to that anyways + +==================== postinstall +. manage.py syncdb +. manage.py collectstatic --noinput diff --git a/devel/push-debian.sh b/devel/push-debian.sh index 9279c86f..f273ef03 100755 --- a/devel/push-debian.sh +++ b/devel/push-debian.sh @@ -2,6 +2,6 @@ DIR=$(dirname $0) ROOT=$(cd $DIR/.. ; pwd -P) -host=debian03.pl.sophia.inria.fr +host=debian04.pl.sophia.inria.fr rsync -a "$@" --exclude '*.sqlite3' $ROOT/ root@$host:/root/myslice/ diff --git a/devel/server-loop.sh b/devel/server-loop.sh index e75ec328..9c9d7272 100755 --- a/devel/server-loop.sh +++ b/devel/server-loop.sh @@ -1,6 +1,6 @@ #!/bin/bash DIRNAME=$(dirname $0) -cd $DIRNAME +cd $DIRNAME/.. # default port : if hostname starts with z -> use 8080 ; otherwise take 80 hostname | grep -q '^z' && port=8080 || port=80 diff --git a/myslice/settings.py b/myslice/settings.py index 5eb17468..6c9d949c 100644 --- a/myslice/settings.py +++ b/myslice/settings.py @@ -67,11 +67,11 @@ MEDIA_URL = '' # Don't put anything in this directory yourself; store your static files # in apps' "static/" subdirectories and in STATICFILES_DIRS. # Example: "/home/media/media.lawrence.com/static/" -STATIC_ROOT = '' +STATIC_ROOT = os.path.join(ROOT,'all-static') # URL prefix for static files. # Example: "http://media.lawrence.com/static/" -STATIC_URL = '/static/' +STATIC_URL = '/all-static/' # Additional locations of static files STATICFILES_DIRS = ( @@ -127,6 +127,7 @@ INSTALLED_APPS = ( 'django.contrib.sites', 'django.contrib.messages', 'django.contrib.staticfiles', + 'myslice', # Uncomment the next line to enable the admin: # 'django.contrib.admin', # Uncomment the next line to enable admin documentation: diff --git a/myslice/static/foo.html b/myslice/static/foo.html new file mode 100644 index 00000000..b35a004d --- /dev/null +++ b/myslice/static/foo.html @@ -0,0 +1,15 @@ + + +foo page + + + + +

+ + + +
+
+Last modified: Tue Nov 20 16:09:35 CET 2012 + diff --git a/myslice/static/myslice-logo.png b/myslice/static/myslice-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f6b5de4fa3616f5c03b6da23a5210d4a703c5f03 GIT binary patch literal 4595 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 XS5_GK8TH^X005v(ZA==Cd=mc$Sv7>r literal 0 HcmV?d00001 diff --git a/templates/auth.html b/templates/auth.html index 6fe7d44b..eda158b6 100644 --- a/templates/auth.html +++ b/templates/auth.html @@ -12,6 +12,7 @@ body{ {{ state }} +
{% csrf_token %} {% if next %} -- 2.45.2