index.html: Homogénéisation de l'indentation

Suppression du mélange d'indentation entre tabulations et espace, tout est passé en espace (2)

.editorconfig

@@ -0,0 +1,21 @@
+root = true
+
+[*]
+end_of_line = lf
+trim_trailing_whitespace = true
+charset = utf-8
+
+[*.{html,css,js}]
+indent_style = space
+indent_size = 2
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
+
+[*.json]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false

.woodpecker.yaml

@@ -1,8 +1,20 @@
 steps:
-  - name: upload
+  - name: HTML syntax check
+    image: debian:12
+    # Debian has tidy 5.6.0, which complains about the "loading" tag in img.
+    # We need a more recent version for now.
+    commands:
+      - DEBIAN_FRONTEND=noninteractive apt update -qq
+      - DEBIAN_FRONTEND=noninteractive apt install -qq -y wget
+      - wget -q https://github.com/htacg/tidy-html5/releases/download/5.8.0/tidy-5.8.0-Linux-64bit.deb
+      - echo "59e594312207234f5a17455683c13c6bc47a89cb7bf994d493acfffb591d9830 tidy-5.8.0-Linux-64bit.deb" | sha256sum -c
+      - DEBIAN_FRONTEND=noninteractive apt install -qq -y ./tidy-5.8.0-Linux-64bit.deb
+      - tidy -q -e static/index.html
+
+  - name: upload (preprod)
     when:
-      branch:
+      event: [push, pull_request]
-        - preprod
+      branch: preprod
     image: plugins/s3
     settings:
       bucket: preprod-site
@@ -15,6 +27,22 @@ steps:
       source: static/**/*
       target: /
       strip_prefix: static/
-      # a bit more robust: do not require the let's encrypt certificate to be
+      path_style: true
-      # working for the subdomain
+
+  - name: upload (prod)
+    when:
+      - event: push
+        branch: main
+    image: plugins/s3
+    settings:
+      bucket: deuxfleurs.fr
+      endpoint: https://garage.deuxfleurs.fr
+      region: garage
+      access_key:
+        from_secret: aws_access_key_id
+      secret_key:
+        from_secret: aws_secret_access_key
+      source: static/**/*
+      target: /
+      strip_prefix: static/
       path_style: true

LICENSE

