Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Affiche 6 cartes offres par catégories #145

Merged
merged 1 commit into from
Jan 31, 2025
Merged

Affiche 6 cartes offres par catégories #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified numerique_gouv/locale/fr/LC_MESSAGES/django.mo
View file
Open in desktop
Binary file not shown.
35 changes: 26 additions & 9 deletions numerique_gouv/locale/fr/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-01-24 14:13+0100\n"
"PO-Revision-Date: 2025-01-24 14:16+0100\n"
"POT-Creation-Date: 2025-01-31 11:28+0100\n"
"PO-Revision-Date: 2025-01-31 11:30+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: fr\n"
Expand Down Expand Up @@ -725,11 +725,11 @@ msgstr "Diapositive suivante"
msgid "next"
msgstr "Suivant"

#: numerique_gouv/templates/numerique_gouv/blog_entry_page.html:51
#: numerique_gouv/templates/numerique_gouv/blog_entry_page.html:45
msgid "Themes :"
msgstr "Thématiques :"

#: numerique_gouv/templates/numerique_gouv/blog_entry_page.html:63
#: numerique_gouv/templates/numerique_gouv/blog_entry_page.html:57
msgid "Categories :"
msgstr "Catégories :"

Expand Down Expand Up @@ -799,27 +799,27 @@ msgid "See all services"
msgstr "Voir tous les services"

#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:28
#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:243
#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:242
msgid "Request DINUM’s expertise"
msgstr "Solliciter l’expertise de la DINUM"

#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:72
#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:253
#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:260
msgid "Consult a reference document"
msgstr "Consulter un document de référence"

#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:102
#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:263
#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:278
msgid "Financing a digital project"
msgstr "Financer un projet numérique"

#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:130
#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:273
#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:296
msgid "Equipping public officials"
msgstr "Outiller les agents publics"

#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:159
#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:283
#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:314
msgid "Access the management tools"
msgstr "Accéder aux outils de pilotage"

Expand All @@ -835,6 +835,23 @@ msgstr "Filtrer par public cible"
msgid "Offers by Organization"
msgstr "Filtrer par émetteur"

#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:252
msgid "See more expertises"
msgstr "Voir plus d’expertises"

#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:270
msgid "See more document"
msgstr "Voir plus de documents"

#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:288
msgid "See more offers"
msgstr "Voir plus d’offres"

#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:306
#: numerique_gouv/templates/numerique_gouv/offers_index_page.html:324
msgid "See more tools"
msgstr "Voir plus d’outils"

#: numerique_gouv/templates/numerique_gouv/products_index_page.html:21
msgid "Digital technology to simplify citizen procedures"
msgstr "Le numérique au service de la simplification des démarches citoyennes"
Expand Down
46 changes: 22 additions & 24 deletions numerique_gouv/templates/numerique_gouv/blocks/offer_card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
{% load i18n wagtailimages_tags %}

<div class="fr-col-md-4 fr-col">
<div class="fr-card fr-enlarge-link">
<div class="fr-card__body">
<div class="fr-card__content">
<h3 class="fr-card__title">
{% if page.external_link %}
<a href="{{ page.external_link }}" target="_blank" title="{{ page.title }} - Ouvre une nouvelle fenêtre">{{ page.title }}</a>
{% else %}
<a href="{{ page.get_absolute_url }}">{{ page.title }}</a>
{% endif %}
</h3>
<p class="fr-card__desc">{{ page.card_text }}</p>
</div>
<div class="fr-card fr-enlarge-link">
<div class="fr-card__body">
<div class="fr-card__content">
<h3 class="fr-card__title">
{% if page.external_link %}
<a href="{{ page.external_link }}" target="_blank" title="{{ page.title }} - Ouvre une nouvelle fenêtre">{{ page.title }}</a>
{% else %}
<a href="{{ page.get_absolute_url }}">{{ page.title }}</a>
{% endif %}
</h3>
<p class="fr-card__desc">{{ page.card_text }}</p>
</div>
<div class="fr-card__header">
<div class="fr-card__img">
{% image page.card_image original class="fr-responsive-img" alt=page.card_alt_image %}
</div>
<ul class="fr-badges-group">
{% for organization in page.organizations.all %}
<li>
<p class="fr-badge fr-badge--{{ organization.color }} fr-my-5v">{{ organization.name }}</p>
</li>
{% endfor %}
</ul>
</div>
<div class="fr-card__header">
<div class="fr-card__img">
{% image page.card_image original class="fr-responsive-img" alt=page.card_alt_image %}
</div>
<ul class="fr-badges-group">
{% for organization in page.organizations.all %}
<li>
<p class="fr-badge fr-badge--{{ organization.color }} fr-my-5v">{{ organization.name }}</p>
</li>
{% endfor %}
</ul>
</div>
</div>
82 changes: 42 additions & 40 deletions numerique_gouv/templates/numerique_gouv/hub_pages.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,63 +14,65 @@
{% include "content_manager/blocks/messages.html" %}

