From 7fd75dc768ab30d6f8e9719328e9a69b2319e481 Mon Sep 17 00:00:00 2001 From: mose Date: Tue, 29 Aug 2017 03:25:46 +0800 Subject: [PATCH] fix circles --- _config.yml | 2 -- _devconfig.yml | 6 ++--- _includes/footer.html | 1 - _includes/printmsgpages.html | 1 - _includes/printmsgposts.html | 1 - _layouts/default.html | 4 +-- _layouts/post.html | 30 ++++++++++++++++----- _posts/2017-04-12-or_noir.md | 2 +- _posts/2017-04-15-big_data_pour_les_nuls.md | 2 +- _posts/2017-04-17-acces_raisonnable.md | 2 +- _posts/2017-05-28-engager_2050.md | 2 -- cercles.md | 14 ---------- public/css/addon.css | 10 +++++++ syspages/404.md | 7 ----- syspages/cercles.md | 23 ++++++++++++++++ syspages/news.md | 2 +- syspages/resume.md | 8 ------ textes/index.html | 23 ++++++++++++---- 18 files changed, 82 insertions(+), 58 deletions(-) delete mode 100644 cercles.md create mode 100644 syspages/cercles.md delete mode 100644 syspages/resume.md diff --git a/_config.yml b/_config.yml index 6caa2b3..bd5fd4d 100644 --- a/_config.yml +++ b/_config.yml @@ -63,8 +63,6 @@ links: url: /crapauds/ - title: Partenaires url: /partenaires/ - - title: Contact - url: /contact/ - title: Source url: https://github.com/crazy-toads/crazy-toads.github.io external: true diff --git a/_devconfig.yml b/_devconfig.yml index 696f401..15c45ec 100644 --- a/_devconfig.yml +++ b/_devconfig.yml @@ -14,7 +14,7 @@ url: http://localhost:4000 baseurl: "" urlimg: http://localhost:4000/images markdown: kramdown -paginate: 5 +paginate: 10 paginate_path: "/textes/page:num" excerpt_separator: default_bg: sitelogo.png @@ -60,12 +60,12 @@ links: url: / - title: Textes url: /textes/ + - title: Cercles + url: /cercles/ - title: Crapauds url: /crapauds/ - title: Partenaires url: /partenaires/ - - title: Contact - url: /contact/ - title: Source url: https://github.com/crazy-toads/crazy-toads.github.io external: true diff --git a/_includes/footer.html b/_includes/footer.html index 68dbf9a..6c4ae06 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -3,7 +3,6 @@ 2016-{{ site.time | date: '%Y' }} - les Crapauds Fous - - c'est quoi ça? diff --git a/_includes/printmsgpages.html b/_includes/printmsgpages.html index 29852d8..4820417 100644 --- a/_includes/printmsgpages.html +++ b/_includes/printmsgpages.html @@ -2,7 +2,6 @@ - diff --git a/_includes/printmsgposts.html b/_includes/printmsgposts.html index 4537f8f..7565f4c 100644 --- a/_includes/printmsgposts.html +++ b/_includes/printmsgposts.html @@ -2,7 +2,6 @@
@{{ site.owner.twitter }} QR code
- diff --git a/_layouts/default.html b/_layouts/default.html index fabda87..90a13e6 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -21,9 +21,7 @@ Credits: {{ site.url }}/disclosure {{ site.title }}
- - - + Textes
diff --git a/_layouts/post.html b/_layouts/post.html index 5d3b81d..be5ef67 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -4,14 +4,30 @@ layout: default

{{ page.title }}