@@ -1,614 +0,0 @@
-GNU AFFERO GENERAL PUBLIC LICENSE
-
-Version 3, 19 November 2007
-
-Copyright (C) 2007 Free Software Foundation, Inc. <http s ://fsf.org/>
-
-Everyone is permitted to copy and distribute verbatim copies of this license
-document, but changing it is not allowed.
-
-Preamble
-
-The GNU Affero General Public License is a free, copyleft license for software
-and other kinds of works, specifically designed to ensure cooperation with
-the community in the case of network server software.
-
-The licenses for most software and other practical works are designed to take
-away your freedom to share and change the works. By contrast, our General
-Public Licenses are intended to guarantee your freedom to share and change
-all versions of a program--to make sure it remains free software for all its
-users.
-
-When we speak of free software, we are referring to freedom, not price. Our
-General Public Licenses are designed to make sure that you have the freedom
-to distribute copies of free software (and charge for them if you wish), that
-you receive source code or can get it if you want it, that you can change
-the software or use pieces of it in new free programs, and that you know you
-can do these things.
-
-Developers that use our General Public Licenses protect your rights with two
-steps: (1) assert copyright on the software, and (2) offer you this License
-which gives you legal permission to copy, distribute and/or modify the software.
-
-A secondary benefit of defending all users' freedom is that improvements made
-in alternate versions of the program, if they receive widespread use, become
-available for other developers to incorporate. Many developers of free software
-are heartened and encouraged by the resulting cooperation. However, in the
-case of software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and letting
-the public access it on a server without ever releasing its source code to
-the public.
-
-The GNU Affero General Public License is designed specifically to ensure that,
-in such cases, the modified source code becomes available to the community.
-It requires the operator of a network server to provide the source code of
-the modified version running there to the users of that server. Therefore,
-public use of a modified version, on a publicly accessible server, gives the
-public access to the source code of the modified version.
-
-An older license, called the Affero General Public License and published by
-Affero, was designed to accomplish similar goals. This is a different license,
-not a version of the Affero GPL, but Affero has released a new version of
-the Affero GPL which permits relicensing under this license.
-
-The precise terms and conditions for copying, distribution and modification
-follow.
-
-TERMS AND CONDITIONS
-
-   0. Definitions.
-
-   "This License" refers to version 3 of the GNU Affero General Public License.
-
-"Copyright" also means copyright-like laws that apply to other kinds of works,
-such as semiconductor masks.
-
-"The Program" refers to any copyrightable work licensed under this License.
-Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals
-or organizations.
-
-To "modify" a work means to copy from or adapt all or part of the work in
-a fashion requiring copyright permission, other than the making of an exact
-copy. The resulting work is called a "modified version" of the earlier work
-or a work "based on" the earlier work.
-
-A "covered work" means either the unmodified Program or a work based on the
-Program.
-
-To "propagate" a work means to do anything with it that, without permission,
-would make you directly or secondarily liable for infringement under applicable
-copyright law, except executing it on a computer or modifying a private copy.
-Propagation includes copying, distribution (with or without modification),
-making available to the public, and in some countries other activities as
-well.
-
-To "convey" a work means any kind of propagation that enables other parties
-to make or receive copies. Mere interaction with a user through a computer
-network, with no transfer of a copy, is not conveying.
-
-An interactive user interface displays "Appropriate Legal Notices" to the
-extent that it includes a convenient and prominently visible feature that
-(1) displays an appropriate copyright notice, and (2) tells the user that
-there is no warranty for the work (except to the extent that warranties are
-provided), that licensees may convey the work under this License, and how
-to view a copy of this License. If the interface presents a list of user commands
-or options, such as a menu, a prominent item in the list meets this criterion.
-
-   1. Source Code.
-
-The "source code" for a work means the preferred form of the work for making
-modifications to it. "Object code" means any non-source form of a work.
-
-A "Standard Interface" means an interface that either is an official standard
-defined by a recognized standards body, or, in the case of interfaces specified
-for a particular programming language, one that is widely used among developers
-working in that language.
-
-The "System Libraries" of an executable work include anything, other than
-the work as a whole, that (a) is included in the normal form of packaging
-a Major Component, but which is not part of that Major Component, and (b)
-serves only to enable use of the work with that Major Component, or to implement
-a Standard Interface for which an implementation is available to the public
-in source code form. A "Major Component", in this context, means a major essential
-component (kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to produce
-the work, or an object code interpreter used to run it.
-
-The "Corresponding Source" for a work in object code form means all the source
-code needed to generate, install, and (for an executable work) run the object
-code and to modify the work, including scripts to control those activities.
-However, it does not include the work's System Libraries, or general-purpose
-tools or generally available free programs which are used unmodified in performing
-those activities but which are not part of the work. For example, Corresponding
-Source includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically linked
-subprograms that the work is specifically designed to require, such as by
-intimate data communication or control flow between those
-
-   subprograms and other parts of the work.
-
-The Corresponding Source need not include anything that users can regenerate
-automatically from other parts of the Corresponding Source.
-
-   The Corresponding Source for a work in source code form is that same work.
-
-   2. Basic Permissions.
-
-All rights granted under this License are granted for the term of copyright
-on the Program, and are irrevocable provided the stated conditions are met.
-This License explicitly affirms your unlimited permission to run the unmodified
-Program. The output from running a covered work is covered by this License
-only if the output, given its content, constitutes a covered work. This License
-acknowledges your rights of fair use or other equivalent, as provided by copyright
-law.
-
-You may make, run and propagate covered works that you do not convey, without
-conditions so long as your license otherwise remains in force. You may convey
-covered works to others for the sole purpose of having them make modifications
-exclusively for you, or provide you with facilities for running those works,
-provided that you comply with the terms of this License in conveying all material
-for which you do not control copyright. Those thus making or running the covered
-works for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of your copyrighted
-material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under the conditions
-stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-
-   3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-No covered work shall be deemed part of an effective technological measure
-under any applicable law fulfilling obligations under article 11 of the WIPO
-copyright treaty adopted on 20 December 1996, or similar laws prohibiting
-or restricting circumvention of such measures.
-
-When you convey a covered work, you waive any legal power to forbid circumvention
-of technological measures to the extent such circumvention is effected by
-exercising rights under this License with respect to the covered work, and
-you disclaim any intention to limit operation or modification of the work
-as a means of enforcing, against the work's users, your or third parties'
-legal rights to forbid circumvention of technological measures.
-
-   4. Conveying Verbatim Copies.
-
-You may convey verbatim copies of the Program's source code as you receive
-it, in any medium, provided that you conspicuously and appropriately publish
-on each copy an appropriate copyright notice; keep intact all notices stating
-that this License and any non-permissive terms added in accord with section
-7 apply to the code; keep intact all notices of the absence of any warranty;
-and give all recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey, and you
-may offer support or warranty protection for a fee.
-
-   5. Conveying Modified Source Versions.
-
-You may convey a work based on the Program, or the modifications to produce
-it from the Program, in the form of source code under the terms of section
-4, provided that you also meet all of these conditions:
-
-a) The work must carry prominent notices stating that you modified it, and
-giving a relevant date.
-
-b) The work must carry prominent notices stating that it is released under
-this License and any conditions added under section 7. This requirement modifies
-the requirement in section 4 to "keep intact all notices".
-
-c) You must license the entire work, as a whole, under this License to anyone
-who comes into possession of a copy. This License will therefore apply, along
-with any applicable section 7 additional terms, to the whole of the work,
-and all its parts, regardless of how they are packaged. This License gives
-no permission to license the work in any other way, but it does not invalidate
-such permission if you have separately received it.
-
-d) If the work has interactive user interfaces, each must display Appropriate
-Legal Notices; however, if the Program has interactive interfaces that do
-not display Appropriate Legal Notices, your work need not make them do so.
-
-A compilation of a covered work with other separate and independent works,
-which are not by their nature extensions of the covered work, and which are
-not combined with it such as to form a larger program, in or on a volume of
-a storage or distribution medium, is called an "aggregate" if the compilation
-and its resulting copyright are not used to limit the access or legal rights
-of the compilation's users beyond what the individual works permit. Inclusion
-of a covered work in an aggregate does not cause this License to apply to
-the other parts of the aggregate.
-
-   6. Conveying Non-Source Forms.
-
-You may convey a covered work in object code form under the terms of sections
-4 and 5, provided that you also convey the machine-readable Corresponding
-Source under the terms of this License, in one of these ways:
-
-a) Convey the object code in, or embodied in, a physical product (including
-a physical distribution medium), accompanied by the Corresponding Source fixed
-on a durable physical medium customarily used for software interchange.
-
-b) Convey the object code in, or embodied in, a physical product (including
-a physical distribution medium), accompanied by a written offer, valid for
-at least three years and valid for as long as you offer spare parts or customer
-support for that product model, to give anyone who possesses the object code
-either (1) a copy of the Corresponding Source for all the software in the
-product that is covered by this License, on a durable physical medium customarily
-used for software interchange, for a price no more than your reasonable cost
-of physically performing this conveying of source, or (2) access to copy the
-Corresponding Source from a network server at no charge.
-
-c) Convey individual copies of the object code with a copy of the written
-offer to provide the Corresponding Source. This alternative is allowed only
-occasionally and noncommercially, and only if you received the object code
-with such an offer, in accord with subsection 6b.
-
-d) Convey the object code by offering access from a designated place (gratis
-or for a charge), and offer equivalent access to the Corresponding Source
-in the same way through the same place at no further charge. You need not
-require recipients to copy the Corresponding Source along with the object
-code. If the place to copy the object code is a network server, the Corresponding
-Source may be on a different server (operated by you or a third party) that
-supports equivalent copying facilities, provided you maintain clear directions
-next to the object code saying where to find the Corresponding Source. Regardless
-of what server hosts the Corresponding Source, you remain obligated to ensure
-that it is available for as long as needed to satisfy these requirements.
-
-e) Convey the object code using peer-to-peer transmission, provided you inform
-other peers where the object code and Corresponding Source of the work are
-being offered to the general public at no charge under subsection 6d.
-
-A separable portion of the object code, whose source code is excluded from
-the Corresponding Source as a System Library, need not be included in conveying
-the object code work.
-
-A "User Product" is either (1) a "consumer product", which means any tangible
-personal property which is normally used for personal, family, or household
-purposes, or (2) anything designed or sold for incorporation into a dwelling.
-In determining whether a product is a consumer product, doubtful cases shall
-be resolved in favor of coverage. For a particular product received by a particular
-user, "normally used" refers to a typical or common use of that class of product,
-regardless of the status of the particular user or of the way in which the
-particular user actually uses, or expects or is expected to use, the product.
-A product is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent the
-only significant mode of use of the product.
-
-"Installation Information" for a User Product means any methods, procedures,
-authorization keys, or other information required to install and execute modified
-versions of a covered work in that User Product from a modified version of
-its Corresponding Source. The information must suffice to ensure that the
-continued functioning of the modified object code is in no case prevented
-or interfered with solely because modification has been made.
-
-If you convey an object code work under this section in, or with, or specifically
-for use in, a User Product, and the conveying occurs as part of a transaction
-in which the right of possession and use of the User Product is transferred
-to the recipient in perpetuity or for a fixed term (regardless of how the
-transaction is characterized), the Corresponding Source conveyed under this
-section must be accompanied by the Installation Information. But this requirement
-does not apply if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has been installed
-in ROM).
-
-The requirement to provide Installation Information does not include a requirement
-to continue to provide support service, warranty, or updates for a work that
-has been modified or installed by the recipient, or for the User Product in
-which it has been modified or installed. Access to a network may be denied
-when the modification itself materially and adversely affects the operation
-of the network or violates the rules and protocols for communication across
-the network.
-
-Corresponding Source conveyed, and Installation Information provided, in accord
-with this section must be in a format that is publicly documented (and with
-an implementation available to the public in source code form), and must require
-no special password or key for unpacking, reading or copying.
-
-   7. Additional Terms.
-
-"Additional permissions" are terms that supplement the terms of this License
-by making exceptions from one or more of its conditions. Additional permissions
-that are applicable to the entire Program shall be treated as though they
-were included in this License, to the extent that they are valid under applicable
-law. If additional permissions apply only to part of the Program, that part
-may be used separately under those permissions, but the entire Program remains
-governed by this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option remove any
-additional permissions from that copy, or from any part of it. (Additional
-permissions may be written to require their own removal in certain cases when
-you modify the work.) You may place additional permissions on material, added
-by you to a covered work, for which you have or can give appropriate copyright
-permission.
-
-Notwithstanding any other provision of this License, for material you add
-to a covered work, you may (if authorized by the copyright holders of that
-material) supplement the terms of this License with terms:
-
-a) Disclaiming warranty or limiting liability differently from the terms of
-sections 15 and 16 of this License; or
-
-b) Requiring preservation of specified reasonable legal notices or author
-attributions in that material or in the Appropriate Legal Notices displayed
-by works containing it; or
-
-c) Prohibiting misrepresentation of the origin of that material, or requiring
-that modified versions of such material be marked in reasonable ways as different
-from the original version; or
-
-d) Limiting the use for publicity purposes of names of licensors or authors
-of the material; or
-
-e) Declining to grant rights under trademark law for use of some trade names,
-trademarks, or service marks; or
-
-f) Requiring indemnification of licensors and authors of that material by
-anyone who conveys the material (or modified versions of it) with contractual
-assumptions of liability to the recipient, for any liability that these contractual
-assumptions directly impose on those licensors and authors.
-
-All other non-permissive additional terms are considered "further restrictions"
-within the meaning of section 10. If the Program as you received it, or any
-part of it, contains a notice stating that it is governed by this License
-along with a term that is a further restriction, you may remove that term.
-If a license document contains a further restriction but permits relicensing
-or conveying under this License, you may add to a covered work material governed
-by the terms of that license document, provided that the further restriction
-does not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you must place,
-in the relevant source files, a statement of the additional terms that apply
-to those files, or a notice indicating where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the form
-of a separately written license, or stated as exceptions; the above requirements
-apply either way.
-
-   8. Termination.
-
-You may not propagate or modify a covered work except as expressly provided
-under this License. Any attempt otherwise to propagate or modify it is void,
-and will automatically terminate your rights under this License (including
-any patent licenses granted under the third paragraph of section 11).
-
-However, if you cease all violation of this License, then your license from
-a particular copyright holder is reinstated (a) provisionally, unless and
-until the copyright holder explicitly and finally terminates your license,
-and (b) permanently, if the copyright holder fails to notify you of the violation
-by some reasonable means prior to 60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is reinstated permanently
-if the copyright holder notifies you of the violation by some reasonable means,
-this is the first time you have received notice of violation of this License
-(for any work) from that copyright holder, and you cure the violation prior
-to 30 days after your receipt of the notice.
-
-Termination of your rights under this section does not terminate the licenses
-of parties who have received copies or rights from you under this License.
-If your rights have been terminated and not permanently reinstated, you do
-not qualify to receive new licenses for the same material under section 10.
-
-   9. Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or run a copy
-of the Program. Ancillary propagation of a covered work occurring solely as
-a consequence of using peer-to-peer transmission to receive a copy likewise
-does not require acceptance. However, nothing other than this License grants
-you permission to propagate or modify any covered work. These actions infringe
-copyright if you do not accept this License. Therefore, by modifying or propagating
-a covered work, you indicate your acceptance of this License to do so.
-
-   10. Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically receives
-a license from the original licensors, to run, modify and propagate that work,
-subject to this License. You are not responsible for enforcing compliance
-by third parties with this License.
-
-An "entity transaction" is a transaction transferring control of an organization,
-or substantially all assets of one, or subdividing an organization, or merging
-organizations. If propagation of a covered work results from an entity transaction,
-each party to that transaction who receives a copy of the work also receives
-whatever licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the Corresponding
-Source of the work from the predecessor in interest, if the predecessor has
-it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the rights
-granted or affirmed under this License. For example, you may not impose a
-license fee, royalty, or other charge for exercise of rights granted under
-this License, and you may not initiate litigation (including a cross-claim
-or counterclaim in a lawsuit) alleging that any patent claim is infringed
-by making, using, selling, offering for sale, or importing the Program or
-any portion of it.
-
-   11. Patents.
-
-A "contributor" is a copyright holder who authorizes use under this License
-of the Program or a work on which the Program is based. The work thus licensed
-is called the contributor's "contributor version".
-
-A contributor's "essential patent claims" are all patent claims owned or controlled
-by the contributor, whether already acquired or hereafter acquired, that would
-be infringed by some manner, permitted by this License, of making, using,
-or selling its contributor version, but do not include claims that would be
-infringed only as a consequence of further modification of the contributor
-version. For purposes of this definition, "control" includes the right to
-grant patent sublicenses in a manner consistent with the requirements of this
-License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free patent
-license under the contributor's essential patent claims, to make, use, sell,
-offer for sale, import and otherwise run, modify and propagate the contents
-of its contributor version.
-
-In the following three paragraphs, a "patent license" is any express agreement
-or commitment, however denominated, not to enforce a patent (such as an express
-permission to practice a patent or covenant not to s ue for patent infringement).
-To "grant" such a patent license to a party means to make such an agreement
-or commitment not to enforce a patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license, and the
-Corresponding Source of the work is not available for anyone to copy, free
-of charge and under the terms of this License, through a publicly available
-network server or other readily accessible means, then you must either (1)
-cause the Corresponding Source to be so available, or (2) arrange to deprive
-yourself of the benefit of the patent license for this particular work, or
-(3) arrange, in a manner consistent with the requirements of this License,
-to extend the patent
-
-license to downstream recipients. "Knowingly relying" means you have actual
-knowledge that, but for the patent license, your conveying the covered work
-in a country, or your recipient's use of the covered work in a country, would
-infringe one or more identifiable patents in that country that you have reason
-to believe are valid.
-
-If, pursuant to or in connection with a single transaction or arrangement,
-you convey, or propagate by procuring conveyance of, a covered work, and grant
-a patent license to some of the parties receiving the covered work authorizing
-them to use, propagate, modify or convey a specific copy of the covered work,
-then the patent license you grant is automatically extended to all recipients
-of the covered work and works based on it.
-
-A patent license is "discriminatory" if it does not include within the scope
-of its coverage, prohibits the exercise of, or is conditioned on the non-exercise
-of one or more of the rights that are specifically granted under this License.
-You may not convey a covered work if you are a party to an arrangement with
-a third party that is in the business of distributing software, under which
-you make payment to the third party based on the extent of your activity of
-conveying the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory patent
-license (a) in connection with copies of the covered work conveyed by you
-(or copies made from those copies), or (b) primarily for and in connection
-with specific products or compilations that contain the covered work, unless
-you entered into that arrangement, or that patent license was granted, prior
-to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting any implied
-license or other defenses to infringement that may otherwise be available
-to you under applicable patent law.
-
-   12. No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or otherwise)
-that contradict the conditions of this License, they do not excuse you from
-the conditions of this License. If you cannot convey a covered work so as
-to satisfy simultaneously your obligations under this License and any other
-pertinent obligations, then as a consequence you may
-
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey the
-Program, the only way you could satisfy both those terms and this License
-would be to refrain entirely from conveying the Program.
-
-   13. Remote Network Interaction; Use with the GNU General Public License.
-
-Notwithstanding any other provision of this License, if you modify the Program,
-your modified version must prominently offer all users interacting with it
-remotely through a computer network (if your version supports such interaction)
-an opportunity to receive the Corresponding Source of your version by providing
-access to the Corresponding Source from a network server at no charge, through
-some standard or customary means of facilitating copying of software. This
-Corresponding Source shall include the Corresponding Source for any work covered
-by version 3 of the GNU General Public License that is incorporated pursuant
-to the following paragraph.
-
-Notwithstanding any other provision of this License, you have permission to
-link or combine any covered work with a work licensed under version 3 of the
-GNU General Public License into a single combined work, and to convey the
-resulting work. The terms of this License will continue to apply to the part
-which is the covered work, but the work with which it is combined will remain
-governed by version 3 of the GNU General Public License.
-
-   14. Revised Versions of this License.
-
-The Free Software Foundation may publish revised and/or new versions of the
-GNU Affero General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to address
-new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies
-that a certain numbered version of the GNU Affero General Public License "or
-any later version" applies to it, you have the option of following the terms
-and conditions either of that numbered version or of any later version published
-by the Free Software Foundation. If the Program does not specify a version
-number of the GNU Affero General Public License, you may choose any version
-ever published by the Free Software Foundation.
-
-If the Program specifies that a proxy can decide which future versions of
-the GNU Affero General Public License can be used, that proxy's public statement
-of acceptance of a version permanently authorizes you to choose that version
-for the Program.
-
-Later license versions may give you additional or different permissions. However,
-no additional obligations are imposed on any author or copyright holder as
-a result of your choosing to follow a later version.
-
-   15. Disclaimer of Warranty.
-
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
-LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
-EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM
-PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
-CORRECTION.
-
-   16. Limitation of Liability.
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
-ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM
-AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO
-USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
-INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
-PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
-PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-   17. Interpretation of Sections 15 and 16.
-
-If the disclaimer of warranty and limitation of liability provided above cannot
-be given local legal effect according to their terms, reviewing courts shall
-apply local law that most closely approximates an absolute waiver of all civil
-liability in connection with the Program, unless a warranty or assumption
-of liability accompanies a copy of the Program in return for a fee. END OF
-TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest possible
-use to the public, the best way to achieve this is to make it free software
-which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program. It is safest to attach
-them to the start of each source file to most effectively state the exclusion
-of warranty; and each file should have at least the "copyright" line and a
-pointer to where the full notice is found.
-
-<one line to give the program's name and a brief idea of what it does.>
-
-Copyright (C) <year> <name of author>
-
-This program is free software: you can redistribute it and/or modify it under
-the terms of the GNU Affero General Public License as published by the Free
-Software Foundation, either version 3 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-details.
-
-You should have received a copy of the GNU Affero General Public License along
-with this program. If not, see <http s ://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If your software can interact with users remotely through a computer network,
-you should also make sure that it provides a way for users to get its source.
-For example, if your program is a web application, its interface could display
-a "Source" link that leads users to an archive of the code. There are many
-ways you could offer source, and different solutions will be better for different
-programs; see section 13 for the specific requirements.
-
-You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary. For
-more information on this, and how to apply and follow the GNU AGPL, see <http
-s ://www.gnu.org/licenses/>.

