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
9e8e9c73
Commit
9e8e9c73
authored
Nov 17, 2021
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
always access home after connection
parent
1f490c51
Pipeline
#1455
passed with stage
in 1 minute 27 seconds
Changes
5
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
4 deletions
+21
-4
members-space-header.css
members_space/static/css/members-space-header.css
+1
-0
members-space-header.js
members_space/static/js/members-space-header.js
+2
-2
views.py
members_space/views.py
+1
-0
shifts_exchange.html
templates/members_space/shifts_exchange.html
+2
-2
connect.html
templates/website/connect.html
+15
-0
No files found.
members_space/static/css/members-space-header.css
View file @
9e8e9c73
...
@@ -38,6 +38,7 @@
...
@@ -38,6 +38,7 @@
background-color
:
#00a573
;
background-color
:
#00a573
;
color
:
white
;
color
:
white
;
padding
:
1.5rem
1.2rem
;
padding
:
1.5rem
1.2rem
;
display
:
none
;
}
}
@media
screen
and
(
max-width
:
992px
)
{
@media
screen
and
(
max-width
:
992px
)
{
...
...
members_space/static/js/members-space-header.js
View file @
9e8e9c73
...
@@ -48,7 +48,7 @@ $(document).ready(function() {
...
@@ -48,7 +48,7 @@ $(document).ready(function() {
toggleHeader
();
toggleHeader
();
});
});
if
(
partner_data
.
is_associated_people
!
==
"True"
)
{
if
(
partner_data
.
is_associated_people
=
==
"True"
)
{
$
(
".pairs_info"
).
hide
();
$
(
".pairs_info"
).
show
();
}
}
});
});
members_space/views.py
View file @
9e8e9c73
...
@@ -39,6 +39,7 @@ def index(request, exception=None):
...
@@ -39,6 +39,7 @@ def index(request, exception=None):
if
'msg'
in
credentials
:
if
'msg'
in
credentials
:
context
[
'msg'
]
=
credentials
[
'msg'
]
context
[
'msg'
]
=
credentials
[
'msg'
]
context
[
'password_placeholder'
]
=
'Naissance (jjmmaaaa)'
context
[
'password_placeholder'
]
=
'Naissance (jjmmaaaa)'
context
[
'is_member_space'
]
=
True
elif
(
'validation_state'
in
credentials
)
and
credentials
[
'validation_state'
]
==
'waiting_validation_member'
:
elif
(
'validation_state'
in
credentials
)
and
credentials
[
'validation_state'
]
==
'waiting_validation_member'
:
# First connection, until the member validated his account
# First connection, until the member validated his account
template
=
loader
.
get_template
(
'members/validation_coop.html'
)
template
=
loader
.
get_template
(
'members/validation_coop.html'
)
...
...
templates/members_space/shifts_exchange.html
View file @
9e8e9c73
...
@@ -13,8 +13,8 @@
...
@@ -13,8 +13,8 @@
</div>
</div>
<div
id=
"suspended_content"
class=
"shifts_exchange_page_content"
>
<div
id=
"suspended_content"
class=
"shifts_exchange_page_content"
>
<h3>
<h3>
J'ai
<span
class=
"makeups_nb"
></span>
rattrapage
s à effectuer, je dois les
sélectionner pour pouvoir refaire mes courses.
J'ai
<span
class=
"makeups_nb"
></span>
rattrapage
(s) à effectuer, je dois le(s)
sélectionner pour pouvoir refaire mes courses.
J'ai 6 mois de délai pour le
s
rattraper.
J'ai 6 mois de délai pour le
(s)
rattraper.
</h3>
</h3>
<h3>
<h3>
Si besoin, je peux contacter le Bureau des membres via la rubrique "J'ai une demande" pour expliquer ma situation.
Si besoin, je peux contacter le Bureau des membres via la rubrique "J'ai une demande" pour expliquer ma situation.
...
...
templates/website/connect.html
View file @
9e8e9c73
...
@@ -35,4 +35,19 @@
...
@@ -35,4 +35,19 @@
}
}
</script>
</script>
</div>
</div>
<script>
// For the members space, reset url to home when accessing connect page
const
is_member_space
=
'{{is_member_space}}'
;
if
(
is_member_space
===
"True"
)
{
var
app_env
=
'{{app_env}}'
;
var
base_location
=
(
app_env
===
'dev'
)
?
'/members_space/'
:
'/'
;
if
(
window
.
location
.
pathname
===
base_location
)
{
history
.
pushState
({},
''
,
'home'
);
}
else
{
history
.
replaceState
({},
''
,
'home'
);
}
}
</script>
{% endblock %}
{% endblock %}
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