diff --git a/tcs_site.sqlite b/tcs_site.sqlite index 1e8b317..7ee2823 100644 Binary files a/tcs_site.sqlite and b/tcs_site.sqlite differ diff --git a/tcs_site.temp b/tcs_site.temp new file mode 100644 index 0000000..5557f24 Binary files /dev/null and b/tcs_site.temp differ diff --git a/tcs_site/models/entries.py b/tcs_site/models/entries.py index 572a521..11430a8 100644 --- a/tcs_site/models/entries.py +++ b/tcs_site/models/entries.py @@ -76,9 +76,15 @@ def get_activities(request): results = request.dbsession.execute(query,).all() return results +def get_tags_byTag(request, topic, tag): + # get tags + query = "SELECT * FROM tags WHERE topic=:topic and tag=:tag;" + results = request.dbsession.execute(query, {'topic':topic, 'tag':tag}).first() + return results + def get_tags_byTopic(request, topic): # get tags - query = "SELECT * FROM tags WHERE topic=:topic ORDER BY tag_name;" + query = "SELECT * FROM tags WHERE topic=:topic ORDER BY tag;" results = request.dbsession.execute(query, {'topic':topic}).all() return results diff --git a/tcs_site/routes.py b/tcs_site/routes.py index 0d086aa..f5c4e2d 100644 --- a/tcs_site/routes.py +++ b/tcs_site/routes.py @@ -10,6 +10,7 @@ def includeme(config): config.add_route('image_edit', '/image_edit/{filename}') config.add_route('login', '/login') config.add_route('logout', '/logout') + config.add_route('section', '/section/{topic}/{tag}') config.add_route('settings', '/settings') config.add_route('stats_pages', '/stats_pages') config.add_route('tag_edit', '/tag_edit/{topic}/{id}') diff --git a/tcs_site/templates/home.jinja2 b/tcs_site/templates/home.jinja2 index b09ab83..2f2e176 100644 --- a/tcs_site/templates/home.jinja2 +++ b/tcs_site/templates/home.jinja2 @@ -17,7 +17,9 @@
-

Tiểu sử

+
Đời và nhạc
+
Life and music
+
Vie et musique
@@ -29,7 +31,8 @@
-

Bài hát

+
Bài hát
+
Bài hát
@@ -40,7 +43,7 @@
-

Tranh vẽ

+
Tranh vẽ
@@ -57,7 +60,7 @@
-

4e dimanche du mois

+
4e dimanche du mois
@@ -69,7 +72,7 @@
-

4e dimanche du mois

+
4e dimanche du mois
diff --git a/tcs_site/templates/layout.jinja2 b/tcs_site/templates/layout.jinja2 index 1ddc725..686cd56 100644 --- a/tcs_site/templates/layout.jinja2 +++ b/tcs_site/templates/layout.jinja2 @@ -38,13 +38,13 @@ En Vietnamien
  • -
  • -
  • @@ -67,17 +67,22 @@ In ENGLISH
  • - +
    • +
  • +
  • -
  • -
    • @@ -90,17 +95,22 @@ En FRANCAIS
  • - +
    • +
  • +
  • -
  • -
    • @@ -131,18 +141,24 @@
  • {{ request.authenticated_userid }}
    • + {% if request.authenticated_userid == 'admin' %} +
  • + + +
    • + {% else %} +
  • + + Modifier le mdp +
    • + {% endif %}
  • - {% if request.authenticated_userid == 'admin' %} - - - {% else %} - - Modifier le mdp - {% endif %} - - Paramètres - - Se déconnecter + + Paramètres +
    • +
  • + + Se déconnecter
    • {% else %}
  • @@ -178,15 +194,8 @@
    diff --git a/tcs_site/templates/section.jinja2 b/tcs_site/templates/section.jinja2 new file mode 100644 index 0000000..995e0b5 --- /dev/null +++ b/tcs_site/templates/section.jinja2 @@ -0,0 +1,19 @@ +{% extends "layout.jinja2" %} + +{% block content %} + +
    +
    + + {% if request.authenticated_userid %} +

    + Nouveau +

    + {% endif%} + + {{ liste | safe }} + +
    +
    + +{% endblock %} diff --git a/tcs_site/views/blog.py b/tcs_site/views/blog.py index cd4ccb8..b66884f 100644 --- a/tcs_site/views/blog.py +++ b/tcs_site/views/blog.py @@ -192,6 +192,41 @@ def blog_search(request): 'criteria': criteria, } +@view_config(route_name='section', renderer='../templates/section.jinja2') +def section(request): + topic = request.matchdict['topic'] + tag = request.matchdict['tag'] + + # get the tag record + tag_record = get_tags_byTag(request, topic, tag) + # convertir champ topic_quote en HTML + # topic_quote = markdown.markdown(tag_record.topic_quote) + # insèrer le path de static/img + # topic_quote = topic_quote.replace('static/', "%s/static/" % request.application_url) + + + # generate the items list group by tag + liste = '' + # lire toutes les docs du topic / tag + items = get_entries_by_topic(request, topic, tag) + if items: + liste += '
    ' + for item in items: + item_slug = urlify(item.title) + liste += '' + liste += '' % (request.route_url('blog', id=item.id, slug=item_slug), item.title) + liste += '' % item.description + if item.status != 'publié': + liste += '' % item.status + liste += '' + liste += '
    %s%s%s
    ' + else: + liste += '' + return { + 'page_title': tag_record.tag_name, + 'topic': topic, + 'liste': liste, + } @view_config(route_name='topic', renderer='../templates/topic.jinja2') def topic(request): @@ -235,6 +270,7 @@ def topic(request): 'liste': liste, } + @view_config(route_name='stats_pages', renderer='../templates/stats_pages.jinja2') def stats_pages(request):