diff --git a/setup.py b/setup.py index 428eff5..a93739c 100644 --- a/setup.py +++ b/setup.py @@ -15,11 +15,11 @@ requires = [ 'pyramid_debugtoolbar', 'waitress', 'pyramid_mailer', - 'pyramid_retry', + # 'pyramid_retry', 'pyramid_tm', - 'SQLAlchemy==1.4.54', + 'SQLAlchemy==1.4.54', + 'zope.sqlalchemy==2.0', # last version supporting python 3.9 'transaction', - 'zope.sqlalchemy==2.0', 'webhelpers2', # various web building related helpers 'passlib', 'python-magic', diff --git a/tcs_site.egg-info/PKG-INFO b/tcs_site.egg-info/PKG-INFO index 54191fb..dfac46a 100644 --- a/tcs_site.egg-info/PKG-INFO +++ b/tcs_site.egg-info/PKG-INFO @@ -1,4 +1,4 @@ -Metadata-Version: 2.1 +Metadata-Version: 2.4 Name: tcs_site Version: 1.0 Summary: Sunyata meditation Paris website @@ -16,22 +16,28 @@ Requires-Dist: pyramid_jinja2 Requires-Dist: pyramid_debugtoolbar Requires-Dist: waitress Requires-Dist: pyramid_mailer -Requires-Dist: pyramid_retry Requires-Dist: pyramid_tm Requires-Dist: SQLAlchemy==1.4.54 -Requires-Dist: transaction Requires-Dist: zope.sqlalchemy==2.0 +Requires-Dist: transaction Requires-Dist: webhelpers2 Requires-Dist: passlib Requires-Dist: python-magic Requires-Dist: Pillow Requires-Dist: unidecode Requires-Dist: markdown +Requires-Dist: docutils Requires-Dist: urllib3==1.26 Provides-Extra: testing Requires-Dist: WebTest>=1.3.1; extra == "testing" Requires-Dist: pytest>=3.7.4; extra == "testing" Requires-Dist: pytest-cov; extra == "testing" +Dynamic: classifier +Dynamic: description +Dynamic: keywords +Dynamic: provides-extra +Dynamic: requires-dist +Dynamic: summary # tcs_site diff --git a/tcs_site.egg-info/requires.txt b/tcs_site.egg-info/requires.txt index d8517f9..fc67559 100644 --- a/tcs_site.egg-info/requires.txt +++ b/tcs_site.egg-info/requires.txt @@ -4,17 +4,17 @@ pyramid_jinja2 pyramid_debugtoolbar waitress pyramid_mailer -pyramid_retry pyramid_tm SQLAlchemy==1.4.54 -transaction zope.sqlalchemy==2.0 +transaction webhelpers2 passlib python-magic Pillow unidecode markdown +docutils urllib3==1.26 [testing] diff --git a/tcs_site.sqlite b/tcs_site.sqlite index a377fc6..6876723 100644 Binary files a/tcs_site.sqlite and b/tcs_site.sqlite differ diff --git a/tcs_site/.DS_Store b/tcs_site/.DS_Store index 20e195f..6b80a7f 100644 Binary files a/tcs_site/.DS_Store and b/tcs_site/.DS_Store differ diff --git a/tcs_site/models/entries.py b/tcs_site/models/entries.py index 025a06f..4723481 100644 --- a/tcs_site/models/entries.py +++ b/tcs_site/models/entries.py @@ -54,16 +54,6 @@ def get_entries_count_by_topic(request): results = request.dbsession.execute(query,).fetchall() return results -def get_last_created(request): - # gest the 10 last created posts - query = "SELECT strftime('%d/%m/%Y', created) AS create_date, id, title, author, status FROM entries WHERE topic_id <> '_admin'" - if request.authenticated_userid == None: - # if user is anonym, display only published posts - query = query + " AND status='publié'" - - query = query + " ORDER BY created DESC LIMIT 15;" - results = request.dbsession.execute(query).fetchall() - return results def get_last_edited(request): # gest the last edited posts diff --git a/tcs_site/static/.DS_Store b/tcs_site/static/.DS_Store index 623f3a8..8af407c 100644 Binary files a/tcs_site/static/.DS_Store and b/tcs_site/static/.DS_Store differ diff --git a/tcs_site/static/favicon.ico b/tcs_site/static/favicon.ico new file mode 100644 index 0000000..2fb253f Binary files /dev/null and b/tcs_site/static/favicon.ico differ diff --git a/tcs_site/static/img/home/home_albums.jpg b/tcs_site/static/img/home/home_albums.jpg new file mode 100644 index 0000000..fdca8c9 Binary files /dev/null and b/tcs_site/static/img/home/home_albums.jpg differ diff --git a/tcs_site/static/khong-noi.jpg b/tcs_site/static/khong-noi.jpg deleted file mode 100644 index 4150281..0000000 Binary files a/tcs_site/static/khong-noi.jpg and /dev/null differ diff --git a/tcs_site/static/logo-msp.png b/tcs_site/static/logo-msp.png deleted file mode 100644 index 7f6920c..0000000 Binary files a/tcs_site/static/logo-msp.png and /dev/null differ diff --git a/tcs_site/static/logo-msp2.png b/tcs_site/static/logo-msp2.png deleted file mode 100644 index 2fcfd86..0000000 Binary files a/tcs_site/static/logo-msp2.png and /dev/null differ diff --git a/tcs_site/static/ni-su.jpg b/tcs_site/static/ni-su.jpg deleted file mode 100644 index 7732ade..0000000 Binary files a/tcs_site/static/ni-su.jpg and /dev/null differ diff --git a/tcs_site/static/zazen.ico b/tcs_site/static/zazen.ico deleted file mode 100644 index 4d0565b..0000000 Binary files a/tcs_site/static/zazen.ico and /dev/null differ diff --git a/tcs_site/static/zazen.png b/tcs_site/static/zazen.png deleted file mode 100644 index 8ca28cf..0000000 Binary files a/tcs_site/static/zazen.png and /dev/null differ diff --git a/tcs_site/templates/blog.jinja2 b/tcs_site/templates/blog.jinja2 index 72fae59..e535fd3 100644 --- a/tcs_site/templates/blog.jinja2 +++ b/tcs_site/templates/blog.jinja2 @@ -16,9 +16,6 @@ {% endif %} -

- {{ entry.author }} - Publié le {{ entry.create_date }}
-

{{ body_html | safe }}

@@ -33,6 +30,9 @@ {% endif %}
+

+ {{ entry.author }} - Publié le {{ entry.create_date }}
+

{% if request.authenticated_userid %} diff --git a/tcs_site/templates/blog_edit.jinja2 b/tcs_site/templates/blog_edit.jinja2 index d180e7e..4689cfd 100644 --- a/tcs_site/templates/blog_edit.jinja2 +++ b/tcs_site/templates/blog_edit.jinja2 @@ -24,11 +24,14 @@ +

+ + +
+
- +
diff --git a/tcs_site/templates/home.jinja2 b/tcs_site/templates/home.jinja2 index 2f85ce1..5c1240f 100644 --- a/tcs_site/templates/home.jinja2 +++ b/tcs_site/templates/home.jinja2 @@ -3,7 +3,7 @@ {% block content %}
-

Hội văn hoá Trịnh Công Sơn,
hội tụ bạn bè của nhạc sĩ Trịnh Công Sơn từ khắp nơi trên thế giới,
+

Hội văn hoá Trịnh Công Sơn, hội tụ bạn bè của nhạc sĩ Trịnh Công Sơn từ khắp nơi trên thế giới,
xây dựng trạm web này với mong muốn trở thành một thư viện toàn diện và nghiêm túc về Trịnh Công Sơn.

@@ -32,8 +32,8 @@
Bài hát
-
Tập nhạc
-
CD và K7
+
Songs
+
Chansons
@@ -49,9 +49,49 @@ - +
+ +
+
+
+ +
+ +
+
Tập nhạc
+
Albums
+
Recueils
+
+
+
+
+
+
+ matdash-img +
+ +
+
Nhạc soạn cho ghita
+
Guitar arrangements
+
Arrangements pour guitare
+
+
+
+
+
+
+ matdash-img +
+ +
+
Tranh vẽ
+ +
+
+
+
diff --git a/tcs_site/templates/layout.jinja2 b/tcs_site/templates/layout.jinja2 index f4e3d20..5016974 100644 --- a/tcs_site/templates/layout.jinja2 +++ b/tcs_site/templates/layout.jinja2 @@ -8,7 +8,7 @@ {{page_title}} - + @@ -78,7 +78,7 @@
  • @@ -86,11 +86,6 @@ Songs
    • -
  • - -
  • diff --git a/tcs_site/templates/settings.jinja2 b/tcs_site/templates/settings.jinja2 index 42e030a..1deb2a5 100644 --- a/tcs_site/templates/settings.jinja2 +++ b/tcs_site/templates/settings.jinja2 @@ -45,7 +45,6 @@

    Versions des packages

      -
    • tcs_site {{ app_version }}
    • Pyramid {{ pyramid_version }}
    • Markdown {{ markdown_version }}
    • SQLAlchemy {{ sqlalchemy_version }}
      • diff --git a/tcs_site/templates/topic_edit.jinja2 b/tcs_site/templates/topic_edit.jinja2 index 9c6be0e..8f05ba1 100644 --- a/tcs_site/templates/topic_edit.jinja2 +++ b/tcs_site/templates/topic_edit.jinja2 @@ -30,9 +30,7 @@
      - +
      diff --git a/tcs_site/views/blog.py b/tcs_site/views/blog.py index ab37db9..808bd63 100644 --- a/tcs_site/views/blog.py +++ b/tcs_site/views/blog.py @@ -222,8 +222,8 @@ def section(request): for item in items: item_slug = urlify(item.title) liste += '' - liste += '%s' % (request.route_url('blog', id=item.id, slug=item_slug), item.title) - liste += '%s' % item.description + liste += '%s' % ('40%', request.route_url('blog', id=item.id, slug=item_slug), item.title) + liste += '%s' % ('60%', item.description) if item.status != 'publié': liste += '%s' % item.status liste += '' diff --git a/tcs_site/views/default.py b/tcs_site/views/default.py index 0741871..1c743fc 100644 --- a/tcs_site/views/default.py +++ b/tcs_site/views/default.py @@ -25,12 +25,9 @@ import transaction @view_config(route_name='home', renderer='../templates/home.jinja2') def home(request): - # get the last created posts - last_ten = get_last_created(request) return { 'page_title': "", - 'last_ten': last_ten, } def captcha_validate(response, remote_addr, secret): @@ -67,7 +64,7 @@ def settings(request): sqlalchemy_version = pkg_resources.get_distribution("sqlalchemy").version sqlite_version = sqlite3.sqlite_version python_version = sys.version - app_version = pkg_resources.require("tcs_site")[0].version + # app_version = pkg_resources.require("tcs_site")[0].version return { 'page_title': "Paramètres", @@ -78,7 +75,6 @@ def settings(request): 'sqlite_version' : sqlite_version, 'sqlalchemy_version': sqlalchemy_version, 'python_version' : python_version, - 'app_version' : app_version, }