- - {% if page.modified.size > 2 %}{% assign moddate = page.modified | date_to_string %}{% assign pgdate = page.date | date_to_string %}{% unless moddate == pgdate | date_to_string %} {{ page.modified | date_to_string }}{% endunless %}{% endif %} - {% for tag in page.tags %}{% if forloop.first %}{% endif %} {% unless forloop.last %} • {% endunless %}{% endfor %} - {% unless page.show_meta == false %} - {% include meta_info.html %} - {% endunless %} + + {% if page.modified.size > 2 %} + {% assign moddate = page.modified | date_to_string %} + {% assign pgdate = page.date | date_to_string %} + {% unless moddate == pgdate | date_to_string %} + {{ page.modified | date_to_string }} + {% endunless %} + {% endif %} + + {% for tag in page.categories %} + {% if forloop.first %} + + {% endif %} + {{ tag }} + {% unless forloop.last %} • {% endunless %} + {% endfor %} + {% unless page.show_meta == false %} + {% include meta_info.html %} + {% endunless %} {% if page.authors %} -
par {{ page.authors }}
+
Par {{ page.authors }}
{% endif %} {{ content }} diff --git a/_posts/2017-04-12-or_noir.md b/_posts/2017-04-12-or_noir.md index a081cc1..0c9db89 100644 --- a/_posts/2017-04-12-or_noir.md +++ b/_posts/2017-04-12-or_noir.md @@ -6,7 +6,7 @@ date: "2017-04-12" slug: "or_noir" description: "Utiliser son téléphone ou internet, c’est céder gratuitement des informations, des données. De quelles données parlons-nous ? Comment sont-elles utilisées ?" categories: - - big data + - BigData --- ### Vous avez dit data ? diff --git a/_posts/2017-04-15-big_data_pour_les_nuls.md b/_posts/2017-04-15-big_data_pour_les_nuls.md index a4fdc24..d521169 100644 --- a/_posts/2017-04-15-big_data_pour_les_nuls.md +++ b/_posts/2017-04-15-big_data_pour_les_nuls.md @@ -6,7 +6,7 @@ date: "2017-04-15" slug: "big_data_pour_les_nuls" description: "Les sociétés technologiques du 21ème siècle amassent de grandes quantités de données sur leurs utilisateurs. Ce nouveau business model soulève nombre de questions d’ordre éthique." categories: - - big data + - BigData --- ### Règles d’éthiques des big data du point de vue des entreprises diff --git a/_posts/2017-04-17-acces_raisonnable.md b/_posts/2017-04-17-acces_raisonnable.md index 1c6e6a1..59257fa 100644 --- a/_posts/2017-04-17-acces_raisonnable.md +++ b/_posts/2017-04-17-acces_raisonnable.md @@ -6,7 +6,7 @@ date: "2017-04-17" slug: "acces_raisonnable" description: "Si Internet favorisait non l’information, mais la désinformation ? Et si, pire, Internet ne facilitait en rien la naissance d’une information pure et parfaite, mais au contraire la confrontation stérile de points de vue." categories: - - big data + - BigData --- Pour peu que l’on parte du principe simple que le citoyen fait les mauvais choix parce qu’il est mal informé (logique à l’origine de la représentation du rôle de la presse libre dans les démocraties), alors Internet devrait sonner le début d’une ère de connaissance pure, et de triomphe de la vérité scientifique. Et là, apparaissent les fake news, et tout s’effondre. diff --git a/_posts/2017-05-28-engager_2050.md b/_posts/2017-05-28-engager_2050.md index 2f2075c..77802f3 100644 --- a/_posts/2017-05-28-engager_2050.md +++ b/_posts/2017-05-28-engager_2050.md @@ -8,8 +8,6 @@ authors: date: "2017-05-28" slug: "engager_2050" description: "La Génération 2050 porte une double charge : redonner espoir et avancer malgré les décombres." -categories: - - Europe --- ## Résumé diff --git a/cercles.md b/cercles.md deleted file mode 100644 index d3ce8f0..0000000 --- a/cercles.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -layout: default -title: Les 9 Cercles -description: "Les 9 Cercles" ---- - -{% for category in site.categories %} -{{ category | first }} -{% for posts in category %} - {% for post in posts %} - {{ post.title }} - {% endfor %} -{% endfor %} -{% endfor %} diff --git a/public/css/addon.css b/public/css/addon.css index f39de92..fce1c7c 100644 --- a/public/css/addon.css +++ b/public/css/addon.css @@ -37,6 +37,9 @@ .posts.list h3 { margin-bottom: 0; } +.posts.list .post-tags { + display: inline-block; +} .posts.list .post-date { margin: 0; } @@ -44,3 +47,10 @@ .custom-footer { margin-top: 40px; } + +.headicons { + float: right; +} +.social-icons { + float: right; +} diff --git a/syspages/404.md b/syspages/404.md index 5fd5e4f..95badd8 100644 --- a/syspages/404.md +++ b/syspages/404.md @@ -11,13 +11,6 @@ category: base

