diff options
| -rw-r--r-- | content/resources/pubkey.asc | 58 | ||||
| -rwxr-xr-x | pelicanconf.py | 4 | ||||
| m--------- | theme/Flex | 0 | ||||
| -rwxr-xr-x | theme/custom/base.html | 180 | ||||
| -rw-r--r-- | theme/custom/partial/sidebar.html | 98 |
5 files changed, 149 insertions, 191 deletions
diff --git a/content/resources/pubkey.asc b/content/resources/pubkey.asc index bb86486..e6c101b 100644 --- a/content/resources/pubkey.asc +++ b/content/resources/pubkey.asc @@ -20,43 +20,43 @@ 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 -rc0b -=Jdtk +cgQYAQgAJgIbAhYhBCzgX5zrCyxEKskOPE28H2+vLwHVBQJjDxkpBQkHiwoWAUDA +dCAEGQEIAB0WIQTUlADp/RT9p3ov1672hZvDzHEt+AUCX0Z2EgAKCRD2hZvDzHEt ++PZbB/96vfQbatvRhjXnloUS+UkblHzvSij4de+eA7BxsEwewzJCDkZpwlU1XqBl +hgleXIbyg8ZolgkVlwqsSR199XhCGLevrTKxUT73cmK4YOSkYGf3ZfKYETGX43Rz +oIzIHkfnXgjzSpROZNsOv0tc2nx/nJuI3OdVmesLOK9epGnF/Xx7MeJN8j/yXWnV +wOUOM9/YxmQIytrKHemvUs+/URCWcw1WtV8+5aVEqOYv5aEqF0eH2ue85ZfCoblQ +Unkd9KNtXPXtZacECzfr5+isLajtvU+uoQSVKkJcEk1Vf324JfTN81y4AWquGH3h +zmTINbniThBEZgsN3zT7r1dS+uQGCRBNvB9vry8B1djeB/4/EkworAZQ3hlBpZiB +jK7bjy1TtdXrcuRJa0sZGW3ExKBbxS7uMdQ5bpGU+ciRJfst6qWhotQ3H9+6E/Md +dXHis+7k4fC0doMlZXfB0XIgkBHADEuHKbfpv+DbDYjMqpgUzYnIo95n+9gKzkoz +w7wjpBN8lDjNY64DPQ8OkHcAvQb+HvZAUnd5oXYp3I0rK2zvFtyhW8c7d5EDFysK +xpybu6RC07MJ1+VE2qN/avuQAu6IKFI0gY02+6qA2YPNt+tVuWT2OnygNQTS1FAp +XbxtuDISjMsLdLBJtmUJ2xqPV+G0Ta6aKj3Fr3zvBH+sfvc+k+qDACVeveQOlcpw +EW5o +=fC9L -----END PGP PUBLIC KEY BLOCK----- diff --git a/pelicanconf.py b/pelicanconf.py index 9026f97..47af293 100755 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -16,8 +16,8 @@ DEFAULT_LANG = u'fr' # ('You can modify those links in your config file', '#'),) # Social widget -#SOCIAL = (('You can add links in your config file', '#'), -# ('Another social link', '#'),) +SOCIAL = (('key', '/resources/pubkey.asc') + ,) FEED_DOMAIN = SITEURL FEED_RSS = 'feed' diff --git a/theme/Flex b/theme/Flex -Subproject cf45bc041258cd2696bb1b9a48f0631f9cf2042 +Subproject e63fdae267319fdfb5a0788fe2de9e75ce06356 diff --git a/theme/custom/base.html b/theme/custom/base.html index debd12b..da00963 100755 --- a/theme/custom/base.html +++ b/theme/custom/base.html @@ -3,6 +3,7 @@ {{ msg % kwargs }} {%- endmacro -%} {% endif %} + <!DOCTYPE html> <html lang="{{ DEFAULT_LANG }}"> <head> @@ -31,9 +32,9 @@ <meta name="HandheldFriendly" content="True" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> {% if page in hidden_pages %} - <meta name="robots" content="noindex, nofollow" /> + <meta name="robots" content="noindex, nofollow" /> {% else %} - <meta name="robots" content="{{ ROBOTS }}" /> + <meta name="robots" content="{{ ROBOTS }}" /> {% endif %} {% if USE_GOOGLE_FONTS != False %} @@ -102,38 +103,14 @@ <link href="{{ SITEURL }}/{{ CUSTOM_CSS }}" rel="stylesheet"> {% endif %} - {% if FEED_ALL_ATOM %} - <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom"> - {% endif %} - - {% if FEED_ALL_RSS %} - <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS"> - {% endif %} + {% include "partial/icon.html" %} - {% if FAVICON %} - <link rel="shortcut icon" href="{{ FAVICON }}" type="image/x-icon"> - <link rel="icon" href="{{ FAVICON }}" type="image/x-icon"> - {% endif %} + {% include "partial/color.html" %} - {% if GOOGLE_ANALYTICS %} - {% include "partial/ga.html" %} - {% endif %} - - {% if GOOGLE_GLOBAL_SITE_TAG %} - {% include "partial/ggst.html" %} - {% endif %} + {% include "partial/feed.html" %} - {% if BROWSER_COLOR %} - <!-- Chrome, Firefox OS and Opera --> - <meta name="theme-color" content="{{ BROWSER_COLOR }}"> - <!-- Windows Phone --> - <meta name="msapplication-navbutton-color" content="{{ BROWSER_COLOR }}"> - <!-- iOS Safari --> - <meta name="apple-mobile-web-app-capable" content="yes"> - <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> - <!-- Microsoft EDGE --> - <meta name="msapplication-TileColor" content="{{ BROWSER_COLOR }}"> - {% endif %} + {% include "partial/ga.html" %} + {% include "partial/ggst.html" %} {% if not PLUGINS or 'seo' not in PLUGINS %} {% if REL_CANONICAL %} @@ -168,99 +145,15 @@ }); </script> {% endif %} - {% if GOOGLE_TAG_MANAGER %} - {% include "partial/gtm.html" %} - {% endif %} - {% if MICROSOFT_CLARITY %} - {% include "partial/clarity.html" %} - {% endif %} + + {% include "partial/gtm.html" %} + {% include "partial/clarity.html" %} </head> <body {% if not THEME_COLOR_AUTO_DETECT_BROWSER_PREFERENCE %}class="{{ THEME_COLOR|default('light') }}-theme"{% endif %}> - {% if GOOGLE_TAG_MANAGER %} - {% include "partial/gtm_noscript.html" %} - {% endif %} - <aside> - <div> - <a href="{{ SITEURL }}/"> - {% if SITELOGO %} - <img src="{{ SITELOGO }}" alt="{{ SITETITLE }}" title="{{ SITETITLE }}"> - {% else %} - <img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/img/profile.png" alt="{{ SITETITLE }}" title="{{ SITETITLE }}"> - {% endif %} - </a> - - <h1> - <a href="{{ SITEURL }}/">{{ SITETITLE }}</a> - </h1> - - {% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %} - - {% if PLUGINS and 'tipue_search' in PLUGINS %} - <form class="navbar-search" action="{{ SITEURL }}/search.html" role="search"> - <input type="text" name="q" id="tipue_search_input" placeholder="{{ _('Search...') }}"> - </form> - {% endif %} - - {% if pages or LINKS %} - <nav> - <ul class="list"> - {# Open links in new window depending on the LINKS_IN_NEW_TAB setting #} - {% macro get_target(link) -%} - {%- if LINKS_IN_NEW_TAB in ('all', true) -%} - _blank - {%- elif LINKS_IN_NEW_TAB == "external" and not link.startswith("/") and not link.startswith(SITEURL) -%} - _blank - {%- else -%} - _self - {%- endif -%} - {%- endmacro %} - - {% if PAGES_SORT_ATTRIBUTE -%} - {% set pages = pages|sort(attribute=PAGES_SORT_ATTRIBUTE) %} - {%- endif %} - - {% if DISPLAY_PAGES_ON_MENU %} - {% for page in pages %} - <li> - <a target="{{ get_target(SITEURL) }}" - href="{{ SITEURL }}/{{ page.url }}{% if not DISABLE_URL_HASH %}#{{ page.slug }}{% endif %}"> - {{ page.title }} - </a> - </li> - {% endfor %} - {% endif %} - - {% for name, link in LINKS %} - <li> - <a target="{{ get_target(link) }}" href="{{ link }}" >{{ name }}</a> - </li> - {% endfor %} - </ul> - </nav> - {% endif %} + {% include "partial/gtm_noscript.html" %} - <ul class="social"> - {% for name, link in SOCIAL %} - <li> - <a {% if name == 'mastodon' %}rel="me"{% endif %} class="sc-{{ name }}" href="{{ link }}" target="_blank"> - <i class="{% if name in ['envelope', 'rss'] %}fas{% else %}fab{% endif %} fa-{{ name }}"></i> - </a> - </li> - {% endfor %} - </ul> - <button class="theme-switch"><i class="fa fa-adjust fa-2x" aria-hidden="true" onclick="modeSwitcher()"></i></button> - </div> + {% include "partial/sidebar.html" %} - {% if GOOGLE_ADSENSE and GOOGLE_ADSENSE.ads.aside %} - <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script> - <ins class="adsbygoogle ads-aside" - data-ad-client="{{ GOOGLE_ADSENSE.ca_id }}" - data-ad-slot="{{ GOOGLE_ADSENSE.ads.aside }}"></ins> - <script> - (adsbygoogle = window.adsbygoogle || []).push({}); - </script> - {% endif %} - </aside> <main> {% if GOOGLE_ADSENSE and GOOGLE_ADSENSE.ads.main_menu %} <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script> @@ -272,53 +165,20 @@ </script> {% endif %} - {% if MAIN_MENU %} - <nav> - <a href="{{ SITEURL }}/">{{ _('Home') }}</a> - - {% for title, link in MENUITEMS %} - <a href="{{ link }}">{{ _(title) }}</a> - {% endfor %} - - {% if FEED_ALL_ATOM %} - <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}">{{ _('Atom') }}</a> - {% endif %} - - {% if FEED_ALL_RSS %} - <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}">{{ _('RSS') }}</a> - {% endif %} - </nav> - {% endif %} + {% include "partial/nav.html" %} {% block content %} {% endblock %} - <footer> - {% if CC_LICENSE %} - {% include "partial/cc_license.html" %} - {% else %} - {% include "partial/copyright.html" %} - {% endif %} - </footer> + {% include "partial/footer.html" %} </main> - {% if GUAGES %} - {% include "partial/guages.html" %} - {% endif %} - - {% if ADD_THIS_ID %} - <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid={{ ADD_THIS_ID }}" async="async"></script> - {% endif %} - - {% if (PIWIK_URL and PIWIK_SITE_ID) or (MATOMO_URL and MATOMO_SITE_ID) %} - {% include "partial/matomo.html" %} - {% endif %} - {% include "partial/jsonld.html" %} - - {% if GITHUB_CORNER_URL %} - {% include 'partial/github.html' %} - {% endif %} + {% include "partial/guages.html" %} + {% include "partial/addthis.html" %} + {% include "partial/matomo.html" %} + {% include 'partial/github.html' %} + {% include 'partial/stork.html' %} {% block additional_js %}{% endblock %} </body> diff --git a/theme/custom/partial/sidebar.html b/theme/custom/partial/sidebar.html new file mode 100644 index 0000000..e4ae53f --- /dev/null +++ b/theme/custom/partial/sidebar.html @@ -0,0 +1,98 @@ +<aside> + <div> + <a href="{{ SITEURL }}/"> + {% if SITELOGO %} + <img src="{{ SITELOGO }}" alt="{{ SITETITLE }}" title="{{ SITETITLE }}"> + {% else %} + <img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/img/profile.png" alt="{{ SITETITLE }}" title="{{ SITETITLE }}"> + {% endif %} + </a> + + <h1> + <a href="{{ SITEURL }}/">{{ SITETITLE }}</a> + </h1> + + {% if SITESUBTITLE %} + <p>{{ SITESUBTITLE }}</p> + {% endif %} + + {% if PLUGINS %} + {% if ('tipue_search' in PLUGINS or 'pelican.plugins.tipue_search' in PLUGINS) %} + <form class="navbar-search" action="{{ SITEURL }}/search.html" role="search"> + <input type="text" name="q" id="tipue_search_input" placeholder="{{ _('Search...') }}"> + </form> + {% elif 'pelican.plugins.search' in PLUGINS %} + <div class="stork"> + <input class="stork-input" type="text" autocomplete="off" name="q" data-stork="sitesearch" placeholder="{{ _('Search...') }}"/> + <div class="stork-output" data-stork="sitesearch-output"></div> + </div> + {% endif %} + {% endif %} + + {% if (pages and DISPLAY_PAGES_ON_MENU) or LINKS %} + <nav> + <ul class="list"> + {# Open links in new window depending on the LINKS_IN_NEW_TAB setting #} + {% macro get_target(link) -%} + {%- if LINKS_IN_NEW_TAB in ('all', true) -%} + _blank + {%- elif LINKS_IN_NEW_TAB == "external" and not link.startswith("/") and not link.startswith(SITEURL) -%} + _blank + {%- else -%} + _self + {%- endif -%} + {%- endmacro %} + + {% if PAGES_SORT_ATTRIBUTE -%} + {% set pages = pages|sort(attribute=PAGES_SORT_ATTRIBUTE) %} + {%- endif %} + + {% if DISPLAY_PAGES_ON_MENU %} + {% for page in pages %} + <li> + <a target="{{ get_target(SITEURL) }}" + href="{{ SITEURL }}/{{ page.url }}{% if not DISABLE_URL_HASH %}#{{ page.slug }}{% endif %}"> + {{ page.title }} + </a> + </li> + {% endfor %} + {% endif %} + + {% for name, link in LINKS %} + <li> + <a target="{{ get_target(link) }}" href="{{ link }}" >{{ name }}</a> + </li> + {% endfor %} + </ul> + </nav> + {% endif %} + + {% if SOCIAL %} + {% set solid = ['at', 'envelope', 'mailbox', 'rss'] %} + {% set relme = ['at', 'envelope', 'mailbox', 'mastodon'] %} + <ul class="social"> + {% for name, link in SOCIAL %} + <li> + <a class="sc-{{ name }}" + {% if name in relme %}rel="me"{% endif %} + href="{{ link }}" + target="_blank"> + <i class="{% if name in solid %}fa-solid{% else %}fa{% endif %} fa-{{ name }}"></i> + </a> + </li> + {% endfor %} + </ul> + {% endif %} + <button class="theme-switch"><i class="fa fa-adjust fa-2x" aria-hidden="true" onclick="modeSwitcher()"></i></button> + </div> + + {% if GOOGLE_ADSENSE and GOOGLE_ADSENSE.ads.aside %} + <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script> + <ins class="adsbygoogle ads-aside" + data-ad-client="{{ GOOGLE_ADSENSE.ca_id }}" + data-ad-slot="{{ GOOGLE_ADSENSE.ads.aside }}"></ins> + <script> + (adsbygoogle = window.adsbygoogle || []).push({}); + </script> + {% endif %} +</aside> |