README.md

@@ -37,10 +37,20 @@ Fabriquons un internet convivial ⤵
 
 Pas maintenant.
 
-## Déployer
+## Déployer en pré-production
 
-⚠️ NE FAITES PAS `--delete` car il est fort probable que des trucs qui doivent rester dans le bucket
+Fait automatiquement via Woodpecker sur la branche `preprod`.
-ne sont pas copiés ici
+
+Le site en pré-production est ensuite accessible sur <https://preprod-site.web.deuxfleurs.fr/>
+
+## Déployer en production
+
+Fait automatiquement via Woodpecker sur la branche `main`.
+
+## Déployer en production à la main (pas recommandé)
+
+En cas de déploiement manuel : ⚠️ NE FAITES PAS `--delete` car il est fort probable
+que des trucs qui doivent rester dans le bucket ne sont pas copiés ici.
 
 ```
 aws s3 sync static/ s3://deuxfleurs.fr

static/cgu.html

@@ -591,5 +591,3 @@ _ `  ^ ¨  ·  _ -  "             ` *     -     ; - _
 		<script src="script-bon.js"></script>
 	</body>
 </html>
-
-

static/css/home.css

@@ -6,13 +6,7 @@ main {
   grid-template-columns: [col-start] repeat(12, calc(100% / 12) [col-sep]);
   grid-template-rows:
     [row-start] auto [jardin-end]
-	repeat(3, 
+    repeat(3, var(--big_margin) [title-start] auto [title-end] var(--med_margin) [illu-start] auto [illu-end] auto [illu-extended-end] var(--med_margin) [txt-start] auto [txt-end])
-	var(--big_margin) 
-	[title-start] auto [title-end] 
-	var(--med_margin) 
-	[illu-start] auto [illu-end] auto [illu-extended-end]
-	var(--med_margin) 
-	[txt-start] auto [txt-end])
     var(--big_margin)
     [title-start-contact] auto [title-end-contact]
     var(--med_margin)
@@ -20,7 +14,7 @@ main {
   ;
 }
 
-div#jardin{
+div#jardin {
   background-color: var(--jardin);
   grid-area: row-start / col-start / jardin-end / col-sep 12;
   display: flex;
@@ -29,70 +23,70 @@ div#jardin{
   height: 100vh;
 }
 
