# HG changeset patch
# User cavaliet
# Date 1390298423 -3600
# Node ID f8102ed287c3285fcc72c1f70714e26e02252c0a
# Parent  56db9b2c61e8371d620bfb1dd546bde782393373# Parent  17ea06c7e5a0f67ca40d70d32c53cc4913f89555
Merge with 17ea06c7e5a0f67ca40d70d32c53cc4913f89555

diff -r 56db9b2c61e8 -r f8102ed287c3 .hgtags
--- a/.hgtags	Tue Jan 21 10:58:31 2014 +0100
+++ b/.hgtags	Tue Jan 21 11:00:23 2014 +0100
@@ -87,3 +87,5 @@
 ca638a0ba37216a647d2eb0bf7b013b8e7fef098 V00.53
 ca638a0ba37216a647d2eb0bf7b013b8e7fef098 V00.53
 0e35b7460395bc4c6e2d6df07422292a2f9b22cc V00.53
+0e35b7460395bc4c6e2d6df07422292a2f9b22cc V00.53
+e9cd436a7dcb9b456583ed97479a13b33e6d6118 V00.53
diff -r 56db9b2c61e8 -r f8102ed287c3 src/jocondelab/settings.py
--- a/src/jocondelab/settings.py	Tue Jan 21 10:58:31 2014 +0100
+++ b/src/jocondelab/settings.py	Tue Jan 21 11:00:23 2014 +0100
@@ -271,6 +271,7 @@
 DB_QUERY_CACHE_TIME = 86400
 
 CACHE_MIDDLEWARE_SECONDS = 600
+HOME_CACHE_SECONDS = 30
 
 from config import *  # @UnusedWildImport
 
diff -r 56db9b2c61e8 -r f8102ed287c3 src/jocondelab/urls.py
--- a/src/jocondelab/urls.py	Tue Jan 21 10:58:31 2014 +0100
+++ b/src/jocondelab/urls.py	Tue Jan 21 11:00:23 2014 +0100
@@ -1,16 +1,21 @@
-from jocondelab.views.back_office import (TermListView, TermEditView, TermModifyWpLink, 
-    TermRemoveWpLink, TermValidate, TermWikipediaEdition, 
-    TermLinkSemanticLevelEdition, ThesaurusTree, TermListTableView)
-from jocondelab.views.front_office import (SearchView, NoticeView, GeoView, FrontTermListView)
-from jocondelab.views.ajax import (ContributeView, VoteView)
-from jocondelab.views.i18n import cached_javascript_catalog
-from core import urls as core_urls
 from django.conf.urls import patterns, include, url
+from django.conf import settings
 from django.contrib import admin
 from django.contrib.auth import urls as auth_urls
 from django.contrib.auth.decorators import login_required
 from django.views.generic import TemplateView
 
+from core import urls as core_urls
+from jocondelab.views.ajax import ContributeView, VoteView
+from jocondelab.views.back_office import (TermListView, TermEditView, 
+    TermModifyWpLink, TermRemoveWpLink, TermValidate, TermWikipediaEdition, 
+    TermLinkSemanticLevelEdition, ThesaurusTree, TermListTableView)
+from jocondelab.views.front_office import (SearchView, NoticeView, GeoView, 
+    FrontTermListView)
+from jocondelab.views.i18n import cached_javascript_catalog
+from django.views.decorators.cache import cache_page
+
+
 js_info_dict = {
     'packages': ('core', 'jocondelab'),
 }
@@ -33,7 +38,7 @@
     url(r'^bo/term/edition-link-level/$', login_required(TermLinkSemanticLevelEdition.as_view()), name='editon_link_semantic_level'),
     url(r'^bo/term/validate/$', login_required(TermValidate.as_view()), name='validate_term'),
     url(r'^bo/tree/(?P<thes_id>\d+)/$', login_required(ThesaurusTree.as_view()), name='term_tree'),
-    url(r'^$', SearchView.as_view(template_name="jocondelab/front_home.html"), name='front_home'),
+    url(r'^$', cache_page(settings.HOME_CACHE_SECONDS)(SearchView.as_view(template_name="jocondelab/front_home.html")), name='front_home'),
     url(r'^keywords/$', FrontTermListView.as_view(), name='front_termlist'),
     url(r'^search/$', SearchView.as_view(), name='front_search'),
     url(r'^map/$', GeoView.as_view(), name='front_geo'),