{% if news %}
<div class="fr-container">
<h2 class="fr-h2">{{ _('News') }}</h2>
<div class="fr-grid-row fr-grid-row--gutters">
{% for subpage in news %}
<div class="fr-col-12 fr-col-md-4">
{% include "numerique_gouv/blocks/card_vertical.html" with page=subpage %}
</div>
{% endfor %}
<div class="fr-container">
<h2 class="fr-h2">{{ _('News') }}</h2>
<div class="fr-grid-row fr-grid-row--gutters">
{% for subpage in news %}
<div class="fr-col-12 fr-col-md-4">
{% include "numerique_gouv/blocks/card_vertical.html" with page=subpage %}
</div>
<div class="fr-grid-row fr-grid-row--gutters fr-grid-row--center fr-mt-4w">
<div class="fr-col-4 ng-text-center">
{% if entries|length == 3 %}
<a href="/actualités/?{{ page.content_source }}={{ page.get_content_source_name }}" class="fr-btn">{{ _("See more news") }}</a>
{% else %}
<a href="/actualités/" class="fr-btn">{{ _("See all news") }}</a>
{% endif %}
</div>
{% endfor %}
</div>
<div class="fr-grid-row fr-grid-row--gutters fr-grid-row--center fr-mt-4w">
<div class="fr-col-4 ng-text-center">
{% if entries|length == 3 %}
<a href="/actualités/?{{ page.content_source }}={{ page.get_content_source_name }}" class="fr-btn">{{ _("See more news") }}</a>
{% else %}
<a href="/actualités/" class="fr-btn">{{ _("See all news") }}</a>
{% endif %}
</div>
</div>
</div>
{% endif %}

{% if offers %}
<div class="fr-container fr-my-6w">
<h2 class="fr-h2">{{ _('Offers') }}</h2>
<div class="fr-grid-row fr-grid-row--gutters">
{% for subpage in offers %}
{% include "numerique_gouv/blocks/offer_card.html" with page=subpage %}
{% endfor %}
<div class="fr-container fr-my-6w">
<h2 class="fr-h2">{{ _('Offers') }}</h2>
<div class="fr-grid-row fr-grid-row--gutters">
{% for subpage in offers %}
<div class="fr-col-12 fr-col-md-4">
{% include "numerique_gouv/blocks/offer_card.html" with page=subpage %}
</div>
<div class="fr-grid-row fr-grid-row--gutters fr-grid-row--center fr-mt-4w">
<div class="fr-col-4 ng-text-center">
<a href="/offre-de-la-dinum/" class="fr-btn">{{ _("See all offers") }}</a>
</div>
{% endfor %}
</div>
<div class="fr-grid-row fr-grid-row--gutters fr-grid-row--center fr-mt-4w">
<div class="fr-col-4 ng-text-center">
<a href="/offre-de-la-dinum/" class="fr-btn">{{ _("See all offers") }}</a>
</div>
</div>
</div>
{% endif %}