-div#jardin p{
+div#jardin p {
   display: flex;
-	justify-content:center;
+  justify-content: center;
 }
 
-h2#infras{
+h2#infras {
   background-color: var(--infras);
   grid-area: title-start 1 / col-sep 1 / title-end 1 / col-sep 12;
 }
 
-div#rennes{
+div#rennes {
   background-color: var(--rennes);
   grid-area: illu-start 1 / col-sep 1 / illu-end 1 / col-sep 6;
   overflow: hidden;
   /*height: 450px;*/
 }
 
-div#orsay{
+div#orsay {
   background-color: var(--orsay);
   grid-area: illu-start 1 / col-sep 6 / illu-end 1 / col-sep 11;
   overflow: hidden;
   /*height:450px;*/
 }
 
-p#txt_infras{
+p#txt_infras {
   background-color: var(--txt_infras);
   grid-area: txt-start 1 / col-sep 1 / txt-end 1 / col-sep 7;
 }
 
-h2#outils{
+h2#outils {
   background-color: var(--outils);
   grid-area: title-start 2 / col-sep 1 / title-end 2 / col-sep 12;
 }
 
-section#liste_outils{
+section#liste_outils {
   background-color: var(--liste_outils);
   grid-area: illu-start 2 / col-sep 7 / illu-end 2 / col-sep 11;
 }
 
-section#liste_outils > a > div > p{
+section#liste_outils > a > div > p {
   text-align: center;
 }
 
-section#liste_outils > a{
+section#liste_outils > a {
   /*display: contents;*/
   color: black;
   text-decoration: none;
 }
 
-section#liste_outils > a:hover{
+section#liste_outils > a:hover {
   color: darkgreen;
 }
 
-div#txt_outils{
+div#txt_outils {
   background-color: var(--txt_outils);
   grid-area: txt-start 2 / col-sep 1 / txt-end 2 / col-sep 7;
 }
 
