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
d3bee25b
Commit
d3bee25b
authored
Sep 28, 2021
by
François
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Inclusion messages borne et info horaire ouvertures
parent
b2d342e9
Pipeline
#1328
failed with stage
in 1 minute 24 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
0 deletions
+29
-0
members-space.css
members_space/static/css/members-space.css
+8
-0
views.py
members_space/views.py
+8
-0
home.html
templates/members_space/home.html
+13
-0
No files found.
members_space/static/css/members-space.css
View file @
d3bee25b
...
@@ -24,6 +24,14 @@ body {
...
@@ -24,6 +24,14 @@ body {
box-shadow
:
2px
2px
3px
rgba
(
10
,
10
,
10
,
.1
),
0
0
0
1px
rgba
(
10
,
10
,
10
,
.1
);
box-shadow
:
2px
2px
3px
rgba
(
10
,
10
,
10
,
.1
),
0
0
0
1px
rgba
(
10
,
10
,
10
,
.1
);
}
}
.subtile
{
}
.subtile.two
{
max-width
:
45%
;
}
.full_width_tile
{
.full_width_tile
{
flex
:
1
0
90%
;
flex
:
1
0
90%
;
min-height
:
100px
;
min-height
:
100px
;
...
...
members_space/views.py
View file @
d3bee25b
...
@@ -4,6 +4,7 @@ from outils.for_view_imports import *
...
@@ -4,6 +4,7 @@ from outils.for_view_imports import *
from
django.urls
import
reverse
from
django.urls
import
reverse
from
outils.common
import
Verification
from
outils.common
import
Verification
from
outils.common
import
MConfig
from
members.models
import
CagetteMember
from
members.models
import
CagetteMember
from
shifts.models
import
CagetteShift
from
shifts.models
import
CagetteShift
from
members_space.models
import
CagetteMembersSpace
from
members_space.models
import
CagetteMembersSpace
...
@@ -103,6 +104,7 @@ def index(request, exception=None):
...
@@ -103,6 +104,7 @@ def index(request, exception=None):
if
hasattr
(
settings
,
'SHIFT_EXCHANGE_DAYS_TO_HIDE'
):
if
hasattr
(
settings
,
'SHIFT_EXCHANGE_DAYS_TO_HIDE'
):
days_to_hide
=
settings
.
SHIFT_EXCHANGE_DAYS_TO_HIDE
days_to_hide
=
settings
.
SHIFT_EXCHANGE_DAYS_TO_HIDE
context
[
'daysToHide'
]
=
days_to_hide
context
[
'daysToHide'
]
=
days_to_hide
else
:
else
:
# may arrive when switching database without cleaning cookie
# may arrive when switching database without cleaning cookie
return
redirect
(
'/website/deconnect'
)
return
redirect
(
'/website/deconnect'
)
...
@@ -114,6 +116,12 @@ def home(request):
...
@@ -114,6 +116,12 @@ def home(request):
context
=
{
context
=
{
'title'
:
'Espace Membres'
,
'title'
:
'Espace Membres'
,
}
}
# Get messages to display
msettings
=
MConfig
.
get_settings
(
'members'
)
if
'msg_accueil'
in
msettings
:
context
[
'msg_accueil'
]
=
msettings
[
'msg_accueil'
][
'value'
]
if
'shop_opening_hours'
in
msettings
:
context
[
'shop_opening_hours'
]
=
msettings
[
'shop_opening_hours'
][
'value'
]
return
HttpResponse
(
template
.
render
(
context
,
request
))
return
HttpResponse
(
template
.
render
(
context
,
request
))
def
my_info
(
request
):
def
my_info
(
request
):
...
...
templates/members_space/home.html
View file @
d3bee25b
...
@@ -73,5 +73,17 @@
...
@@ -73,5 +73,17 @@
À venir...
À venir...
</div>
</div>
</div>
</div>
<div
class=
"tile"
id=
"home_tile_message"
>
<div
class=
"tile_title"
>
<i
class=
"fas fa-newspaper tile_icon"
></i>
Informations magasins
</div>
<div
class=
"subtile"
>
{{msg_accueil|safe}}
</div>
<div
class=
"subtile"
>
{{shop_opening_hours|safe}}
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
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