{% if products %}
<div class="fr-container fr-my-6w">
<h2 class="fr-h2">{{ _('Products') }}</h2>
<div class="fr-grid-row fr-grid-row--gutters">
{% for subpage in products %}
<div class="fr-col-12 fr-col-md-4">
{% include "numerique_gouv/blocks/product_card.html" with page=subpage %}
</div>
{% endfor %}
<div class="fr-container fr-my-6w">
<h2 class="fr-h2">{{ _('Products') }}</h2>
<div class="fr-grid-row fr-grid-row--gutters">
{% for subpage in products %}
<div class="fr-col-12 fr-col-md-4">
{% include "numerique_gouv/blocks/product_card.html" with page=subpage %}
</div>
<div class="fr-grid-row fr-grid-row--gutters fr-grid-row--center fr-mt-4w">
<div class="fr-col-4 ng-text-center">
<a href="/produits-à-impact/" class="fr-btn">{{ _("See all services") }}</a>
</div>
{% endfor %}
</div>
<div class="fr-grid-row fr-grid-row--gutters fr-grid-row--center fr-mt-4w">
<div class="fr-col-4 ng-text-center">
<a href="/produits-à-impact/" class="fr-btn">{{ _("See all services") }}</a>
</div>
</div>
</div>
{% endif %}

{% include "content_manager/blocks/blocks_stream.html" with stream=page.body %}
{% endblock content %}

{% endblock content %}


88 changes: 65 additions & 23 deletions numerique_gouv/templates/numerique_gouv/offers_index_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,55 +237,97 @@ <h2 class="fr-h6">{{ _('Offers by Organization') }}</h2>
</div>
</div>


<div class="fr-py-5w fr-my-5w" style="background: var(--background-alt-blue-ecume) ;">
<div class="fr-container" id="expertise">
<div class="fr-py-5w fr-my-5w" style="background: var(--background-alt-blue-ecume);" aria-labelledby="expertises-section">
<div class="fr-container">
<h2>{{ _('Request DINUM’s expertise') }}</h2>
<div class="fr-grid-row fr-grid-row--gutters">
<div id="expertises-section" class="fr-grid-row fr-grid-row--gutters">
{% for offer in expertise_subpages %}
<div class="fr-col-12 fr-col-md-4 expertise-subpage {% if forloop.counter > 6 %}hidden{% endif %}">
{% include "numerique_gouv/blocks/offer_card.html" with page=offer %}
</div>
{% endfor %}
</div>
{% if expertise_subpages|length > 6 %}
<div class="fr-grid-row fr-grid-row--center fr-mt-3w">
<button id="voir-plus-expertises" class="fr-btn" aria-controls="expertises-section" aria-expanded="false">{{ _('See more expertises') }}</button>
</div>
{% endif %}
</div>
</div>

<div class="fr-container" id="document">
<h2>{{ _('Consult a reference document') }}</h2>
<div class="fr-grid-row fr-grid-row--gutters">
{% for offer in document_subpages %}
{% include "numerique_gouv/blocks/offer_card.html" with page=offer %}
{% endfor %}
<div class="fr-py-5w fr-my-5w" aria-labelledby="documents-section">
<div class="fr-container">
<h2>{{ _('Consult a reference document') }}</h2>
<div id="documents-section" class="fr-grid-row fr-grid-row--gutters">
{% for offer in document_subpages %}
<div class="fr-col-12 fr-col-md-4 document-subpage {% if forloop.counter > 6 %}hidden{% endif %}">
{% include "numerique_gouv/blocks/offer_card.html" with page=offer %}
</div>
{% endfor %}
</div>
{% if document_subpages|length > 6 %}
<div class="fr-grid-row fr-grid-row--center fr-mt-3w">
<button id="voir-plus-documents" class="fr-btn" aria-controls="documents-section" aria-expanded="false">{{ _('See more document') }}</button>
</div>
{% endif %}
</div>
</div>
<div class="fr-py-5w fr-my-5w" style="background: var(--background-alt-blue-ecume) ;">
<div class="fr-container" id="fincancing">

