Correct path and upgrade documentation

5 files changed, 22 insertions, 10 deletions

diff --git a/apache/apache-wsgi.conf b/apache/apache-wsgi.conf
index 9ff7024..bd6ea55 100644
--- a/apache/apache-wsgi.conf
+++ b/apache/apache-wsgi.conf
@@ -3,7 +3,8 @@
   WSGIDaemonProcess chimere processes=2 maximum-requests=500 threads=1
   WSGIProcessGroup chimere
   WSGIScriptAlias / /var/local/chimere/chimere/apache/django.wsgi
-  Alias /static  "/var/local/chimere/chimere/static"
+  Alias /static  "/var/local/chimere/example_project/static"
+  Alias /media  "/var/local/chimere/example_project/media"
   Alias /admin-media  "/usr/lib/python2.7/dist-packages/django/contrib/admin/media/"
   Alias /tinymce "/usr/share/tinymce/www"
   <Directory "/usr/share/tinymce/www/">
diff --git a/chimere/templates/chimere/blocks/categories.html b/chimere/templates/chimere/blocks/categories.html
index 94e947f..5ba89fc 100644
--- a/chimere/templates/chimere/blocks/categories.html
+++ b/chimere/templates/chimere/blocks/categories.html
@@ -11,7 +11,7 @@
             <li id='li_sub_{{sub_category.id}}'>
                 <input type='checkbox' name='category_{{sub_category.id}}' id='category_{{sub_category.id}}'{% if sub_category.selected %} checked='checked'{% endif %}/>
                 <label for='category_{{sub_category.id}}'>
-                    <img alt='{{ sub_category.name }}' src='{{ STATIC_URL }}{{sub_category.icon.image}}'/>
+                    <img alt='{{ sub_category.name }}' src='{{ MEDIA_URL }}{{sub_category.icon.image}}'/>
                     {% trans sub_category.name %}
                 </label>
                 <img id="zoom_to_subcategory_{{sub_category.id}}" class="zoom_image zoom_to_subcategory" alt='{% trans "Zoom to" %} {{sub_category.name}}' src='{{ STATIC_URL }}chimere/img/zoom.png' />
diff --git a/docs/install.rst b/docs/install.rst
index 4b8ae63..aae008e 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -133,7 +133,6 @@ the more relevant fields are given below (at least check them)::
     * SERVER_URL: root of the web address of Chimère
     * EXTRA_URL: suffix to the web address of Chimère
     * EMAIL_HOST: smtp of an email server to send emails
-    * STATIC_URL: url to static files
     * TINYMCE_URL: url to tinymce path (default is appropriate
       for a Debian installation with tinymce activated)
     * JQUERY_JS_URLS: list of Jquery and Jquery-ui urls (default is appropriate
@@ -155,11 +154,23 @@ the more relevant fields are given below (at least check them)::
     * ROOT_URLCONF: url configuration for your project something like:
       'mychimere_project.urls'
 
+Manage media path permission::
+
+    cd $INSTALL_PATH/chimere/mychimere_project
+    sudo chown -R user:www-data media
+    sudo chmod -R g+w media
+
+Regroup static files in one path::
+
+    cd $INSTALL_PATH/chimere/mychimere_project
+    ./manage.py collectstatic
+
 Compiling languages
 *******************
 
 If your language is available in the locale directory of chimere, you will just
-need to get it compiled. This can be done with (here, "de" stands for german. Replace it with the appropriate language code)::
+need to get it compiled. This can be done with (here, "fr" stands for french).
+Replace it with the appropriate language code)::
 
     cd $INSTALL_PATH/chimere/mychimere_project
     ./manage.py compilemessages -l fr
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index 0597113..7c6eed7 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -88,7 +88,7 @@ Upgrade to version 2.0
 **********************
 
  - Add to the settings.py a STATIC_URL variable by default set to '/static/' (be
-careful to change MEDIA_URL if it is already set to '/static/').
+   careful to change MEDIA_URL if it is already set to '/static/').
 
  - Add the detail of TEMPLATE_CONTEXT_PROCESSORS (see settings.py.example)
 
diff --git a/example_project/settings.py.example b/example_project/settings.py.example
index 6da66e1..bbe100b 100644
--- a/example_project/settings.py.example
+++ b/example_project/settings.py.example
@@ -11,7 +11,7 @@ SERVER_URL = 'http://www.mydomain.com/'
 EXTRA_URL = 'chimere/'
 BASE_URL = SERVER_URL + EXTRA_URL
 EMAIL_HOST = 'localhost'
-STATIC_URL = '/' + EXTRA_URL + 'staticfiles/'
+STATIC_URL = '/' + EXTRA_URL + 'static/'
 STATIC_ROOT = ROOT_PATH + 'static/'
 
 TINYMCE_URL = '/tinymce/'
@@ -55,10 +55,10 @@ CHIMERE_CSS_AREAS = True
 # the database
 CHIMERE_DAYS_BEFORE_EVENT = 30
 
-CHIMERE_ICON_WIDTH = 34
-CHIMERE_ICON_HEIGHT = 38
-CHIMERE_ICON_OFFSET_X = -17
-CHIMERE_ICON_OFFSET_Y = -38
+CHIMERE_ICON_WIDTH = 21
+CHIMERE_ICON_HEIGHT = 25
+CHIMERE_ICON_OFFSET_X = -10
+CHIMERE_ICON_OFFSET_Y = -25
 
 # default id category to check on the map
 CHIMERE_DEFAULT_CATEGORIES = [1]