-h2#valeurs{
+h2#valeurs {
   background-color: var(--valeurs);
   grid-area: title-start 3 / col-sep 1 / title-end 3 / col-sep 12;
 }
 
-div#ronce{
+div#ronce {
   background-color: var(--ronce);
   grid-area: illu-start 3 / col-sep 2 / illu-end 3 / col-sep 10;
   padding: 0.5rem;
@@ -101,38 +95,39 @@ div#ronce{
   transition: filter 0.15s ease 0s;
 }
 
-div#ronce:hover{
+div#ronce:hover {
   filter: none;
 }
 
-section#liste_valeurs{
+section#liste_valeurs {
   background-color: var(--liste_valeurs);
   grid-area: txt-start 3 / col-sep 2 / txt-end 3 / col-sep 10;
 }
 
-h2#connaissance{
+h2#connaissance {
   background-color: var(--connaissance);
   grid-area: title-start-contact / col-sep 1 / title-end-contact / col-sep 12;
 }
 
-div#txt_connaissance{
+div#txt_connaissance {
   background-color: var(--txt_connaissance);
   grid-area: txt-start-contact / col-sep 1 / txt-end-contact / col-sep 6;
 }
 
-div#calendrier{
+div#calendrier {
   background-color: var(--calendrier);
   grid-area: txt-start-contact / col-sep 7 / txt-end-contact / col-sep 10;
   overflow: hidden;
 }
 
-.mois_actuel, .mois_suivant{
+.mois_actuel,
+.mois_suivant {
   overflow: hidden;
 }
 
 /*GESTION DE LA GRILLE LISTE DE NOS VALEURS*/
 
-section#liste_valeurs{
+section#liste_valeurs {
   /*on ne peut pas faire plusieurs opérations en même temps dans calc, il faut un calc par opération*/
   --demie-goutiere: calc(var(--small_margin) / 2);
   --valeurs_width: calc(50% - var(--demie-goutiere));
@@ -146,26 +141,27 @@ section#liste_valeurs{
     var(--small_margin)
     [line2-start] auto [line2-end]
     var(--small_margin)
-	[suivre-start] auto [suivre-end];
+    [suivre-start] auto [suivre-end]
+  ;
 }
 
-p#coop{
+p#coop {
   background-color: var(--lightgrey);
   grid-area: line1-start / col2-start / line1-end / col2-mid-left;
   text-align: center;
 }
 
-p#autonomie{
+p#autonomie {
   background-color: var(--lightgrey);
   grid-area: line1-start / col2-mid-right / line1-end / col2-end;
 }
 
-p#solidarite{
+p#solidarite {
   background-color: var(--lightgrey);
   grid-area: line2-start / col2-start / line2-end / col2-mid-left;
 }
 
-p#liberte{
+p#liberte {
   background-color: var(--lightgrey);
   grid-area: line2-start / col2-mid-right / line2-end / col2-end;
 }
@@ -176,7 +172,10 @@ p#suivre {
   text-align: center;
 }
 
-#coop, #autonomie, #solidarite, #liberte{
+#coop,
+#autonomie,
+#solidarite,
+#liberte {
   padding: 2rem;
   border: 1px dashed black;
   text-align: center;
@@ -198,7 +197,6 @@ div#ordinateur {
   grid-area: illu-start 2 / col-start / illu-end 2 / col-sep 7;
 }
 
-
 div#discussion {
   background-color: var(--lightgrey);
   grid-area: line1-start / col-start / line1-end / col-mid-left;
@@ -222,7 +220,6 @@ div#emails {
 div#collaboration {
   background-color: var(--lightgrey);
   grid-area: line2-start / col-mid-right / line2-end / col-end;
-
 }
 
 div#blog {
@@ -230,66 +227,67 @@ div#blog {
   grid-area: line3-start / col-mid-right / line3-end / col-end;
 }
 
-
 /*GESTION DES MEDIA QUERIES*/
 
 /*Tablettes et petits ordinateurs*/
-@media (max-width: 1500px) and (min-width: 801px){
+@media (max-width: 1500px) and (min-width: 801px) {
-	h2#infras{
+  h2#infras {
     grid-area: title-start 1 / col-sep 1 / title-end 1 / col-sep 12;
   }
 
-	h2#outils{
+  h2#outils {
     grid-area: title-start 2 / col-sep 1 / title-end 2 / col-sep 12;
   }
 
-	h2#valeurs{
+  h2#valeurs {
     grid-area: title-start 3 / col-sep 1 / title-end 3 / col-sep 12;
   }
 
-	h2#connaissance{
+  h2#connaissance {
     grid-area: title-start-contact / col-sep 1 / title-end-contact / col-sep 12;
   }
 
-	div#rennes{
+  div#rennes {
     grid-area: illu-start 1 / col-sep 2 / illu-end 1 / col-sep 6;
     margin-right: 0.5rem;
   }
 
-	div#orsay{
+  div#orsay {
     grid-area: illu-start 1 / col-sep 6 / illu-end 1 / col-sep 10;
     margin-left: 0.5rem;
   }
 
-	div#rennes, div#orsay{
+  div#rennes,
+  div#orsay {
     border: 1px solid black;
     border-radius: 5px;
   }
 
-	div#rennes pre.center, div#orsay pre.center{
+  div#rennes pre.center,
+  div#orsay pre.center {
     margin-top: -5px;
-		margin-bottom: -5px
+    margin-bottom: -5px;
   }
 
-	div#orsay pre.center{
+  div#orsay pre.center {
     justify-content: center;
   }
 
-	p#txt_infras{
+  p#txt_infras {
     background-color: var(--txt_infras);
     grid-area: txt-start 1 / col-sep 2 / txt-end 1 / col-sep 10;
   }
 
-	div#txt_outils{
+  div#txt_outils {
     background-color: var(--txt_outils);
     grid-area: txt-start 2 / col-sep 2 / txt-end 2 / col-sep 10;
   }
 
-	div#txt_connaissance{
+  div#txt_connaissance {
     grid-area: txt-start-contact / col-sep 2 / txt-end-contact / col-sep 10;
   }
 
-	div#txt_connaissance ul{
+  div#txt_connaissance ul {
     padding-left: 0px;
     list-style-position: inside;
   }
@@ -299,14 +297,13 @@ div#blog {
     overflow: hidden;
   }
 
-	section#liste_outils{
+  section#liste_outils {
     background-color: var(--liste_outils);
     grid-area: illu-end 2 / col-sep 1 / illu-extended-end 2 / col-sep 11;
     margin-top: var(--med_margin);
   }
 
-
+  section#liste_outils {
-	section#liste_outils{
     display: grid;
     grid-template-columns: 1fr 1fr 1fr;
     row-gap: 1rem;
@@ -339,7 +336,6 @@ div#blog {
   div#collaboration {
     background-color: var(--lightgrey);
     grid-area: line2-start / col-tiers2-start / line2-end / col-tiers2-end;
-
   }
 
   div#blog {
@@ -347,52 +343,51 @@ div#blog {
     grid-area: line2-start / col-tiers3-start / line2-end / col-tiers3-end;
   }
 
-	div#ronce{
+  div#ronce {
     grid-area: illu-start 3 / col-sep 1 / illu-end 3 / col-sep 11;
   }
 
-	div#calendrier{
+  div#calendrier {
     margin-top: var(--med_margin);
     grid-area: txt-end-contact / col-sep 1 / cal-end-contact / col-sep 11;
     display: flex;
     justify-content: center;
   }
 
