Update of styles - Changing (again) the way details are displayed

git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@5 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864

10 files changed, 132 insertions, 62 deletions

diff --git a/initial_data.json b/initial_data.json
index e6261a2..2dd46b9 100644
--- a/initial_data.json
+++ b/initial_data.json
@@ -1 +1,2 @@
-[{"pk": 13, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 5}}, {"pk": 14, "model": "auth.permission", "fields": {"codename": "change_logentry", "name": "Can change log entry", "content_type": 5}}, {"pk": 15, "model": "auth.permission", "fields": {"codename": "delete_logentry", "name": "Can delete log entry", "content_type": 5}}, {"pk": 4, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": 2}}, {"pk": 10, "model": "auth.permission", "fields": {"codename": "add_message", "name": "Can add message", "content_type": 4}}, {"pk": 1, "model": "auth.permission", "fields": {"codename": "add_permission", "name": "Can add permission", "content_type": 1}}, {"pk": 7, "model": "auth.permission", "fields": {"codename": "add_user", "name": "Can add user", "content_type": 3}}, {"pk": 5, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": 2}}, {"pk": 11, "model": "auth.permission", "fields": {"codename": "change_message", "name": "Can change message", "content_type": 4}}, {"pk": 2, "model": "auth.permission", "fields": {"codename": "change_permission", "name": "Can change permission", "content_type": 1}}, {"pk": 8, "model": "auth.permission", "fields": {"codename": "change_user", "name": "Can change user", "content_type": 3}}, {"pk": 6, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 2}}, {"pk": 12, "model": "auth.permission", "fields": {"codename": "delete_message", "name": "Can delete message", "content_type": 4}}, {"pk": 3, "model": "auth.permission", "fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": 1}}, {"pk": 9, "model": "auth.permission", "fields": {"codename": "delete_user", "name": "Can delete user", "content_type": 3}}, {"pk": 16, "model": "auth.permission", "fields": {"codename": "add_contenttype", "name": "Can add content type", "content_type": 6}}, {"pk": 17, "model": "auth.permission", "fields": {"codename": "change_contenttype", "name": "Can change content type", "content_type": 6}}, {"pk": 18, "model": "auth.permission", "fields": {"codename": "delete_contenttype", "name": "Can delete content type", "content_type": 6}}, {"pk": 25, "model": "auth.permission", "fields": {"codename": "add_category", "name": "Can add category", "content_type": 9}}, {"pk": 28, "model": "auth.permission", "fields": {"codename": "add_icon", "name": "Can add icon", "content_type": 10}}, {"pk": 34, "model": "auth.permission", "fields": {"codename": "add_marker", "name": "Can add marker", "content_type": 12}}, {"pk": 40, "model": "auth.permission", "fields": {"codename": "add_property", "name": "Can add property", "content_type": 14}}, {"pk": 37, "model": "auth.permission", "fields": {"codename": "add_propertymodel", "name": "Can add property model", "content_type": 13}}, {"pk": 31, "model": "auth.permission", "fields": {"codename": "add_subcategory", "name": "Can add sub category", "content_type": 11}}, {"pk": 26, "model": "auth.permission", "fields": {"codename": "change_category", "name": "Can change category", "content_type": 9}}, {"pk": 29, "model": "auth.permission", "fields": {"codename": "change_icon", "name": "Can change icon", "content_type": 10}}, {"pk": 35, "model": "auth.permission", "fields": {"codename": "change_marker", "name": "Can change marker", "content_type": 12}}, {"pk": 41, "model": "auth.permission", "fields": {"codename": "change_property", "name": "Can change property", "content_type": 14}}, {"pk": 38, "model": "auth.permission", "fields": {"codename": "change_propertymodel", "name": "Can change property model", "content_type": 13}}, {"pk": 32, "model": "auth.permission", "fields": {"codename": "change_subcategory", "name": "Can change sub category", "content_type": 11}}, {"pk": 27, "model": "auth.permission", "fields": {"codename": "delete_category", "name": "Can delete category", "content_type": 9}}, {"pk": 30, "model": "auth.permission", "fields": {"codename": "delete_icon", "name": "Can delete icon", "content_type": 10}}, {"pk": 36, "model": "auth.permission", "fields": {"codename": "delete_marker", "name": "Can delete marker", "content_type": 12}}, {"pk": 42, "model": "auth.permission", "fields": {"codename": "delete_property", "name": "Can delete property", "content_type": 14}}, {"pk": 39, "model": "auth.permission", "fields": {"codename": "delete_propertymodel", "name": "Can delete property model", "content_type": 13}}, {"pk": 33, "model": "auth.permission", "fields": {"codename": "delete_subcategory", "name": "Can delete sub category", "content_type": 11}}, {"pk": 19, "model": "auth.permission", "fields": {"codename": "add_session", "name": "Can add session", "content_type": 7}}, {"pk": 20, "model": "auth.permission", "fields": {"codename": "change_session", "name": "Can change session", "content_type": 7}}, {"pk": 21, "model": "auth.permission", "fields": {"codename": "delete_session", "name": "Can delete session", "content_type": 7}}, {"pk": 22, "model": "auth.permission", "fields": {"codename": "add_site", "name": "Can add site", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": {"codename": "change_site", "name": "Can change site", "content_type": 8}}, {"pk": 24, "model": "auth.permission", "fields": {"codename": "delete_site", "name": "Can delete site", "content_type": 8}}, {"pk": 2, "model": "auth.group", "fields": {"name": "moderator", "permissions": [34, 35, 36]}}, {"pk": 1, "model": "auth.group", "fields": {"name": "administrator", "permissions": [7, 8, 9, 25, 28, 34, 31, 26, 29, 35, 32, 27, 30, 36, 33]}}, {"pk": 9, "model": "contenttypes.contenttype", "fields": {"model": "category", "name": "category", "app_label": "main"}}, {"pk": 6, "model": "contenttypes.contenttype", "fields": {"model": "contenttype", "name": "content type", "app_label": "contenttypes"}}, {"pk": 2, "model": "contenttypes.contenttype", "fields": {"model": "group", "name": "group", "app_label": "auth"}}, {"pk": 10, "model": "contenttypes.contenttype", "fields": {"model": "icon", "name": "icon", "app_label": "main"}}, {"pk": 5, "model": "contenttypes.contenttype", "fields": {"model": "logentry", "name": "log entry", "app_label": "admin"}}, {"pk": 12, "model": "contenttypes.contenttype", "fields": {"model": "marker", "name": "marker", "app_label": "main"}}, {"pk": 4, "model": "contenttypes.contenttype", "fields": {"model": "message", "name": "message", "app_label": "auth"}}, {"pk": 1, "model": "contenttypes.contenttype", "fields": {"model": "permission", "name": "permission", "app_label": "auth"}}, {"pk": 14, "model": "contenttypes.contenttype", "fields": {"model": "property", "name": "property", "app_label": "main"}}, {"pk": 13, "model": "contenttypes.contenttype", "fields": {"model": "propertymodel", "name": "property model", "app_label": "main"}}, {"pk": 7, "model": "contenttypes.contenttype", "fields": {"model": "session", "name": "session", "app_label": "sessions"}}, {"pk": 8, "model": "contenttypes.contenttype", "fields": {"model": "site", "name": "site", "app_label": "sites"}}, {"pk": 11, "model": "contenttypes.contenttype", "fields": {"model": "subcategory", "name": "sub category", "app_label": "main"}}, {"pk": 3, "model": "contenttypes.contenttype", "fields": {"model": "user", "name": "user", "app_label": "auth"}}]
+libgeos_c.so.1
+[{"pk": 13, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 5}}, {"pk": 14, "model": "auth.permission", "fields": {"codename": "change_logentry", "name": "Can change log entry", "content_type": 5}}, {"pk": 15, "model": "auth.permission", "fields": {"codename": "delete_logentry", "name": "Can delete log entry", "content_type": 5}}, {"pk": 4, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": 2}}, {"pk": 10, "model": "auth.permission", "fields": {"codename": "add_message", "name": "Can add message", "content_type": 4}}, {"pk": 1, "model": "auth.permission", "fields": {"codename": "add_permission", "name": "Can add permission", "content_type": 1}}, {"pk": 7, "model": "auth.permission", "fields": {"codename": "add_user", "name": "Can add user", "content_type": 3}}, {"pk": 5, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": 2}}, {"pk": 11, "model": "auth.permission", "fields": {"codename": "change_message", "name": "Can change message", "content_type": 4}}, {"pk": 2, "model": "auth.permission", "fields": {"codename": "change_permission", "name": "Can change permission", "content_type": 1}}, {"pk": 8, "model": "auth.permission", "fields": {"codename": "change_user", "name": "Can change user", "content_type": 3}}, {"pk": 6, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 2}}, {"pk": 12, "model": "auth.permission", "fields": {"codename": "delete_message", "name": "Can delete message", "content_type": 4}}, {"pk": 3, "model": "auth.permission", "fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": 1}}, {"pk": 9, "model": "auth.permission", "fields": {"codename": "delete_user", "name": "Can delete user", "content_type": 3}}, {"pk": 16, "model": "auth.permission", "fields": {"codename": "add_contenttype", "name": "Can add content type", "content_type": 6}}, {"pk": 17, "model": "auth.permission", "fields": {"codename": "change_contenttype", "name": "Can change content type", "content_type": 6}}, {"pk": 18, "model": "auth.permission", "fields": {"codename": "delete_contenttype", "name": "Can delete content type", "content_type": 6}}, {"pk": 28, "model": "auth.permission", "fields": {"codename": "add_category", "name": "Can add Category", "content_type": 10}}, {"pk": 31, "model": "auth.permission", "fields": {"codename": "add_icon", "name": "Can add Icon", "content_type": 11}}, {"pk": 37, "model": "auth.permission", "fields": {"codename": "add_marker", "name": "Can add Point of interest", "content_type": 13}}, {"pk": 25, "model": "auth.permission", "fields": {"codename": "add_news", "name": "Can add News", "content_type": 9}}, {"pk": 43, "model": "auth.permission", "fields": {"codename": "add_property", "name": "Can add Property", "content_type": 15}}, {"pk": 40, "model": "auth.permission", "fields": {"codename": "add_propertymodel", "name": "Can add Property model", "content_type": 14}}, {"pk": 34, "model": "auth.permission", "fields": {"codename": "add_subcategory", "name": "Can add Subcategory", "content_type": 12}}, {"pk": 29, "model": "auth.permission", "fields": {"codename": "change_category", "name": "Can change Category", "content_type": 10}}, {"pk": 32, "model": "auth.permission", "fields": {"codename": "change_icon", "name": "Can change Icon", "content_type": 11}}, {"pk": 38, "model": "auth.permission", "fields": {"codename": "change_marker", "name": "Can change Point of interest", "content_type": 13}}, {"pk": 26, "model": "auth.permission", "fields": {"codename": "change_news", "name": "Can change News", "content_type": 9}}, {"pk": 44, "model": "auth.permission", "fields": {"codename": "change_property", "name": "Can change Property", "content_type": 15}}, {"pk": 41, "model": "auth.permission", "fields": {"codename": "change_propertymodel", "name": "Can change Property model", "content_type": 14}}, {"pk": 35, "model": "auth.permission", "fields": {"codename": "change_subcategory", "name": "Can change Subcategory", "content_type": 12}}, {"pk": 30, "model": "auth.permission", "fields": {"codename": "delete_category", "name": "Can delete Category", "content_type": 10}}, {"pk": 33, "model": "auth.permission", "fields": {"codename": "delete_icon", "name": "Can delete Icon", "content_type": 11}}, {"pk": 39, "model": "auth.permission", "fields": {"codename": "delete_marker", "name": "Can delete Point of interest", "content_type": 13}}, {"pk": 27, "model": "auth.permission", "fields": {"codename": "delete_news", "name": "Can delete News", "content_type": 9}}, {"pk": 45, "model": "auth.permission", "fields": {"codename": "delete_property", "name": "Can delete Property", "content_type": 15}}, {"pk": 42, "model": "auth.permission", "fields": {"codename": "delete_propertymodel", "name": "Can delete Property model", "content_type": 14}}, {"pk": 36, "model": "auth.permission", "fields": {"codename": "delete_subcategory", "name": "Can delete Subcategory", "content_type": 12}}, {"pk": 19, "model": "auth.permission", "fields": {"codename": "add_session", "name": "Can add session", "content_type": 7}}, {"pk": 20, "model": "auth.permission", "fields": {"codename": "change_session", "name": "Can change session", "content_type": 7}}, {"pk": 21, "model": "auth.permission", "fields": {"codename": "delete_session", "name": "Can delete session", "content_type": 7}}, {"pk": 22, "model": "auth.permission", "fields": {"codename": "add_site", "name": "Can add site", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": {"codename": "change_site", "name": "Can change site", "content_type": 8}}, {"pk": 24, "model": "auth.permission", "fields": {"codename": "delete_site", "name": "Can delete site", "content_type": 8}}, {"pk": 1, "model": "auth.group", "fields": {"name": "moderator", "permissions": [37, 38, 39]}}, {"pk": 2, "model": "auth.group", "fields": {"name": "administrator", "permissions": [28, 31, 37, 25, 34, 29, 32, 38, 26, 35, 30, 33, 39, 27, 36]}}, {"pk": 1, "model": "auth.user", "fields": {"username": "admin", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": true, "last_login": "2008-11-24 19:46:47", "groups": [], "user_permissions": [], "password": "sha1$45760$a367dbdcb3de8966a1ff34621cabb12f354c8ac0", "email": "", "date_joined": "2008-11-24 19:43:35"}}, {"pk": 5, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-11-24 19:52:46", "object_repr": "admin", "object_id": "1", "change_message": "Modifi\u00e9 username.", "user": 1, "content_type": 3}}, {"pk": 4, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-11-24 19:52:04", "object_repr": "administrator", "object_id": "2", "change_message": "", "user": 1, "content_type": 2}}, {"pk": 3, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-11-24 19:50:31", "object_repr": "moderator", "object_id": "1", "change_message": "", "user": 1, "content_type": 2}}, {"pk": 2, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-11-24 19:48:40", "object_repr": "administrator", "object_id": "1", "change_message": "Modifi\u00e9 username.", "user": 1, "content_type": 3}}, {"pk": 1, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-11-24 19:48:14", "object_repr": "etienne", "object_id": "1", "change_message": "Modifi\u00e9 email.", "user": 1, "content_type": 3}}, {"pk": 10, "model": "contenttypes.contenttype", "fields": {"model": "category", "name": "Category", "app_label": "main"}}, {"pk": 6, "model": "contenttypes.contenttype", "fields": {"model": "contenttype", "name": "content type", "app_label": "contenttypes"}}, {"pk": 2, "model": "contenttypes.contenttype", "fields": {"model": "group", "name": "group", "app_label": "auth"}}, {"pk": 11, "model": "contenttypes.contenttype", "fields": {"model": "icon", "name": "Icon", "app_label": "main"}}, {"pk": 5, "model": "contenttypes.contenttype", "fields": {"model": "logentry", "name": "log entry", "app_label": "admin"}}, {"pk": 4, "model": "contenttypes.contenttype", "fields": {"model": "message", "name": "message", "app_label": "auth"}}, {"pk": 9, "model": "contenttypes.contenttype", "fields": {"model": "news", "name": "News", "app_label": "main"}}, {"pk": 1, "model": "contenttypes.contenttype", "fields": {"model": "permission", "name": "permission", "app_label": "auth"}}, {"pk": 13, "model": "contenttypes.contenttype", "fields": {"model": "marker", "name": "Point of interest", "app_label": "main"}}, {"pk": 15, "model": "contenttypes.contenttype", "fields": {"model": "property", "name": "Property", "app_label": "main"}}, {"pk": 14, "model": "contenttypes.contenttype", "fields": {"model": "propertymodel", "name": "Property model", "app_label": "main"}}, {"pk": 7, "model": "contenttypes.contenttype", "fields": {"model": "session", "name": "session", "app_label": "sessions"}}, {"pk": 8, "model": "contenttypes.contenttype", "fields": {"model": "site", "name": "site", "app_label": "sites"}}, {"pk": 12, "model": "contenttypes.contenttype", "fields": {"model": "subcategory", "name": "Subcategory", "app_label": "main"}}, {"pk": 3, "model": "contenttypes.contenttype", "fields": {"model": "user", "name": "user", "app_label": "auth"}}, {"pk": "c7df39146d51f7affbbd27c995cd431f", "model": "sessions.session", "fields": {"expire_date": "2008-12-08 19:46:47", "session_data": "gAJ9cQEoVRJfYXV0aF91c2VyX2JhY2tlbmRxAlUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5k\ncy5Nb2RlbEJhY2tlbmRxA1UNX2F1dGhfdXNlcl9pZHEESwFVCmxhc3RfdmlzaXRxBVUIMDgtMTEt\nMjRxBnUuOTQxNTNiYTcyYjY5OTkxNjlmOWJjNzA1NDZhMzFkYmY=\n"}}, {"pk": 1, "model": "sites.site", "fields": {"domain": "example.com", "name": "example.com"}}]
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index bac2183..72130ee 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-23 16:08+0100\n"
+"POT-Creation-Date: 2008-11-24 19:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,80 +24,89 @@ msgstr "Voir"
 msgid "Add"
 msgstr "Ajouter"
 
-#: main/models.py:17 main/models.py:29 main/models.py:41 main/models.py:68
-#: main/models.py:138
+#: main/models.py:18 main/models.py:31 main/models.py:43 main/models.py:55
+#: main/models.py:82 main/models.py:152
 msgid "Name"
 msgstr "Nom"
 
-#: main/models.py:18 main/models.py:42 main/models.py:74 main/models.py:140
+#: main/models.py:19 main/models.py:32 main/models.py:56 main/models.py:88
+#: main/models.py:154
 msgid "Available"
 msgstr "Disponible"
 
-#: main/models.py:19 main/models.py:44 main/models.py:139
+#: main/models.py:20
+msgid "Date"
+msgstr "Date"
+
+#: main/models.py:26
+msgid "News"
+msgstr "Nouvelle"
+
+#: main/models.py:33 main/models.py:58 main/models.py:153
 msgid "Order"
 msgstr "Ordre"
 
-#: main/models.py:24 main/models.py:40 templates/edit.html:18
+#: main/models.py:38 main/models.py:54 templates/edit.html:18
 msgid "Category"
 msgstr "Catégorie"
 
-#: main/models.py:30 main/models.py:71 templates/edit.html:37
+#: main/models.py:44 main/models.py:85 templates/edit.html:37
 msgid "Image"
 msgstr "Image"
 
-#: main/models.py:35 main/models.py:43
+#: main/models.py:49 main/models.py:57
 msgid "Icon"
 msgstr "Icone"
 
-#: main/models.py:49 main/models.py:69
+#: main/models.py:63 main/models.py:83
 msgid "Subcategory"
 msgstr "Sous-catégorie"
 
-#: main/models.py:70
+#: main/models.py:84
 msgid "Localisation"
 msgstr "Localisation"
 
-#: main/models.py:73
+#: main/models.py:87
 msgid "Submited"
 msgstr "Soumis"
 
-#: main/models.py:75
+#: main/models.py:89
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: main/models.py:79
+#: main/models.py:93
 msgid "Status"
 msgstr "État"
 
-#: main/models.py:87 main/models.py:162
+#: main/models.py:101 main/models.py:176
 msgid "Point of interest"
 msgstr "Point d'intérêt"
 
-#: main/models.py:141
+#: main/models.py:155
 msgid "Text"
 msgstr "Texte"
 
-#: main/models.py:142
+#: main/models.py:156
 msgid "Long text"
 msgstr "Texte long"
 
-#: main/models.py:143
+#: main/models.py:157
 msgid "Password"
 msgstr "Mot de passe"
 
-#: main/models.py:147
+#: main/models.py:161
 msgid "Type"
 msgstr "Type"
 
-#: main/models.py:152 main/models.py:164
+#: main/models.py:166 main/models.py:178
 msgid "Property model"
 msgstr "Modèle de propriété"
 
-#: main/models.py:165
+#: main/models.py:179
 msgid "Value"
 msgstr "Valeur"
 
-#: main/models.py:169
+#: main/models.py:183
 msgid "Property"
 msgstr "Propriété"
 
@@ -109,14 +118,10 @@ msgstr "Latitude"
 msgid "Longitude"
 msgstr "Longitude"
 
-#: templates/base.html:28
+#: templates/base.html:29 templates/main_map.html:23
 msgid "This site uses Chimère"
 msgstr "Ce site utilise Chimère"
 
-#: templates/detail.html:10
-msgid "Close"
-msgstr "Fermer"
-
 #: templates/edit.html:9 templates/submited.html:5
 msgid "Add a new site"
 msgstr "Ajouter un nouveau site"
@@ -141,6 +146,10 @@ msgstr "Choisissez une localisation pour ce nouveau site"
 msgid "Propose"
 msgstr "Proposez"
 
+#: templates/main_map.html:23
+msgid "Welcome message"
+msgstr "Message d'accueil"
+
 #: templates/submited.html:6
 msgid ""
 "Your proposition has been submited. A moderator will treat your submission "
@@ -148,3 +157,22 @@ msgid ""
 msgstr ""
 "Votre proposition a été soumise. Un modérateur va traiter votre proposition "
 "sous peu. Merci !"
+
+#: templates/welcome.html:3
+msgid "Welcome to Chimère"
+msgstr "Bienvenu dans Chimère"
+
+#: templates/welcome.html:5
+msgid ""
+"This is the default message. You can overload it by modifying the file "
+"welcome.html in the template directory of Chimère. Below this message all "
+"news message will be displayed. You can add them in administration pages."
+msgstr "" 
+"Ceci est le message par défaut. Vous pouvez le surcharger en modifiant "
+"le fichier welcome.html dans le dossier de patrons de Chimère. En dessous "
+"de ce message toutes les nouvelles vont être affichées. Vous pouvez les "
+"ajouter dans les pages d'administration."
+
+#: templates/welcome.html:15
+msgid "Close"
+msgstr "Fermer"
diff --git a/main/admin.py b/main/admin.py
index 2bfa390..02e2d1f 100644
--- a/main/admin.py
+++ b/main/admin.py
@@ -18,11 +18,18 @@ class MarkerAdmin(admin.ModelAdmin):
     list_filter = ('status', 'subcategory')
     form = MarkerAdminForm
 
+class SubCategoryAdmin(admin.ModelAdmin):
+    """
+    Specialized the subcategory admin
+    """
+    list_display = ('name', 'category', 'available')
+    list_filter = ('category',)
+
 # register of differents database fields
 admin.site.register(News)
-admin.site.register(Category)
 admin.site.register(Icon)
-admin.site.register(SubCategory)
+admin.site.register(Category)
+admin.site.register(SubCategory, SubCategoryAdmin)
 admin.site.register(Marker, MarkerAdmin)
 admin.site.register(PropertyModel)
 admin.site.register(Property)
diff --git a/main/views.py b/main/views.py
index 2a1bc14..3695fd1 100644
--- a/main/views.py
+++ b/main/views.py
@@ -30,17 +30,19 @@ def index(request):
     for url in URL_OSM_JS + ["%smain_map.js" % settings.MEDIA_URL]:
         extra_js += '<script src="%s"></script>\n' % url
     extra_js += '<script src="/chimere/jsi18n/"></script>\n'
-    # show the presentation page
-    detail_content = ''
-    if not 'visited' in request.session:
-        request.session['visited'] = '1'
-        detail_content = welcome(request)
+    # show the welcome page
+    today = datetime.date.today().strftime('%y-%m-%d')
+    display_welcome = None
+    if not 'last_visit' in request.session or \
+       request.session['last_visit'] != today:
+        request.session['last_visit'] = today
+        display_welcome = True
     response_dct = {'actions':actions, 'action_selected':'view',
                     'error_message':'',
                     'sub_categories':subcategories,
                     'extra_head':extra_js + getMapJS(),
                     'media_path':settings.MEDIA_URL,
-                    'detail_content':detail_content,
+                    'welcome':welcome(request, display_welcome),
                     }
     return render_to_response('main_map.html', response_dct)
 
@@ -77,11 +79,11 @@ def edit(request):
         response_dct['current_category'] = int(form.data['subcategory'])
     return render_to_response('edit.html', response_dct)
 
-def welcome(request):
+def welcome(request, display=None):
     """
     Welcome string
     """
-    response_dct = {}
+    response_dct = {'display':display}
     response_dct['news_lst'] = News.objects.filter(available=True)
     return loader.render_to_string('welcome.html', response_dct)
 
diff --git a/static/main_map.js b/static/main_map.js
index 0bcf972..7de9904 100644
--- a/static/main_map.js
+++ b/static/main_map.js
@@ -1,5 +1,15 @@
 /* main map */
 
+/* show a block panel */
+function show(id){
+    document.getElementById(id).style.display = 'block';
+}
+
+/* hide a panel */
+function hide(id){
+    document.getElementById(id).style.display = 'None';
+}
+
 /* availaible map layers */
 var layerMapnik = new OpenLayers.Layer.OSM.Mapnik('Classic');
 var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle map", {
@@ -59,7 +69,7 @@ function setMarkers(response){
         /* clean the marker layer */
         if (currentPopup) {
             currentPopup.hide();
-            hideDetail();
+            hide('detail');
         }
         layerMarkers = new OpenLayers.Layer.Markers('POIs');
         map.addLayer(layerMarkers);
@@ -99,10 +109,7 @@ function putMarker(mark) {
     feature.popupClass = OpenLayers.Class(OpenLayers.Popup.FramedCloud);
     feature.data.popupContentHTML = "<div class='cloud'>";
     feature.data.popupContentHTML += mark.properties.name;
-    feature.data.popupContentHTML += "<br/><div id='popup_link'>\
-<a href='javascript:showDetail()'>";
-    feature.data.popupContentHTML += gettext("Show details");
-    feature.data.popupContentHTML += "</a></div></div>";
+    feature.data.popupContentHTML += "<br/>&nbsp;</div>";
     feature.data.overflow = 'hidden';
     var marker = feature.createMarker();
     /* manage markers events */
@@ -112,7 +119,7 @@ function putMarker(mark) {
             if (currentPopup == this.popup) {
                 this.popup.hide();
                 clicked = false;
-                hideDetail();
+                hide('detail');
             } else {
                 currentPopup.hide();
                 showPop(this);
@@ -150,19 +157,11 @@ function updateDetail(pk){
 function setDetail(response){
     if (response.responseText.indexOf('no results') == -1) {
         document.getElementById('detail').innerHTML = response.responseText;
+        show('detail');
     }
 }
 
 
-/* show the detail windows */
-function showDetail(){
-    document.getElementById('detail').style.display = 'block';
-}
-
-/* hide content of detail panel */
-function hideDetail(){
-    document.getElementById('detail').style.display = 'None';
-}
 
 /* main initialisation function */
 function init(){
diff --git a/static/styles.css b/static/styles.css
index 353fcbe..0942301 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -77,6 +77,10 @@ color:black;
 }
 
 #footer{
+text-align:center;
+}
+
+#map-footer{
 position:absolute;
 z-index:5;
 background-color:white;
@@ -95,7 +99,7 @@ z-index:5;
 top:50px;
 bottom:20px;
 right:18px;
-width:250px;
+width:300px;
 background-color:#FFF;
 opacity:0.8;
 -moz-border-radius:10px;
@@ -107,8 +111,7 @@ border-radius:10px;
 text-align:center;
 }
 
-#detail{
-display:None;
+#welcome{
 padding:6px 10px;
 border: 1px solid black;
 position:absolute;
@@ -116,7 +119,7 @@ z-index:5;
 top:50px;
 bottom:58px;
 left:80px;
-right:310px;
+right:360px;
 background-color:#FFF;
 opacity:0.9;
 -moz-border-radius:10px;
@@ -124,6 +127,23 @@ opacity:0.9;
 border-radius:10px;
 }
 
+#detail{
+display:None;
+padding:6px 10px;
+border: 1px solid black;
+position:absolute;
+z-index:5;
+top:274px;
+bottom:38px;
+right:18px;
+width:300px;
+background-color:#FFF;
+opacity:0.8;
+-moz-border-radius:10px;
+-webkit-border-radius:10px;
+border-radius:10px;
+}
+
 #detail_content{
 overflow:auto;
 height:90%;
@@ -133,6 +153,13 @@ height:90%;
 text-align:center;
 }
 
+#detail_footer a{
+color:white;
+background-color:purple;
+display:block;
+text-decoration:None;
+}
+
 #map{
 border: 1px solid black;
 position:absolute;