<div class="fr-py-5w fr-my-5w" style="background: var(--background-alt-blue-ecume);" aria-labelledby="financements-section">
<div class="fr-container">
<h2>{{ _('Financing a digital project') }}</h2>
<div class="fr-grid-row fr-grid-row--gutters">
<div id="financements-section" class="fr-grid-row fr-grid-row--gutters">
{% for offer in financement_subpages %}
<div class="fr-col-12 fr-col-md-4 financement-subpage {% if forloop.counter > 6 %}hidden{% endif %}">
{% include "numerique_gouv/blocks/offer_card.html" with page=offer %}
</div>
{% endfor %}
</div>
{% if financement_subpages|length > 6 %}
<div class="fr-grid-row fr-grid-row--center fr-mt-3w">
<button id="voir-plus-financements" class="fr-btn" aria-controls="financements-section" aria-expanded="false">{{ _('See more offers') }}</button>
</div>
{% endif %}
</div>
</div>

<div class="fr-container" id="tools">
<h2>{{ _('Equipping public officials') }}</h2>
<div class="fr-grid-row fr-grid-row--gutters">
{% for offer in tools_subpages %}
{% include "numerique_gouv/blocks/offer_card.html" with page=offer %}
{% endfor %}
<div class="fr-py-5w fr-my-5w" aria-labelledby="outils-section">
<div class="fr-container">
<h2>{{ _('Equipping public officials') }}</h2>
<div id="outils-section" class="fr-grid-row fr-grid-row--gutters">
{% for offer in tools_subpages %}
<div class="fr-col-12 fr-col-md-4 outil-subpage {% if forloop.counter > 6 %}hidden{% endif %}">
{% include "numerique_gouv/blocks/offer_card.html" with page=offer %}
</div>
{% endfor %}
</div>
{% if tools_subpages|length > 6 %}
<div class="fr-grid-row fr-grid-row--center fr-mt-3w">
<button id="voir-plus-outils" class="fr-btn" aria-controls="tools-section" aria-expanded="false">{{ _('See more tools') }}</button>
</div>
{% endif %}
</div>
</div>

<div class="fr-py-5w fr-my-5w" style="background: var(--background-alt-blue-ecume) ;">
<div class="fr-container" id="manage">
<div class="fr-py-5w fr-my-5w" style="background: var(--background-alt-blue-ecume) ;" aria-labelledby="pilotages-section">
<div class="fr-container">
<h2>{{ _('Access the management tools') }}</h2>
<div class="fr-grid-row fr-grid-row--gutters">
<div id="-pilotages-section" class="fr-grid-row fr-grid-row--gutters">
{% for offer in pilotage_subpages %}
<div class="fr-col-12 fr-col-md-4 pilotage-subpage {% if forloop.counter > 6 %}hidden{% endif %}">
{% include "numerique_gouv/blocks/offer_card.html" with page=offer %}
</div>
{% endfor %}
</div>
{% if pilotage_subpages|length > 6 %}
<div class="fr-grid-row fr-grid-row--center fr-mt-3w">
<button id="voir-plus-pilotages" class="fr-btn" aria-controls="pilotages-section" aria-expanded="false">{{ _('See more tools') }}</button>
</div>
{% endif %}
</div>
</div>
{% endblock content %}

{% block extra_js %}
<script src="{% static 'js/voir_plus.js' %}"></script>
{% endblock extra_js %}
7 changes: 6 additions & 1 deletion static/js/voir_plus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,9 @@ document.addEventListener('DOMContentLoaded', () => {
setupVoirPlusButton('voir-plus-citizens', 'citizen-subpage');
setupVoirPlusButton('voir-plus-companies', 'company-subpage');
setupVoirPlusButton('voir-plus-agents', 'agent-subpage');
});
setupVoirPlusButton('voir-plus-expertises', 'expertise-subpage');
setupVoirPlusButton('voir-plus-documents', 'document-subpage');
setupVoirPlusButton('voir-plus-financements', 'financement-subpage');
setupVoirPlusButton('voir-plus-outils', 'outil-subpage');
setupVoirPlusButton('voir-plus-pilotages', 'pilotage-subpage');
});
Loading