fix doc, add meta to user profile

diff --git a/INSTALL.rst b/INSTALL.rst
index ea28b4a67711226051abd3191f8616dc5b5b68ad..c1d571bb6d8a9558338f5d53efba474198b91e5c 100644 (file)
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -43,9 +43,12 @@ Install the system dependencies
 
 
 Install Telemeta
-------------------
+-----------------------------
+
+PIP style (recommended)
+++++++++++++++++++++++++
 
-* The best is to use the python package tools (install MANY dependencies automatically)::
+We strongly advise you use the python package tool as it installs some good dependencies automatically::
 
     sudo aptitude install python-pip
     sudo pip install telemeta
@@ -54,38 +57,62 @@ Install Telemeta
 
     sudo easy_install telemeta
 
-* Downloading the latest tar archive at http://telemeta.org. Uncompress it and install. For example::
+From sources
++++++++++++++
+
+Download the latest tar archive at http://telemeta.org.
+
+Uncompress and install it. For example::
 
     tar xzf telemeta-1.0.tar.gz
     cd telemeta-1.0
     sudo python setup.py install
 
+Libraries
++++++++++++
 
-Install TimeSide
------------------
+All those modules have been automatically installed if you used one of the previous methods to install Telemeta.
+In this case only, you can PASS this stage.
+
+But, if you need to hack Telemeta without installing it (i.e. link it through your $PYTHONPATH), you need to install those libraries manually.
+
+TimeSide (web audio components)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The web audio components provided by the TimeSide module have been automatically installed if you used pip or setup.py to install Telemeta. In this case only, you can pass this stage.
+Install it using pip::
 
-Otherwise, you have to download and install it from source.
+    sudo pip install timeside
 
-So, download the last archive at :
+Or, download the last archive at :
 http://code.google.com/p/timeside/downloads/list
 
 Uncompress it and read README and INSTALL to install the dependencies
 and then the module.
 
+JSON-RPC server
+~~~~~~~~~~~~~~~~~~
 
-Install JSON-RPC server
-------------------------
+Install it using pip::
 
-The JSON module provided by django-json-rpc have been automatically installed if you used pip or setup.py to install Telemeta. In this case only, you can pass this stage.
+    sudo pip install django-json-rpc
 
-Otherwise, you have to download and install it from source::
+or, from source::
 
     git clone git://github.com/samuraisam/django-json-rpc.git
     cd django-json-rpc
     python setup.py install
 
+South (schema migration)
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Install it using pip::
+
+    sudo pip install south
+
+or, from source::
+
+    sudo easy_install South
+
 
 -------------------------
 Testing (sandbox)
@@ -135,6 +162,7 @@ Set the app lists as follow::
     'django.contrib.admin',
     'telemeta',
     'jsonrpc',
+    'south'
     )
 
 Set the following languages::
@@ -192,14 +220,6 @@ You can find an example for settings.py there::
     example/sandbox/settings.py
 
 
-Initialize the database
---------------------------
-
-This synchronizes the DB with the model::
-
-    python manage.py syncdb
-
-
 Configure your urls
 ----------------------
 
@@ -232,6 +252,15 @@ You can find an example for url.py there::
     example/sandbox/urls.py
 
 
+Initialize the database
+--------------------------
+
+This synchronizes the DB with the model::
+
+    ./manage.py syncdb
+    ./manage.py migrate telemeta
+
+
 Start the project
 --------------------
 

diff --git a/telemeta/models/system.py b/telemeta/models/system.py
index 33f9b4fea8b0710e0afc666654a46ffeaad6b63d..34a490aef0d1dd24a0aaf6542b43659e17516f4e 100644 (file)
--- a/telemeta/models/system.py
+++ b/telemeta/models/system.py
@@ -82,7 +82,9 @@ class UserProfile(django.db.models.Model):
 
     user            = ForeignKey(User, unique=True, required=True)
     institution     = CharField(_('Institution'))
+    departement     = CharField(_('Department'))
     function        = CharField(_('Function'))
+    attachment      = CharField(_('Attachment'))
     address         = TextField(_('Address'))
     telephone       = CharField(_('Telephone'))
     expiration_date = DateField(_('Expiration_date'))