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

2 files changed, 19 insertions, 10 deletions

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)