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

Add bandeau to announce agent connect #284

Merged
merged 3 commits into from
Oct 9, 2024
Merged

Add bandeau to announce agent connect #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b3240a
upgrade DSFR
BenoitSerrano May 23, 2024
bc20e90
add bandeau information
BenoitSerrano May 23, 2024
880cb48
change date MEP
BenoitSerrano May 23, 2024
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
20 changes: 10 additions & 10 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"homepage": "https://github.com/betagouv/conferences#readme",
"dependencies": {
"@gouvfr/dsfr": "^1.0.0-rc1.0",
"@gouvfr/dsfr": "^1.11.2",
"@sentry/node": "^6.2.2",
"chart.js": "^2.9.4",
"connect-flash": "^0.1.1",
Expand Down
19 changes: 8 additions & 11 deletions static/css/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@
margin-bottom: 56px !important; /* fr-mb-7w */
}

/* Todo : use callouts from the design system instead of home-made paragraphs ? */
.bandeau-principal {
background-color: var(--background-contrast-grey);
}


.error-text {
color: var(--error);
color: var(--text-default-error);
}

.cell--info {
background-color: var(--info);
background-color: var(--background-alt-blue-france);
}

.notification--error {
Expand All @@ -29,17 +32,11 @@
}

.notification--info {
--scheme-border: var(--info);
--scheme-border: var(--background-alt-blue-france);
}

.notification--success {
--scheme-border: var(--success);
}


.fr-bg--alt {
background-color: var(--bf500);
color: var(--g100);
--scheme-border: var(--background-flat-success);
}