-	#mois_actuel, #mois_suivant{
+  #mois_actuel,
+  #mois_suivant {
     overflow: hidden;
   }
 
-	#mois_actuel{
+  #mois_actuel {
     margin-bottom: 0px;
     margin-right: 2rem;
   }
-
 }
 
-
 /*Smartphones*/
-@media (max-width: 800px){
+@media (max-width: 800px) {
-	h2#infras{
+  h2#infras {
     grid-area: title-start 1 / col-start / title-end 1 / col-sep 12;
   }
 
-	h2#outils{
+  h2#outils {
     grid-area: title-start 2 / col-start / title-end 2 / col-sep 12;
   }
 
-	h2#valeurs{
+  h2#valeurs {
     grid-area: title-start 3 / col-start / title-end 3 / col-sep 12;
   }
 
-	h2#connaissance{
+  h2#connaissance {
     grid-area: title-start-contact / col-start / title-end-contact / col-sep 12;
   }
 
-	div#jardin{
+  div#jardin {
     grid-area: row-start / col-sep 1 / jardin-end / col-sep 11;
   }
 
-	nav#menu{
+  nav#menu {
     position: fixed;
     width: 100%;
     right: 0px;
@@ -403,7 +398,7 @@ div#blog {
     border-top: black 1px dashed;
   }
 
-	nav#menu ul{
+  nav#menu ul {
     list-style: none;
     flex-direction: row;
     display: flex;
@@ -413,40 +408,42 @@ div#blog {
     width: 100%;
   }
 
-	div#txt_connaissance ul{
+  div#txt_connaissance ul {
     padding-left: 0px;
     list-style-position: inside;
     margin-bottom: var(--med_margin);
   }
 
-	.icone > pre{
+  .icone > pre {
     font-size: 0.8rem;
   }
 
-	#illustration-accueil > pre.center{
+  #illustration-accueil > pre.center {
     font-size: 0.85rem;
   }
 
-	div#orsay{
+  div#orsay {
     display: none;
   }
 
-	div#rennes{
+  div#rennes {
     grid-area: illu-start 1 / col-sep 1 / illu-end 1 / col-sep 11;
     border: 1px solid black;
     border-radius: 5px;
   }
 
-	div#rennes pre{
+  div#rennes pre {
     margin-top: -5px;
     margin-bottom: -5px;
   }
 
-	pre{
+  pre {
     font-size: 0.95rem;
   }
 
-	#txt_infras, #txt_outils, #txt_connaissance{
+  #txt_infras,
+  #txt_outils,
+  #txt_connaissance {
     text-align: left;
     hyphens: none;
     margin-top: 0;
@@ -458,17 +455,17 @@ div#blog {
     margin-top: 0;
   }
 
-	p#txt_infras{
+  p#txt_infras {
     background-color: var(--txt_infras);
     grid-area: txt-start 1 / col-sep 1 / txt-end 1 / col-sep 11;
   }
 
-	div#txt_outils{
+  div#txt_outils {
     background-color: var(--txt_outils);
     grid-area: txt-start 2 / col-sep 1 / txt-end 2 / col-sep 11;
   }
 
-	div#txt_connaissance{
+  div#txt_connaissance {
     grid-area: txt-start-contact / col-sep 1 / txt-end-contact / col-sep 11;
   }
 
@@ -480,43 +477,46 @@ div#blog {
     display: block;
   }
 
-	section#liste_outils{
+  section#liste_outils {
     grid-area: illu-start 2 / col-start / illu-end 2 / col-sep 12;
     font-size: 1rem;
   }
 
-	section#liste_outils pre{
+  section#liste_outils pre {
     font-size: 1rem;
   }
 
-	section#liste_outils > a > div{
+  section#liste_outils > a > div {
     margin-bottom: 1rem;
   }
 
-	div#ronce{
+  div#ronce {
     grid-area: illu-start 3 / col-sep 1 / illu-end 3 / col-sep 11;
     border: none;
     padding: 0px;
   }
 
-	#coop, #autonomie, #solidarite, #liberte{
+  #coop,
+  #autonomie,
+  #solidarite,
+  #liberte {
     padding: 1rem;
     margin: 0px;
   }
 
-	#suivre{
+  #suivre {
     margin-top: 2rem;
   }
 
-	section#liste_valeurs{
+  section#liste_valeurs {
     grid-area: txt-start 3 / col-sep 1 / txt-end 3 / col-sep 11;
   }
 
-	section#liste_valeurs .description{
+  section#liste_valeurs .description {
     display: none;
   }
 
-	div#calendrier{
+  div#calendrier {
     grid-area: txt-end-contact / col-sep 1 / cal-end-contact / col-sep 11;
     display: none;
   }
@@ -525,45 +525,41 @@ div#blog {
     justify-content: center;
   }
 
-	footer pre.center{
+  footer pre.center {
     font-size: 0.85rem;
   }
 
-	#liens{
+  #liens {
     text-align: center;
     margin-bottom: 12rem;
   }
-
 }
 
 /* En vrac */
-div#calendrier > pre.center{
+div#calendrier > pre.center {
   justify-content: right;
 }
 
-#calendrier #mois_actuel{
+#calendrier #mois_actuel {
   margin-bottom: 1rem;
 }
 
-#mois_actuel, #mois_suivant{
+#mois_actuel,
+#mois_suivant {
   text-align: center;
 }
 
-.highlight{
+#txt_connaissance li {
-	color: var(--day-highlight-color);
-	background-color: var(--day-highlight-bg);
-}
-
-#txt_connaissance li{
   margin-bottom: 1rem;
 }
 
-#txt_connaissance p{
+#txt_connaissance p {
   margin-top: 0px;
 }
 
-
+#txt_infras,
-#txt_infras, #txt_outils, #txt_connaissance{
+#txt_outils,
+#txt_connaissance {
   line-height: 1.3rem;
   text-align: justify;
   text-justify: inter-character;

static/css/layout.css

@@ -92,13 +92,21 @@ img{
 	overflow: hidden;
 }
 
+.highlight{
+	color: var(--day-highlight-color);
+	background-color: var(--day-highlight-bg);
+}
+
 /*GESTION DE LA GRILLE DU DOCUMENT*/
 div#container{
   display: grid;
   grid-template-columns: [main-col-start] repeat(12, calc(100% / 12) [main-col-sep]);
   grid-template-rows:
-	[main-row-debut] var(--med_margin) [header-start] auto [header-end] var(--big_margin) [core-start] auto [main-row-fin] 
+    [main-row-debut] var(--med_margin)
-	var(--big_margin)
+    [header-start] auto
+    [header-end] var(--big_margin)
+    [core-start] auto
+    [main-row-fin] var(--big_margin)
     [footer-start] auto [footer-end]
   ;
 }
@@ -260,4 +268,3 @@ pre.center > a{
 		border-color: var(--txt-night);
 	}
 }
-

static/css/page-generic.css

@@ -16,5 +16,3 @@ main {
 		grid-area: core-start / main-col-start / main-row-fin / main-col-sep 12;
 	}
 }
-
-

static/evenements_passes.html