diff --git a/templates/base.html b/templates/base.html
index 191d95d..da27cd2 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -25,7 +25,9 @@
     <div id="content">
         {% block content %}{% endblock %}
     </div>
+    {% block footer %}
     <div id='footer'>{% trans "This site uses Chimère"%} - Copyright © 2008 <a href='http://redmine.peacefrogs.net/projects/show/chimere'>Chimère project</a></div>
+    {% endblock %}
 </body>
 </html>
 
diff --git a/templates/detail.html b/templates/detail.html
index f8ef21d..03ffe25 100644
--- a/templates/detail.html
+++ b/templates/detail.html
@@ -6,5 +6,4 @@
 <div>{% for property in marker.getProperties %}
 <p id='{{property.propertymodel.getNamedId}}'>{{ property.value }}</p>
 {% endfor %}</div>
-</div>
-<div id='detail_footer'><a href='javascript:hideDetail();'>{% trans "Close" %}</a></div>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/templates/main_map.html b/templates/main_map.html
index df422ee..c7b9e2f 100644
--- a/templates/main_map.html
+++ b/templates/main_map.html
@@ -12,10 +12,13 @@
 </ul>
 </form>
 </div>
-<div id='detail'{% if detail_content%} style="display:block;"{% endif %}>
-{{ detail_content }}
-</div>{% endblock %}
+<div id='detail'>
+</div>
+{{welcome}}{% endblock %}
 {% block content %}<div id='map'></div>
 <script type='text/javascript'><!--
 init();
 // --> </script>{% endblock %}
+{% block footer %}
+    <div id='map-footer'><a href='javascript:show("welcome");'>{% trans "Welcome message"%}</a> - {% trans "This site uses Chimère"%} - Copyright © 2008 <a href='http://redmine.peacefrogs.net/projects/show/chimere'>Chimère project</a></div>
+{% endblock %}
diff --git a/templates/welcome.html b/templates/welcome.html
index d9825cf..8d15f8e 100644
--- a/templates/welcome.html
+++ b/templates/welcome.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+<div id='welcome' {% if not display %}style='display:None'{%endif%}>
 <h2>{% trans "Welcome to Chimère"%}</h2>
 <div id='detail_content'>
  <p>{% trans "This is the default message. You can overload it by modifying the file welcome.html in the template directory of Chimère. Below this message all news message will be displayed. You can add them in administration pages."%}</p>
@@ -11,4 +12,5 @@
 {%endfor%}
 </div>{%endif%}
 </div>
-<div id='detail_footer'><a href='javascript:hideDetail();'>{% trans "Close" %}</a></div>
\ No newline at end of file
+<div id='detail_footer'><a href='javascript:hide("welcome");'>{% trans "Close" %}</a></div>
+</div>
\ No newline at end of file