Sorry! The page you were trying to view does not exist.

Perhaps you may have error while typing web address. If not, you may tweet me to fix missing link. Thanks!

-
- - -
- -{:.text-center} -You may also visit [tags]({{ site.url }}/tags) or [archive]({{ site.url }}/archive) page to browse website contents.
diff --git a/syspages/cercles.md b/syspages/cercles.md new file mode 100644 index 0000000..bb868cd --- /dev/null +++ b/syspages/cercles.md @@ -0,0 +1,23 @@ +--- +layout: page +title: "Cercles" +permalink: "/cercles/" +description: "Classement par categories" +comments: false +sitemap: false +category: base +--- + +{% capture site_categories %}{% for cercle in site.categories %}{{ cercle | first }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %} +{% assign categories_list = site_categories | split:',' | sort %} + +{% for item in (0..site.categories.size) %}{% unless forloop.last %} + {% capture this_word %}{{ categories_list[item] | strip_newlines }}{% endcapture %} +

{{ this_word }}

+ +{% endunless %}{% endfor %} + diff --git a/syspages/news.md b/syspages/news.md index 39089a0..5c425a4 100644 --- a/syspages/news.md +++ b/syspages/news.md @@ -3,6 +3,6 @@ title: "Redirecting to Blog" layout: redirect sitemap: false permalink: /news/ -redirect_to: /blog/ +redirect_to: /textes/ #teaser: SYSTEM GENERATED PAGE FOR PAGE REDIRECT FUNCTION. DO NOT EDIT/RENAME/REMOVE THIS PAGE. --- diff --git a/syspages/resume.md b/syspages/resume.md deleted file mode 100644 index 8a1b24c..0000000 --- a/syspages/resume.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -title: "Redirecting to Curriculum Vitae page" -layout: redirect -sitemap: true -permalink: /resume/ -redirect_to: /cv/ -#teaser: SYSTEM GENERATED PAGE FOR PAGE REDIRECT FUNCTION. DO NOT EDIT/RENAME/REMOVE THIS PAGE. ---- diff --git a/textes/index.html b/textes/index.html index 6fa820a..5ae6fac 100644 --- a/textes/index.html +++ b/textes/index.html @@ -12,10 +12,23 @@ description: "Les ecrits des Crapauds fous" {{ post.title }} - {{ post.description | markdownify | remove: '

' | remove: '

' }} + {{ post.description | markdownify | remove: '

' | remove: '

' }}
- {% if post.modified.size > 2 %} {{ post.modified | date_to_string }} {% if post.category contains "featured" %}{% endif %}{% else %}{% endif %} + {% if post.modified.size > 2 %} + {{ post.modified | date_to_string }} {% if post.category contains "featured" %}{% endif %} + {% else %} + + {% endif %} + + {% for tag in post.categories %} + {% if forloop.first %} + + {% endif %} + {{ tag }} + {% unless forloop.last %} • {% endunless %} + {% endfor %} +
{% unless forloop.last %}
{% endunless %} {% endfor %} @@ -23,15 +36,15 @@ description: "Les ecrits des Crapauds fous"
@{{ site.owner.twitter }} QR code