@@ -81,3 +81,11 @@
 	  <li role="none"><a href="https://jitsi.deuxfleurs.fr/r%C3%A9union_mensuelle_deuxfleurs">Réunion mensuelle «au coin du feu»</a> en ligne, <span class="highlight">le 6 février 2024 à 19h00</span>.<br>Une fois par mois nous organisons une réunion en ligne informelle. C'est le bon moment pour venir faire un coucou si vous voulez parler à des gens de vive voix numérique.</li>
 	  <li role="none"><a href="https://jitsi.deuxfleurs.fr/infra">Réunion mensuelle d'infrastructure</a> en ligne, <span class="highlight">le 21 février 2024 à 20h00</span>.<br>Point mensuel en visioconférence où l'on aborde toutes les questions techniques qui méritent notre attention, concernant notre infrastructure ou nos services.</li>
 	  <li role="none"><a href="#">Permanence associative autour du Libre</a> au Café Citoyen à Lille, <span class="highlight">le 27 février 2024 à 19h30</span>.<br>La permanence associative autour du Libre est une manifestation conviviale, ouverte à toutes et tous, organisée le dernier mardi de chaque mois, et regroupant les collectifs Chtinux, Raoull, Deuxfleurs, Mycélium, CLX et Cliss XXI.</li>
+          <!-- Mars 2024 -->
+          <li role="none"><a href="https://jitsi.deuxfleurs.fr/r%C3%A9union_mensuelle_deuxfleurs">Réunion mensuelle «au coin du feu»</a> en ligne, <span class="highlight">le 5 mars 2024 à 19h00</span>.<br>Une fois par mois nous organisons une réunion en ligne informelle. C'est le bon moment pour venir faire un coucou si vous voulez parler à des gens de vive voix numérique.</li>
+          <li role="none"><a href="https://bbb.paquerette.eu/b/dom-67q-irl-nfc">Réunion mensuelle du collectif CHATONS</a> en ligne, <span class="highlight">le 12 mars 2024 à 20h00</span>.<br>Une fois par mois a lieu une réunion entre les membres du collectif <a href=https://www.chatons.org/>CHATONS</a>.</li>
+          <li role="none"><a href="#">Barcamp Interne</a> au Couvent des Clarisses à Roubaix, <span class="highlight">le 15, 16 et 17 mars</span>.<br> Les membres de Deuxfleurs prennent le temps de se retrouver et de discuter de l'association. N'hésitez pas à nous contacter pour passer nous voir le samedi soir.</li>
+        <!-- Avril 2024 -->
+        <li role="none"><a href="https://jitsi.deuxfleurs.fr/r%C3%A9union_mensuelle_deuxfleurs">Réunion mensuelle «au coin du feu»</a> en ligne, <span class="highlight">le 2 avril 2024 à 19h00</span>.<br>Une fois par mois nous organisons une réunion en ligne informelle. C'est le bon moment pour venir faire un coucou si vous voulez parler à des gens de vive voix numérique.</li>
+        <li role="none"><a href="https://jitsi.deuxfleurs.fr/infra">Réunion mensuelle d'infrastructure</a> en ligne, <span class="highlight">le 17 avril 2024 à 20h00</span>.<br>Point mensuel en visioconférence où l'on aborde toutes les questions techniques qui méritent notre attention, concernant notre infrastructure ou nos services.</li>
+        <li role="none"><a href="#">Permanence associative autour du Libre</a> au Café Citoyen à Lille, <span class="highlight">le 30 avril 2024 à 19h30</span>.<br> La permanence associative autour du Libre est une manifestation conviviale, ouverte à toutes et tous, organisée le dernier mardi de chaque mois, et regroupant les collectifs Chtinux, Raoull, Deuxfleurs, Mycélium, CLX et Cliss XXI.</li>

static/index.html

@@ -849,7 +849,7 @@
       </div>
       <h2 id="valeurs">Avec des valeurs fortes</h2>
       <div id="ronce">
-        <img src="./ronce.webp" loading="lazy" alt="Deux personnages qui regardent et s'avancent vers une maison cabane perchée dans un arbre, illustrant notre envie d'un internet plus éthique.">
+        <img loading="lazy" src="./ronce.webp" alt="Deux personnages qui regardent et s'avancent vers une maison cabane perchée dans un arbre, illustrant notre envie d'un internet plus éthique.">
       </div>
       <section id="liste_valeurs">
         <p id="coop">La coopération <span class="description">- eg. promouvoir l'intéropérabilité, les communs, le libre, et les formats de données ouverts </span></p>
@@ -864,58 +864,60 @@
 	      <p lang="fr">Pour accéder à nos services ou simplement discuter avec nous, écrivez à <span style="text-decoration: underline;">coucou[@]deuxfleurs.fr</span>, rejoignez-nous sur le salon Matrix <span style="text-decoration: underline;">#deuxfleurs:deuxfleurs.fr</span> ou rencontrez-nous à : </p>
         <ul>
         <!-- L'historique des événements passés est sur evenements_passes.html -->
