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
a46d596a
Commit
a46d596a
authored
Nov 18, 2021
by
Etienne Freiss
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correction bug url
parent
c0675619
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
13 deletions
+15
-13
members-space-faq.css
members_space/static/css/members-space-faq.css
+1
-1
members-space-header.js
members_space/static/js/members-space-header.js
+3
-3
members-space.js
members_space/static/js/members-space.js
+5
-5
urls.py
members_space/urls.py
+1
-1
views.py
members_space/views.py
+1
-1
faq.html
templates/members_space/faq.html
+1
-1
header.html
templates/members_space/header.html
+3
-1
No files found.
members_space/static/css/members-space-faq.css
View file @
a46d596a
#faq
{
#faq
BDM
{
font-size
:
1.8rem
;
font-size
:
1.8rem
;
}
}
...
...
members_space/static/js/members-space-header.js
View file @
a46d596a
...
@@ -36,10 +36,10 @@ $(document).ready(function() {
...
@@ -36,10 +36,10 @@ $(document).ready(function() {
}
}
toggleHeader
();
toggleHeader
();
});
});
$
(
'#faq'
).
on
(
'click'
,
(
e
)
=>
{
$
(
'#faq
BDM
'
).
on
(
'click'
,
(
e
)
=>
{
e
.
preventDefault
();
e
.
preventDefault
();
if
(
current_location
!==
"faq"
)
{
if
(
current_location
!==
"faq
BDM
"
)
{
goto
(
'faq
BDM
'
);
goto
(
'faq'
);
}
}
toggleHeader
();
toggleHeader
();
});
});
...
...
members_space/static/js/members-space.js
View file @
a46d596a
...
@@ -55,7 +55,7 @@ function load_partner_shifts(partner_id) {
...
@@ -55,7 +55,7 @@ function load_partner_shifts(partner_id) {
/* - Navigation */
/* - Navigation */
/**
/**
* @param {String} page home | mes-infos | mes-services | echange-de-services | faq
BDM
* @param {String} page home | mes-infos | mes-services | echange-de-services | faq
*/
*/
function
goto
(
page
)
{
function
goto
(
page
)
{
if
(
window
.
location
.
pathname
===
base_location
)
{
if
(
window
.
location
.
pathname
===
base_location
)
{
...
@@ -88,10 +88,10 @@ function update_dom() {
...
@@ -88,10 +88,10 @@ function update_dom() {
current_location
=
"my_shifts"
;
current_location
=
"my_shifts"
;
$
(
"#main_content"
).
load
(
"/members_space/my_shifts"
,
update_content
);
$
(
"#main_content"
).
load
(
"/members_space/my_shifts"
,
update_content
);
$
(
"#nav_my_shifts"
).
addClass
(
"active"
);
$
(
"#nav_my_shifts"
).
addClass
(
"active"
);
}
else
if
(
window
.
location
.
pathname
===
base_location
+
"faq
BDM
"
)
{
}
else
if
(
window
.
location
.
pathname
===
base_location
+
"faq"
)
{
current_location
=
"faq"
;
current_location
=
"faq
BDM
"
;
$
(
"#main_content"
).
load
(
"/members_space/faq"
,
update_content
);
$
(
"#main_content"
).
load
(
"/members_space/faq
BDM
"
,
update_content
);
$
(
"#faq"
).
addClass
(
"active"
);
$
(
"#faq
BDM
"
).
addClass
(
"active"
);
}
else
if
(
window
.
location
.
pathname
===
base_location
+
"echange-de-services"
)
{
}
else
if
(
window
.
location
.
pathname
===
base_location
+
"echange-de-services"
)
{
current_location
=
"shifts_exchange"
;
current_location
=
"shifts_exchange"
;
$
(
"#main_content"
).
load
(
"/members_space/shifts_exchange"
,
update_content
);
$
(
"#main_content"
).
load
(
"/members_space/shifts_exchange"
,
update_content
);
...
...
members_space/urls.py
View file @
a46d596a
...
@@ -9,7 +9,7 @@ urlpatterns = [
...
@@ -9,7 +9,7 @@ urlpatterns = [
url
(
r'^my_info$'
,
views
.
my_info
),
url
(
r'^my_info$'
,
views
.
my_info
),
url
(
r'^my_shifts$'
,
views
.
my_shifts
),
url
(
r'^my_shifts$'
,
views
.
my_shifts
),
url
(
r'^shifts_exchange$'
,
views
.
shifts_exchange
),
url
(
r'^shifts_exchange$'
,
views
.
shifts_exchange
),
url
(
r'^faq
$'
,
views
.
faq
),
url
(
r'^faq
BDM$'
,
views
.
faqBDM
),
url
(
r'^no_content$'
,
views
.
no_content
),
url
(
r'^no_content$'
,
views
.
no_content
),
url
(
r'^get_shifts_history$'
,
views
.
get_shifts_history
),
url
(
r'^get_shifts_history$'
,
views
.
get_shifts_history
),
url
(
'/*$'
,
views
.
index
),
# Urls unknown from the server will redirect to index
url
(
'/*$'
,
views
.
index
),
# Urls unknown from the server will redirect to index
...
...
members_space/views.py
View file @
a46d596a
...
@@ -193,7 +193,7 @@ def shifts_exchange(request):
...
@@ -193,7 +193,7 @@ def shifts_exchange(request):
}
}
return
HttpResponse
(
template
.
render
(
context
,
request
))
return
HttpResponse
(
template
.
render
(
context
,
request
))
def
faq
(
request
):
def
faq
BDM
(
request
):
template
=
loader
.
get_template
(
'members_space/faq.html'
)
template
=
loader
.
get_template
(
'members_space/faq.html'
)
context
=
{
context
=
{
'title'
:
'foire aux questions'
,
'title'
:
'foire aux questions'
,
...
...
templates/members_space/faq.html
View file @
a46d596a
<div
id=
"faq"
class=
" mt-3"
>
<div
id=
"faq
BDM
"
class=
" mt-3"
>
<div
class=
"page_title txtcenter"
>
<div
class=
"page_title txtcenter"
>
<h1>
<h1>
...
...
templates/members_space/header.html
View file @
a46d596a
...
@@ -9,8 +9,8 @@
...
@@ -9,8 +9,8 @@
<a
href=
"#"
class=
"nav_item active"
id=
"nav_home"
>
Espace Membre
</a>
<a
href=
"#"
class=
"nav_item active"
id=
"nav_home"
>
Espace Membre
</a>
<a
href=
"#"
class=
"nav_item"
id=
"nav_my_info"
>
Mes Infos
</a>
<a
href=
"#"
class=
"nav_item"
id=
"nav_my_info"
>
Mes Infos
</a>
<a
href=
"#"
class=
"nav_item"
id=
"nav_my_shifts"
>
Mes Services
</a>
<a
href=
"#"
class=
"nav_item"
id=
"nav_my_shifts"
>
Mes Services
</a>
<a
href=
"#"
class=
"nav_item"
id=
"faq"
>
FAQ
</a>
<a
href=
"#"
class=
"nav_item"
id=
"nav_shifts_exchange"
>
Échange de services
</a>
<a
href=
"#"
class=
"nav_item"
id=
"nav_shifts_exchange"
>
Échange de services
</a>
<a
<a
href=
"javascript:void(0);"
href=
"javascript:void(0);"
target=
"_blank"
target=
"_blank"
...
@@ -19,6 +19,8 @@
...
@@ -19,6 +19,8 @@
>
>
Calendrier ABCD
Calendrier ABCD
</a>
</a>
<a
href=
"#"
class=
"nav_item"
id=
"faqBDM"
>
FAQ
</a>
{# Disconnection button must have this id (logic in all_common.js) #}
{# Disconnection button must have this id (logic in all_common.js) #}
<a
href=
"javascript:void(0);"
id=
"deconnect"
>
Déconnexion
</a>
<a
href=
"javascript:void(0);"
id=
"deconnect"
>
Déconnexion
</a>
<a
href=
"javascript:void(0);"
class=
"icon"
onclick=
"toggleHeader()"
>
<a
href=
"javascript:void(0);"
class=
"icon"
onclick=
"toggleHeader()"
>
...
...
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