diff --git a/cao_sunyata/templates/blog.jinja2 b/cao_sunyata/templates/blog.jinja2 index 5fc54d1..c89929d 100644 --- a/cao_sunyata/templates/blog.jinja2 +++ b/cao_sunyata/templates/blog.jinja2 @@ -25,12 +25,12 @@ {% if entry.source_link != '' %} {% endif %} {% if entry.related %} {% endif %} diff --git a/cao_sunyata/templates/blog_search.jinja2 b/cao_sunyata/templates/blog_search.jinja2 index 7446262..53a624f 100644 --- a/cao_sunyata/templates/blog_search.jinja2 +++ b/cao_sunyata/templates/blog_search.jinja2 @@ -16,7 +16,6 @@
- {% for entry in items %} @@ -27,18 +26,19 @@ - - - - - + {% for entry in items %} + + + + + + {% endfor %}
- - {{ entry.title }} - - {{ entry.tag }}{{ entry.edit_date }}
+ + {{ entry.title }} + + {{ entry.tag }}{{ entry.edit_date }}
- {% endfor %}


diff --git a/cao_sunyata/views/blog.py b/cao_sunyata/views/blog.py index 26aee07..c48b053 100644 --- a/cao_sunyata/views/blog.py +++ b/cao_sunyata/views/blog.py @@ -18,6 +18,13 @@ def blog(request): request.session.flash(u"Page non trouvée : %s" % blog_id, 'warning') return HTTPFound(location=request.route_url('home')) + if entry.language == 'vn': + scr_label = 'Nguồn' + rel_label = 'Nội dung liên quan' + else: + scr_label = 'Source' + rel_label = 'Contenu corrélé' + # insèrer le path de static/img body = entry.body.replace('static/', "%s/static/" % request.application_url) # convertir de markdown en HTML @@ -30,6 +37,8 @@ def blog(request): 'page_title': entry.title, 'entry': entry, 'related': related, + 'scr_label': scr_label, + 'rel_label': rel_label, 'body_html': body_html, } diff --git a/production.ini b/production.ini index 6ea7573..9a98cc8 100644 --- a/production.ini +++ b/production.ini @@ -14,7 +14,7 @@ pyramid.default_locale_name = en sqlalchemy.url = sqlite:///%(here)s/cao_sunyata.sqlite # images location -images_dir = /pyramid/cao_sunyata/cao_sunyata/static/img/ +images_dir = /home/debian/pyramid/cao_sunyata/cao_sunyata/static/img/ # reCaptcha keys site_key = 6LeDvVUgAAAAAOqD_-h93kd5aW8CmpeVvKYu-m0p