-          <!-- Mars 2024 -->
+        <!-- Mai 2024 -->
-	      <li role="none"><a href="https://jitsi.deuxfleurs.fr/r%C3%A9union_mensuelle_deuxfleurs">Réunion mensuelle «au coin du feu»</a> en ligne, <span class="highlight">le 5 mars 2024 à 19h00</span>.<br>Une fois par mois nous organisons une réunion en ligne informelle. C'est le bon moment pour venir faire un coucou si vous voulez parler à des gens de vive voix numérique.</li>
+        <li role="none"><a href="https://jitsi.deuxfleurs.fr/r%C3%A9union_mensuelle_deuxfleurs">Réunion mensuelle «au coin du feu»</a> en ligne, <span class="highlight">le 7 mai 2024 à 19h00</span>.<br>Une fois par mois nous organisons une réunion en ligne informelle. C'est le bon moment pour venir faire un coucou si vous voulez parler à des gens de vive voix numérique.</li>
-	      <li role="none"><a href="https://bbb.paquerette.eu/b/dom-67q-irl-nfc">Réunion mensuelle du collectif CHATONS</a> en ligne, <span class="highlight">le 12 mars 2024 à 20h00</span>.<br>Une fois par mois a lieu une réunion entre les membres du collectif <a href=https://www.chatons.org/>CHATONS</a>.</li>
+        <li role="none"><a href="https://jitsi.deuxfleurs.fr/infra">Réunion mensuelle d'infrastructure</a> en ligne, <span class="highlight">le 22 mai 2024 à 20h00</span>.<br>Point mensuel en visioconférence où l'on aborde toutes les questions techniques qui méritent notre attention, concernant notre infrastructure ou nos services.</li>
-        <li role="none"><a href="#">Barcamp Interne</a> au Couvent des Clarisses à Roubaix, <span class="highlight">le 15, 16 et 17 mars</span>.<br> Les membres de Deuxfleurs prennent le temps de se retrouver et de discuter de l'association. N'hésitez pas à nous contacter pour passer nous voir le samedi soir.</li>
+	<li role="none"><a href="https://cis.cnrs.fr/netgouv24/">#NetGouv24</a> à Paris, <span class="highlight">le 29 mai 2024</span>.<br>Première conférence annuelle du groupe de travail Gouvernance et Régulation d'Internet. L'ensemble de la communauté scientifique intéressée par ces sujets s'y retrouvera pour une journée de présentations et de discussion.</li>
-        <!-- Avril 2024 -->
+	<li role="none"><a href="https://passageenseine.fr/">Pas Sage en Seine</a> à Choisy-le-Roi, <span class="highlight">le 31 mai, 1 et 2 juin</span>.<br>Festival annuel gratuit dédié au logiciel libre. De nombreuses présentations sur des sujets techniques ou non y sont faites.</li>
-        <li role="none"><a href="https://jitsi.deuxfleurs.fr/r%C3%A9union_mensuelle_deuxfleurs">Réunion mensuelle «au coin du feu»</a> en ligne, <span class="highlight">le 2 avril 2024 à 19h00</span>.<br>Une fois par mois nous organisons une réunion en ligne informelle. C'est le bon moment pour venir faire un coucou si vous voulez parler à des gens de vive voix numérique.</li>
+        <!-- Juin 2024 -->
-
+        <li role="none"><a href="https://jitsi.deuxfleurs.fr/r%C3%A9union_mensuelle_deuxfleurs">Réunion mensuelle «au coin du feu»</a> en ligne, <span class="highlight">le 4 juin 2024 à 19h00</span>.<br>Une fois par mois nous organisons une réunion en ligne informelle. C'est le bon moment pour venir faire un coucou si vous voulez parler à des gens de vive voix numérique.</li>
-        <li role="none"><a href="#">Permanence associative autour du Libre</a> au Café Citoyen à Lille, <span class="highlight">le 30 avril 2024 à 19h30</span>.<br> La permanence associative autour du Libre est une manifestation conviviale, ouverte à toutes et tous, organisée le dernier mardi de chaque mois, et regroupant les collectifs Chtinux, Raoull, Deuxfleurs, Mycélium, CLX et Cliss XXI.
+        <li role="none"><a href="https://jitsi.deuxfleurs.fr/infra">Réunion d'infrastructure</a> en ligne, <span class="highlight">le 5 juin 2024 à 19h15</span>.<br>Point en visioconférence sur les nouveaux sites géographiques à mettre en place pour pouvoir mieux résister aux pannes.</li>
+        <li role="none"><a href="https://jitsi.deuxfleurs.fr/infra">Réunion mensuelle d'infrastructure</a> en ligne, <span class="highlight">le 19 juin 2024 à 20h00</span>.<br>Point mensuel en visioconférence où l'on aborde toutes les questions techniques qui méritent notre attention, concernant notre infrastructure ou nos services.</li>
+        <li role="none"><em>Barcamp Interne</em> en Auvergne, <span class="highlight">les 21, 22 et 23 juin</span>.<br> Les membres de Deuxfleurs prennent le temps de se retrouver et de discuter de l'association.</li>
         </ul>
-
       </div>
       <div id="calendrier">
         <!--
           Pour générer les mois suivants, voir : https://github.com/superboum/code-bazaar/tree/master/algo/calendar
           Notez que les mois sont déjà générés jusqu'à décembre 2024 dans ce fichier : https://github.com/superboum/code-bazaar/blob/master/algo/calendar/calendars.txt
         -->
-        <div id="mois_actuel" role="img" aria-label="calendrier de nos jours de permanence prévus pour ce mois-ci">
+<div id="mois_actuel" role="img" aria-label="calendrier de nos jours de permanence prévus pour ce mois-ci">
           <pre aria-hidden="true">.——————————————————————————————————————.
-|         CALENDRIER MARS 2024         |
+|         CALENDRIER MAI 2024          |
 |——————————————————————————————————————|
-|                      ———— ———— ————  |
+|            ———— ———— ———— ———— ————  |
-|                     | 01 | 02 | 03 | |
+|           | 01 | 02 | 03 | 04 | 05 | |
 |  ———— ———— ———— ———— ———— ———— ————  |
-| | 04 |<span class="highlight"> 05 </span>| 06 | 07 | 08 | 09 | 10 | |
+| | 06 |<span class="highlight"> 07 </span>| 08 | 09 | 10 | 11 | 12 | |
 |  ———— ———— ———— ———— ———— ———— ————  |
-| | 11 |<span class="highlight"> 12 </span>| 13 | 14 |<span class="highlight"> 15 </span>|<span class="highlight"> 16 </span>|<span class="highlight"> 17 </span>| |
+| | 13 | 14 | 15 | 16 | 17 | 18 | 19 | |
 |  ———— ———— ———— ———— ———— ———— ————  |
-| | 18 | 19 | 20 | 21 | 22 | 23 | 24 | |
+| | 20 | 21 |<span class="highlight"> 22 </span>| 23 | 24 | 25 | 26 | |
-|  ———— ———— ———— ———— ———— ———— ————  |
-| | 25 | 26 | 27 | 28 | 29 | 30 | 31 | |
 |  ———— ———— ———— ———— ———— ———— ————  |
+| | 27 | 28 |<span class="highlight"> 29 </span>| 30 |<span class="highlight"> 31 </span>|           |
+|  ———— ———— ———— ———— ————            |
 |______________________________________|</pre>
-
 	</div>
-	<div id="mois_suivant" role="img" aria-label="calendrier de nos jours de permanence prévus pour le mois prochain">
+<div id="mois_suivant" role="img" aria-label="calendrier de nos jours de permanence prévus pour le mois prochain">
           <pre aria-hidden="true">.——————————————————————————————————————.
-|        CALENDRIER AVRIL 2024         |
+|         CALENDRIER JUIN 2024         |
 |——————————————————————————————————————|
-|  ———— ———— ———— ———— ———— ———— ————  |
-| | 01 |<span class="highlight"> 02 </span>| 03 | 04 | 05 | 06 | 07 | |
-|  ———— ———— ———— ———— ———— ———— ————  |
-| | 08 | 09 | 10 | 11 | 12 | 13 | 14 | |
-|  ———— ———— ———— ———— ———— ———— ————  |
-| | 15 | 16 | 17 | 18 | 19 | 20 | 21 | |
-|  ———— ———— ———— ———— ———— ———— ————  |
-| | 22 | 23 | 24 | 25 | 26 | 27 | 28 | |
-|  ———— ———— ———— ———— ———— ———— ————  |
-| | 29 |<span class="highlight"> 30 </span>|                          |
 |                           ———— ————  |
+|                          |<span class="highlight"> 01 </span>|<span class="highlight"> 02 </span>| |
+|  ———— ———— ———— ———— ———— ———— ————  |
+| | 03 |<span class="highlight"> 04 </span>|<span class="highlight"> 05 </span>| 06 | 07 | 08 | 09 | |
+|  ———— ———— ———— ———— ———— ———— ————  |
+| | 10 | 11 | 12 | 13 | 14 | 15 | 16 | |
+|  ———— ———— ———— ———— ———— ———— ————  |
+| | 17 | 18 |<span class="highlight"> 19 </span>| 20 |<span class="highlight"> 21 </span>|<span class="highlight"> 22 </span>|<span class="highlight"> 23 </span>| |
+|  ———— ———— ———— ———— ———— ———— ————  |
+| | 24 | 25 | 26 | 27 | 28 | 29 | 30 | |
+|  ———— ———— ———— ———— ———— ———— ————  |
 |______________________________________|</pre>
 	</div>
 
+
+      </div>
     </main>
     <footer class="noscroll" aria-label="pied de page et liens vers CGU, mentions, sources et risques">
       <div id="parterre" role="img" aria-label="image d'un parterre de fleurs qui fleurit">