git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1f7e871)
enabled django-staticfiles and added logo
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 20 Nov 2012 16:17:16 +0000 (17:17 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 20 Nov 2012 16:17:16 +0000 (17:17 +0100)
devel/django-install.txt patch | blob | history
devel/push-debian.sh patch | blob | history
devel/server-loop.sh patch | blob | history
myslice/settings.py patch | blob | history
myslice/static/foo.html [new file with mode: 0644] patch | blob
myslice/static/myslice-logo.png [new file with mode: 0644] patch | blob
templates/auth.html patch | blob | history

diff --git a/devel/django-install.txt b/devel/django-install.txt
index 87896b8..3bb153f 100644 (file)
--- 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
 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 9279c86..f273ef0 100755 (executable)
--- a/devel/push-debian.sh
+++ b/devel/push-debian.sh
@@ -2,6 +2,6 @@
 DIR=$(dirname $0)
 ROOT=$(cd $DIR/.. ; pwd -P)
 
 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/
 
 rsync -a "$@" --exclude '*.sqlite3' $ROOT/ root@$host:/root/myslice/
diff --git a/devel/server-loop.sh b/devel/server-loop.sh
index e75ec32..9c9d727 100755 (executable)
--- a/devel/server-loop.sh
+++ b/devel/server-loop.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 DIRNAME=$(dirname $0)
 #!/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
 
 # 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 5eb1746..6c9d949 100644 (file)
--- 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/"
 # 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/"
 
 # 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 = (
 
 # Additional locations of static files
 STATICFILES_DIRS = (
@@ -127,6 +127,7 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
     '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:
     # 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 (file)
index 0000000..b35a004
--- /dev/null
+++ b/myslice/static/foo.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html> <head>
+<title>foo page</title>
+
+</head>
+
+<body>
+<h1></h1>
+
+
+
+<hr>
+<address></address>
+<!-- hhmts start -->Last modified: Tue Nov 20 16:09:35 CET 2012 <!-- hhmts end -->
+</body> </html>
diff --git a/myslice/static/myslice-logo.png b/myslice/static/myslice-logo.png
new file mode 100644 (file)
index 0000000..f6b5de4
Binary files /dev/null and b/myslice/static/myslice-logo.png differ
diff --git a/templates/auth.html b/templates/auth.html
index 6fe7d44..eda158b 100644 (file)
--- a/templates/auth.html
+++ b/templates/auth.html
@@ -12,6 +12,7 @@ body{
 </head>
 <body>
        {{ state }}
 </head>
 <body>
        {{ state }}
+          <a href="/" alt="Home"><img class="logo" src="{{ STATIC_URL }}myslice-logo.png" alt="MySlice" /></a>
        <form action="/login/" method="post">
                {% csrf_token %}
                {% if next %}
        <form action="/login/" method="post">
                {% csrf_token %}
                {% if next %}
myslice (django)