diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1de985c --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +*.egg +*.egg-info +*.pyc +*$py.class +*~ +*.sqlite +.coverage +coverage.xml +build/ +dist/ +.tox/ +nosetests.xml +env*/ +tmp/ +Data.fs* +*.sublime-project +*.sublime-workspace +.*.sw? +.sw? +.DS_Store +coverage +test diff --git a/tcs_site.sqlite b/tcs_site.sqlite index 6131bc0..1e8b317 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 9933ad6..eb403a2 100644 Binary files a/tcs_site/.DS_Store and b/tcs_site/.DS_Store differ diff --git a/tcs_site/static/.DS_Store b/tcs_site/static/.DS_Store index 2e81035..b018602 100644 Binary files a/tcs_site/static/.DS_Store and b/tcs_site/static/.DS_Store differ diff --git a/tcs_site/static/css/styles.min.css b/tcs_site/static/css/styles.min.css index 5b9a032..3c4ba58 100644 --- a/tcs_site/static/css/styles.min.css +++ b/tcs_site/static/css/styles.min.css @@ -7,6 +7,7 @@ */ @import "../css/simplebar.css"; @import "../css/icons/tabler-icons/tabler-icons.css"; + :root, [data-bs-theme=light] { --bs-blue: #0d6efd; @@ -98,8 +99,8 @@ --bs-tertiary-bg: #f6f8fa; --bs-tertiary-bg-rgb: 246, 248, 250; --bs-heading-color: #3a4752; - --bs-link-color: #0d6efd; - --bs-link-color-rgb: 41, 82, 255; + --bs-link-color: #205c90; + --bs-link-color-rgb: 32, 92, 144; --bs-link-decoration: underline; --bs-link-hover-color: #2142cc; --bs-link-hover-color-rgb: 33, 66, 204; @@ -2362,7 +2363,7 @@ progress { } .table-sm > :not(caption) > * > * { - padding: 14px 10px; + padding: 8px 10px; } .table-bordered > :not(caption) > * { diff --git a/tcs_site/static/img/home/blog-img1.jpg b/tcs_site/static/img/home/blog-img1.jpg new file mode 100644 index 0000000..94204af Binary files /dev/null and b/tcs_site/static/img/home/blog-img1.jpg differ diff --git a/tcs_site/static/img/home/blog-img2.jpg b/tcs_site/static/img/home/blog-img2.jpg new file mode 100644 index 0000000..1595772 Binary files /dev/null and b/tcs_site/static/img/home/blog-img2.jpg differ diff --git a/tcs_site/static/img/home/blog-img3.jpg b/tcs_site/static/img/home/blog-img3.jpg new file mode 100644 index 0000000..b065626 Binary files /dev/null and b/tcs_site/static/img/home/blog-img3.jpg differ diff --git a/tcs_site/static/img/home/home_art.jpg b/tcs_site/static/img/home/home_art.jpg new file mode 100644 index 0000000..b2f8af4 Binary files /dev/null and b/tcs_site/static/img/home/home_art.jpg differ diff --git a/tcs_site/static/img/home/home_bio.jpg b/tcs_site/static/img/home/home_bio.jpg new file mode 100644 index 0000000..f8d33d2 Binary files /dev/null and b/tcs_site/static/img/home/home_bio.jpg differ diff --git a/tcs_site/static/img/home/home_friends.jpg b/tcs_site/static/img/home/home_friends.jpg new file mode 100644 index 0000000..63267cc Binary files /dev/null and b/tcs_site/static/img/home/home_friends.jpg differ diff --git a/tcs_site/static/img/home/home_hoi.JPG b/tcs_site/static/img/home/home_hoi.JPG new file mode 100644 index 0000000..46f1315 Binary files /dev/null and b/tcs_site/static/img/home/home_hoi.JPG differ diff --git a/tcs_site/static/img/home/home_songs.jpg b/tcs_site/static/img/home/home_songs.jpg new file mode 100644 index 0000000..0563ca9 Binary files /dev/null and b/tcs_site/static/img/home/home_songs.jpg differ diff --git a/tcs_site/static/img/logo-2004.jpg b/tcs_site/static/img/logo-2004.jpg new file mode 100644 index 0000000..4da2654 Binary files /dev/null and b/tcs_site/static/img/logo-2004.jpg differ diff --git a/tcs_site/static/img/logo-2005.jpg b/tcs_site/static/img/logo-2005.jpg new file mode 100644 index 0000000..b38777d Binary files /dev/null and b/tcs_site/static/img/logo-2005.jpg differ diff --git a/tcs_site/static/img/logo-2006.jpg b/tcs_site/static/img/logo-2006.jpg new file mode 100644 index 0000000..2ed611e Binary files /dev/null and b/tcs_site/static/img/logo-2006.jpg differ diff --git a/tcs_site/static/img/logo-2007.jpg b/tcs_site/static/img/logo-2007.jpg new file mode 100644 index 0000000..9a00058 Binary files /dev/null and b/tcs_site/static/img/logo-2007.jpg differ diff --git a/tcs_site/static/img/logo-2014.png b/tcs_site/static/img/logo-2014.png new file mode 100644 index 0000000..f254c56 Binary files /dev/null and b/tcs_site/static/img/logo-2014.png differ diff --git a/tcs_site/static/img/tcshome-logo.png b/tcs_site/static/img/tcshome-logo.png new file mode 100644 index 0000000..be31f11 Binary files /dev/null and b/tcs_site/static/img/tcshome-logo.png differ diff --git a/tcs_site/static/theme.css b/tcs_site/static/theme.css index 32dca02..cb5b19c 100644 --- a/tcs_site/static/theme.css +++ b/tcs_site/static/theme.css @@ -220,56 +220,3 @@ blockquote { margin-bottom:0; } -div.dailydharma h2{ - -moz-osx-font-smoothing:grayscale; - -webkit-font-smoothing:antialiased; - text-rendering:optimizeLegibility; - font:1.5em/1 gill-sans-condensed,Roboto Condensed,sans-serif; - text-transform:uppercase; -} -div.dailydharma{ - margin-top:4em; - margin-bottom:3em; - padding-right:1.3em; - padding-left:1.3em; - border:2px solid #ef582c; - clear:both;text-align:center -} -div.dailydharma h2{ - padding:.325em 1.3em .2em; - background-color:#ef582c; - color:#fff; - display:inline-block; - letter-spacing:.1em; - margin:-1.3em auto; -} - -.icon{ - background-position:center; - -moz-background-size:contain; - background-size:contain; - height:2.5rem; - width:2.5rem -} -.icon-quote{ - margin:1.3em auto .65em; - background-image:url("data:image/svg+xml;charset=US-ASCII,%3Csvg%20enable-background%3D%22new%200%200%2038%2031%22%20height%3D%2231%22%20viewBox%3D%220%200%2038%2031%22%20width%3D%2238%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%3E%3Cpath%20d%3D%22m36.39%200c-7.16%203.86-13.71%2011.34-13.71%2019.78%200%207.84%204.37%2011.22%208.37%2011.22%204.85%200%207.64-3.26%206.79-8.68-4.97-.72-8.01-3.86-8.01-7.96%200-4.71%203.03-8.69%208.13-12.18zm-22.68%200c-7.16%203.86-13.71%2011.34-13.71%2019.78%200%207.84%204.37%2011.22%208.37%2011.22%204.85%200%207.64-3.26%206.79-8.68-4.97-.72-8.01-3.86-8.01-7.96%200-4.71%203.03-8.69%208.13-12.18z%22%20fill%3D%22%23111%22/%3E%3C/svg%3E"); - background-repeat:no-repeat -} -.daily-quote{ - line-height:1.33; - color:#666566; - font-family:"Source Serif Pro", serif; - font-size:32px; - text-align:center; - -webkit-transition:.15s; - -o-transition:.15s; - -moz-transition:.15s;transition:.15s; -} -.daily-quote-author{ - color:#999; - font-style:normal; - font-family:Roboto Condensed,sans-serif; - text-align:center; - padding:1em; -} \ No newline at end of file diff --git a/tcs_site/templates/blog.jinja2 b/tcs_site/templates/blog.jinja2 index c89929d..928e1f7 100644 --- a/tcs_site/templates/blog.jinja2 +++ b/tcs_site/templates/blog.jinja2 @@ -20,7 +20,7 @@ {{ entry.author }} - Publié le {{ entry.create_date }}


-

{{ body_html | safe }}

+ {{ body_html | safe }}
{% if entry.source_link != '' %} @@ -37,6 +37,7 @@

{% if request.authenticated_userid %} Topic - Tag : {{ entry.topic_id }} - {{ entry.tag }}
+ Type : {{ entry.content_type }}
Language : {{ entry.language }}
Statut : {{ entry.status }}
{% endif %} diff --git a/tcs_site/templates/blog_edit.jinja2 b/tcs_site/templates/blog_edit.jinja2 index 1a0035e..dbcd086 100644 --- a/tcs_site/templates/blog_edit.jinja2 +++ b/tcs_site/templates/blog_edit.jinja2 @@ -12,6 +12,18 @@ +

+ + +
+
+
+ + +
+
+ + +
+ + @@ -202,7 +223,7 @@
-

© 2022-2024 - Méditation SUNYATA Paris - Hội Thiền Tánh Không Paris

+

© Copyright 2004-2006 by TCS-Association Culturelle

@@ -228,7 +249,7 @@ data-text-align="left" data-close-text="J'ai compris!" data-linkmsg = "Mentions légales" - data-moreinfo = "https://meditation-sunyata.paris/blog/1/mentions-legales" + data-moreinfo = "/blog/1/mentions-legales" data-message="Les cookies que nous utilisons sont nécessaires au bon fonctionnement du site. En continuant la visite, vous déclarez accepter leur utilisation."> diff --git a/tcs_site/templates/topic_edit.jinja2 b/tcs_site/templates/topic_edit.jinja2 index 938bfa8..9c6be0e 100644 --- a/tcs_site/templates/topic_edit.jinja2 +++ b/tcs_site/templates/topic_edit.jinja2 @@ -19,10 +19,12 @@
diff --git a/tcs_site/views/blog.py b/tcs_site/views/blog.py index 031e2ae..cd4ccb8 100644 --- a/tcs_site/views/blog.py +++ b/tcs_site/views/blog.py @@ -32,7 +32,7 @@ def blog(request): if entry.content_type == "text/markdown": # convertir de markdown en HTML body_html = markdown.markdown(body, extensions=['footnotes']) - elif entry.content_type == "text/structured": + elif entry.content_type == "text/x-rst": parts = core.publish_parts( source=body, writer_name='html') @@ -110,6 +110,8 @@ def blog_edit(request): entry['status'] = '' entry['creator'] = request.authenticated_userid entry['editor'] = '' + entry['language'] = 'vi' + entry['content_type'] = 'text/markdown' page_title = 'Nouvelle page' url_retour = request.route_url('topic', topic=topic) @@ -212,7 +214,7 @@ def topic(request): # lire toutes les docs du topic items = get_entries_by_topic(request, topic, tag.tag) if items: - liste += '
' + liste += '
' liste += '' for item in items: item_slug = urlify(item.title) @@ -221,7 +223,7 @@ def topic(request): liste += '' % item.author liste += '' % item.create_date if item.status != 'publié': - liste += '' % item.status + liste += '' % item.status liste += '' liste += '
%s%s%s%s
' else: