Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
third-party
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cooperatic-foodcoops
third-party
Commits
90c64d98
Commit
90c64d98
authored
3 years ago
by
Etienne Freiss
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ticket 1677 terminé
parent
7e1890c5
dev_cooperatic
…
#5673_bug_calendrier_echange_service
3832-makeups-and-member-status-update
4081
4444_improve_presence_recording
4709
4778-reception-dont-get-finished-orders
4809-remove-shelf-value-col-to-reduce-server-load
4880-rapports-reception-faux
4950-douchage-appli-reception
5474-et-5462-Voir-les-rattrapages-choisis-dans-admin-bdm-et-corrige-lenteur-affichage-admin-rattrapages
5641-reception-trier-a-la-maj-prix-dans-ordre-de-pointage-quantites
6286_bug_encaissement_souscription_cheque_espece
6813-marking-parent-gone-when-unpairing-binom-does-not-unsuscribe-parent-from-shift-template
6832--certaines-absences-engendrent-une-erreur
7723-7559-change-purchase-order-workflow-django-side
7731-third-party-side-brinks-pos-export-not-working
7747-inventaire-par-article
7800-make-test-solution-work
7848-cannot-validate-qty-with-decimal-on-kg-product
adaptation_supercafoutch
adaptation_supercoop
adaptation_supercoop_supercafoutch
adpatation_chouette
assistance_import_article
coop_dev_necessitant_modules_bdm_odoo_modifies
correctif_nb_rattrapages_creation_binome_avec_ajout_automatique_au_point_negatif
dev_principale
docker
export_capital_detenu
fix_bug_process_picking
fusion_custom_graoucoop
graoucoop_backup
graoucoop_prod
graoucoop_tmp
hot_fix_shelf_labels_auto_print
impression_etiquettes_rayons
integration_lien_precommandes_dans_espace_membre
lacagette_prod
local_branch
master
meal-voucher-and-label-printer-software-bug
migration-v12
pour_graoucoop_prod
pour_version_prod_cagette
refonte_espace_membre_sc
retouches_tickets_supercoop
sc-setup-stock-app
supercafoutch-preprod
supercafoutch-prod-20221003
supercafoutch_prod
ticket_4146
supercafoutch_20250120_151258
supercafoutch_20250120_150340
supercafoutch_20240909_080630
supercafoutch_20240609_115709
supercafoutch_20240212_082431
supercafoutch_20240107_181851
supercafoutch_prod_until_240107
supercafoutch-prod-20221003
supercafoutch-230911
supercafoutch-230824
supercafoutch-230823
supercafoutch-230823-the-true-one
migration-v12-tag
lacagette_20240310_074751
lacagette_20240107_122554
lacagette_20240107_120916
graoucoop_20240609_122614
cagette_testtag
cagette-230814
cagette-230630
6 merge requests
!62
Ticket 1674
,
!103
WIP: Dev cooperatic
,
!84
Ticket 1738
,
!87
Integration Evolution bdm
,
!104
merge dev_cooperatic into dev_principale
,
!106
Dev principale
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
16 deletions
+25
-16
members-space-faq.css
members_space/static/css/members-space-faq.css
+12
-3
members-space-header.js
members_space/static/js/members-space-header.js
+1
-1
members-space.js
members_space/static/js/members-space.js
+2
-2
faq.html
templates/members_space/faq.html
+10
-10
No files found.
members_space/static/css/members-space-faq.css
View file @
90c64d98
...
...
@@ -2,9 +2,7 @@
font-size
:
1.8rem
;
}
.btn_faq
{
white-space
:
normal
;
}
.grp_text
{
margin-top
:
25px
;
}
...
...
@@ -58,6 +56,17 @@ button.accordion.active::after {
content
:
"\2212"
;
}
.btn_faq
{
white-space
:
normal
;
border-radius
:
5px
;
margin-top
:
3px
;
padding-right
:
25px
;
display
:
flex
;
align-items
:
flex-end
;
}
.full_width
{
width
:
100%
;
}
.faq_link_button_area
{
margin-top
:
10px
;
height
:
100%
;
...
...
This diff is collapsed.
Click to expand it.
members_space/static/js/members-space-header.js
View file @
90c64d98
...
...
@@ -39,7 +39,7 @@ $(document).ready(function() {
$
(
'#faq'
).
on
(
'click'
,
(
e
)
=>
{
e
.
preventDefault
();
if
(
current_location
!==
"faq"
)
{
goto
(
'faq'
);
goto
(
'faq
BDM
'
);
}
toggleHeader
();
});
...
...
This diff is collapsed.
Click to expand it.
members_space/static/js/members-space.js
View file @
90c64d98
...
...
@@ -55,7 +55,7 @@ function load_partner_shifts(partner_id) {
/* - Navigation */
/**
* @param {String} page home | mes-infos | mes-services | echange-de-services
* @param {String} page home | mes-infos | mes-services | echange-de-services
| faqBDM
*/
function
goto
(
page
)
{
if
(
window
.
location
.
pathname
===
base_location
)
{
...
...
@@ -84,7 +84,7 @@ function update_dom() {
current_location
=
"my_shifts"
;
$
(
"#main_content"
).
load
(
"/members_space/my_shifts"
,
update_content
);
$
(
"#nav_my_shifts"
).
addClass
(
"active"
);
}
else
if
(
window
.
location
.
pathname
===
base_location
+
"faq"
)
{
}
else
if
(
window
.
location
.
pathname
===
base_location
+
"faq
BDM
"
)
{
current_location
=
"faq"
;
$
(
"#main_content"
).
load
(
"/members_space/faq"
,
update_content
);
$
(
"#faq"
).
addClass
(
"active"
);
...
...
This diff is collapsed.
Click to expand it.
templates/members_space/faq.html
View file @
90c64d98
...
...
@@ -27,7 +27,7 @@
</h3>
<div
class=
"param"
>
<button
type=
"button"
class=
"accordion btn_faq"
>
<p
>
000 Gestion de mon créneau: réinscription, changement, désinscription temporaire (absence de moyenne ou longue durée)
</p
>
<p
class=
"full_width"
>
000 Gestion de mon créneau: réinscription, changement, désinscription temporaire (absence de moyenne ou longue durée)
</p
>
</button>
<div
class=
"input-container panel"
>
...
...
@@ -98,7 +98,7 @@
</div>
</div>
<button
type=
"button"
class=
"accordion btn_faq"
>
<p
>
001 Gestion de mes services: échanger son service, arrivé.e en retard à son service, demande de congés maladie ou parental
</p
>
<p
class=
"full_width"
>
001 Gestion de mes services: échanger son service, arrivé.e en retard à son service, demande de congés maladie ou parental
</p
>
</button>
<div
class=
"input-container panel"
>
...
...
@@ -183,7 +183,7 @@
</div>
</div>
<button
type=
"button"
class=
"accordion btn_faq"
>
<p
>
002 Mon statut: Je suis suspendu.e ou désinscrit.e et je ne peux pas faire mes courses
</p
>
<p
class=
"full_width"
>
002 Mon statut: Je suis suspendu.e ou désinscrit.e et je ne peux pas faire mes courses
</p
>
</button>
<div
class=
"input-container panel"
>
...
...
@@ -246,7 +246,7 @@
</div>
<button
type=
"button"
class=
"accordion btn_faq"
>
<p
>
003 Mon binôme: créer un binôme, se désolidariser de son binôme, changer de binôme
</p
>
<p
class=
"full_width"
>
003 Mon binôme: créer un binôme, se désolidariser de son binôme, changer de binôme
</p
>
</button>
<div
class=
"input-container panel"
>
...
...
@@ -299,7 +299,7 @@
</div>
</div>
<button
type=
"button"
class=
"accordion btn_faq"
>
<p
>
004 Spécial Covid: Tu as la Covid ou tu es cas contact, fin d'exemption Covid
</p
>
<p
class=
"full_width"
>
004 Spécial Covid: Tu as la Covid ou tu es cas contact, fin d'exemption Covid
</p
>
</button>
<div
class=
"input-container panel"
>
...
...
@@ -353,7 +353,7 @@
</div>
<button
type=
"button"
class=
"accordion btn_faq"
>
<p
>
005 Je veux que mes enfants puissent faire les courses à ma place
</p
>
<p
class=
"full_width"
>
005 Je veux que mes enfants puissent faire les courses à ma place
</p
>
</button>
<div
class=
"input-container panel"
>
...
...
@@ -379,7 +379,7 @@
</div>
</div>
<button
type=
"button"
class=
"accordion btn_faq"
>
<p
>
006 Je veux changer d'adresse mail
</p
>
<p
class=
"full_width"
>
006 Je veux changer d'adresse mail
</p
>
</button>
<div
class=
"input-container panel"
>
...
...
@@ -407,7 +407,7 @@
</div>
</div>
<button
type=
"button"
class=
"accordion btn_faq"
>
<p
>
007 Je veux quitter la coopérative
</p
>
<p
class=
"full_width"
>
007 Je veux quitter la coopérative
</p
>
</button>
<div
class=
"input-container panel"
>
...
...
@@ -447,7 +447,7 @@
</div>
</div>
<button
type=
"button"
class=
"accordion btn_faq"
>
<p
>
008 Brigade Solidaire: s'inscrire ou se désinscrire de la brigade
</p
>
<p
class=
"full_width"
>
008 Brigade Solidaire: s'inscrire ou se désinscrire de la brigade
</p
>
</button>
<div
class=
"input-container panel"
>
...
...
@@ -487,7 +487,7 @@
</div>
</div>
<button
type=
"button"
class=
"accordion btn_faq"
>
<p
>
009 Faire un autre demande au BDM: seulement si les autres formulaires ne correspondent pas à ma demande
</p
>
<p
class=
"full_width"
>
009 Faire un autre demande au BDM: seulement si les autres formulaires ne correspondent pas à ma demande
</p
>
</button>
<div
class=
"input-container panel"
>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment