From: Thierry Parmentelat Date: Tue, 20 Nov 2012 16:17:16 +0000 (+0100) Subject: enabled django-staticfiles and added logo X-Git-Tag: myslice-django-0.1-1~194 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=484b16eca194516c6a14ad1e000eeef24aa41fd6 enabled django-staticfiles and added logo --- 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 00000000..f6b5de4f Binary files /dev/null and b/myslice/static/myslice-logo.png differ 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 %}