.text-center {
Expand Down
2 changes: 1 addition & 1 deletion views/dashboard.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Tableau de bord de votre conférence
</h2>
<p id="board-description-info"></p>
<div id="notification-error" class="fr-callout fr-fi-alert-line notification--error notification--hidden fr-mb-3w">
<div id="notification-error" class="fr-callout fr-icon-alert-line notification--error notification--hidden fr-mb-3w">
</div>
<div class="fr-callout fr-mb-3w">
<br>
Expand Down
11 changes: 10 additions & 1 deletion views/landing.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
<%- include('partials/header') -%>

<div class="fr-container">
<div class="fr-notice fr-notice--info">
<div class="fr-container">
<div class="fr-notice__body">
<p class="fr-notice__title">
Audioconf change de mode d'authentification au 27/05/2024 pour <a href='https://agentconnect.gouv.fr' rel='noopener external' title="site d'Agent Connect - nouvelle fenêtre" target='_blank'>Agent Connect</a> !
</p>
</div>
</div>
</div>
<div class="fr-grid-row fr-grid-row--center">
<div class="fr-col fr-col-lg-8">
<div id="je-cree-une-conf" class="main-paragraph">
Expand Down Expand Up @@ -79,7 +88,7 @@
</div>
</div>

<div id="advantages" class="fr-container-fluid fr-bg--alt text-center fr-p-5w">
<div id="advantages" class="fr-container-fluid bandeau-principal text-center fr-p-5w">
<div class="fr-grid-row fr-grid-row--center">
<div class="fr-col-6"><h3 class="fr-h2">Collaborez à distance facilement</h3></div>
</div>
Expand Down
81 changes: 53 additions & 28 deletions views/partials/dark-mode-modale.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,61 @@
<dialog id="fr-theme-modal" class="fr-modal" role="dialog" aria-labelledby="fr-theme-modal-title">
<div class="fr-container fr-container--fluid fr-container-md">
<div class="fr-grid-row fr-grid-row--center">
<div class="fr-col-12 fr-col-md-6 fr-col-lg-4">
<div class="fr-modal__body">
<div class="fr-modal__header">
<button class="fr-link--close fr-link" aria-controls="fr-theme-modal">Fermer</button>
</div>
<div class="fr-modal__content">
<h1 id="fr-theme-modal-title" class="fr-modal__title">
Paramètres d’affichage
</h1>
<div id="fr-switch-theme" class="fr-form-group fr-switch-theme">
<fieldset class="fr-fieldset">
<legend class="fr-fieldset__legend fr-text--regular">Choisissez un thème pour personnaliser l’apparence
du site.</legend>
<div class="fr-fieldset__content">
<div class="fr-radio-group fr-radio-rich">
<input type="radio" id="fr-radios-theme-light" name="fr-radios-theme" value="light">
<label class="fr-label" for="fr-radios-theme-light">Thème clair
</label>
<div class="fr-container fr-container--fluid fr-container-md">
<div class="fr-grid-row fr-grid-row--center">
<div class="fr-col-12 fr-col-md-6 fr-col-lg-4">
<div class="fr-modal__body">
<div class="fr-modal__header">
<button class="fr-btn--close fr-btn" aria-controls="fr-theme-modal" id="button-5622" title="Fermer"> Fermer </button>
</div>
<div class="fr-modal__content">
<h1 id="fr-theme-modal-title" class="fr-modal__title"> Paramètres d’affichage </h1>
<div id="fr-display" class="fr-display">
<fieldset class="fr-fieldset" id="display-fieldset">
<legend class="fr-fieldset__legend--regular fr-fieldset__legend" id="display-fieldset-legend"> Choisissez un thème pour personnaliser l’apparence du site. </legend>
<div class="fr-fieldset__element">
<div class="fr-radio-group fr-radio-rich">
<input value="light" type="radio" id="fr-radios-theme-light" name="fr-radios-theme">
<label class="fr-label" for="fr-radios-theme-light"> Thème clair </label>
<div class="fr-radio-rich__img">
<svg aria-hidden="true" class="fr-artwork" viewBox="0 0 80 80" width="80px" height="80px">
<use class="fr-artwork-decorative" href="/static/gouvfr/artwork/pictograms/environment/sun.svg#artwork-decorative"></use>
<use class="fr-artwork-minor" href="/static/gouvfr/artwork/pictograms/environment/sun.svg#artwork-minor"></use>
<use class="fr-artwork-major" href="/static/gouvfr/artwork/pictograms/environment/sun.svg#artwork-major"></use>
</svg>
</div>
</div>
</div>
<div class="fr-fieldset__element">
<div class="fr-radio-group fr-radio-rich">
<input value="dark" type="radio" id="fr-radios-theme-dark" name="fr-radios-theme">
<label class="fr-label" for="fr-radios-theme-dark"> Thème sombre </label>
<div class="fr-radio-rich__img">
<svg aria-hidden="true" class="fr-artwork" viewBox="0 0 80 80" width="80px" height="80px">
<use class="fr-artwork-decorative" href="/static/gouvfr/artwork/pictograms/environment/moon.svg#artwork-decorative"></use>
<use class="fr-artwork-minor" href="/static/gouvfr/artwork/pictograms/environment/moon.svg#artwork-minor"></use>
<use class="fr-artwork-major" href="/static/gouvfr/artwork/pictograms/environment/moon.svg#artwork-major"></use>
</svg>
</div>
</div>
</div>
<div class="fr-radio-group fr-radio-rich">
<input type="radio" id="fr-radios-theme-dark" name="fr-radios-theme" value="dark">
<label class="fr-label" for="fr-radios-theme-dark">Thème sombre
</label>
<div class="fr-fieldset__element">
<div class="fr-radio-group fr-radio-rich">
<input value="system" type="radio" id="fr-radios-theme-system" name="fr-radios-theme">
<label class="fr-label" for="fr-radios-theme-system"> Système <span class="fr-hint-text">Utilise les paramètres système</span>
</label>
<div class="fr-radio-rich__img">
<svg aria-hidden="true" class="fr-artwork" viewBox="0 0 80 80" width="80px" height="80px">
<use class="fr-artwork-decorative" href="/static/gouvfr/artwork/pictograms/system/system.svg#artwork-decorative"></use>
<use class="fr-artwork-minor" href="/static/gouvfr/artwork/pictograms/system/system.svg#artwork-minor"></use>
<use class="fr-artwork-major" href="/static/gouvfr/artwork/pictograms/system/system.svg#artwork-major"></use>
</svg>
</div>
</div>
</div>
</div>
</fieldset>
</fieldset>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</dialog>
</dialog>
8 changes: 7 additions & 1 deletion views/partials/dark-mode-switch.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
<button class="fr-link fr-fi-theme-fill fr-link--icon-left" aria-controls="fr-theme-modal" data-fr-opened="false">Paramètres d'affichage</button>
<div class="fr-header__tools-links">
<ul class="fr-btns-group">
<li>
<button class="fr-btn fr-icon-theme-fill" aria-controls="fr-theme-modal" data-fr-opened="false">Paramètres d'affichage</button>
</li>
</ul>
</div>
4 changes: 2 additions & 2 deletions views/partials/footer.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script type="module" src="/static/gouvfr/js/dsfr.module.min.js"></script>
<script type="text/javascript" nomodule src="/static/gouvfr/js/dsfr.nomodule.min.js"></script>
<script type="module" src="/static/gouvfr/dsfr/dsfr.module.min.js"></script>
<script type="text/javascript" nomodule src="/static/gouvfr/dsfr/dsfr.nomodule.min.js"></script>
<% if (locals.rizomoURI !== undefined) { %>
<script type="text/javascript" src="<%= locals.rizomoURI %>" async defer></script>
<% } %>
Expand Down
9 changes: 5 additions & 4 deletions views/partials/header.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="fr" data-fr-theme>
<html lang="fr" data-fr-scheme="system">

<head>
<meta charset="utf-8">
Expand All @@ -12,8 +12,9 @@
<% } %>
</title>
<!-- todo(estellecomment) : import min css and js -->
<link rel="stylesheet" type="text/css" href="/static/gouvfr/css/dsfr.min.css">
<link rel="stylesheet" type="text/css" href="/static/gouvfr/dsfr/dsfr.min.css">
<link rel="stylesheet" href="/static/css/custom.css">
<link rel="stylesheet" href="/static/gouvfr/utility/utility.min.css">
<link rel="stylesheet" href="/static/remixicon/remixicon.css">
<link rel="icon" type="image/png" sizes="16x16" href="/static/images/favicon/favicon-16x16.png">
<link rel="icon" type="image/png" sizes="32x32" href="/static/images/favicon/favicon-32x32.png">
Expand Down Expand Up @@ -52,7 +53,7 @@
<div class="fr-header__tools">
<div class="fr-header__tools-links">
<ul class="fr-links-group">
<li class="fr-link fr-fi-question-line">
<li class="fr-link fr-icon-question-line">
<a href="<%= urls.faq %>">Une question ?</a>
</li>
<li>
Expand All @@ -71,4 +72,4 @@
<div class="fr-header__menu-links"></div>
</div>
</div>
</header>
</header>
2 changes: 1 addition & 1 deletion views/partials/notificationError.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="fr-callout fr-fi-alert-line notification--error fr-mb-3w">
<div class="fr-callout fr-icon-alert-line notification--error fr-mb-3w">
<% if (error.message) { %>
<p class="fr-callout__text"><%= error.message %></p>
<% if (error.withContactLink) { %>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/notificationInfo.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- todo : use the notification component, when it is added to the design system. Not present in 1.0.0-rc1.0. -->
<div class="fr-callout fr-fi-information-line notification--info fr-mb-3w">
<div class="fr-callout fr-icon-information-line notification--info fr-mb-3w">
<p class="fr-callout__text"><%= info %></p>
</div>
2 changes: 1 addition & 1 deletion views/partials/notificationSuccess.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="fr-callout fr-fi-checkbox-line notification--success fr-mb-3w">
<div class="fr-callout fr-icon-checkbox-line notification--success fr-mb-3w">
<p class="fr-callout__text"><%= success %></p>
</div>
2 changes: 1 addition & 1 deletion views/partials/unsafeAnnouncementInfo.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
Use this template to display info messages containing HTML.
WARNING : this template does not escape HTML, so be sure that no user-provided data is displayed in it, to avoid injection attacks. (google "server side template injection" to learn about it)
-->
<div class="fr-callout fr-fi-information-line notification--info fr-mb-3w">
<div class="fr-callout fr-icon-information-line notification--info fr-mb-3w">
<p class="fr-callout__text"><%- info %></p>
</div>
Loading