Merge branch 'dev_principale' into 'master'

'Accueil plus clair' configurable

See merge request cooperatic-foodcoops/third-party!6

members/static/css/member.css

@@ -17,15 +17,7 @@ video {max-width:none;}
 #photo_advice, #photo_studio,
 #service_entry_success .compteur
 {display:none;}
-#first_page .btn {
-    height: auto;
-    font-size: xx-large;
-    margin-top: 150px;
-    border-radius: 5px;
-    border: 1px solid;
-    padding: 15px;
-    box-shadow: 1px 1px 2px #555;
-}
+#first_page .btn {height:50px; font-size: xx-large; margin-top:150px;}
 #post_take_buttons .btn--primary,#post_take_buttons .btn--inverse {margin-bottom:15px;}
 
 #shopping_entry .btn--primary,  #service_entry .btn--primary,

members/static/css/member_lgds.css

+#first_page .btn {
+    height: auto;
+    font-size: xx-large;
+    margin-top: 150px;
+    border-radius: 5px;
+    border: 1px solid;
+    padding: 15px;
+    box-shadow: 1px 1px 2px #555;
+}
\ No newline at end of file

members/views.py

@@ -20,8 +20,10 @@ def index(request):
 
     context = {
         'form': '', 'title': 'Coopérateurs',
-        'WELCOME_ENTRANCE_MSG': settings.WELCOME_ENTRANCE_MSG,
-        'WELCOME_SUBTITLE_ENTRANCE_MSG': getattr(settings, 'WELCOME_SUBTITLE_ENTRANCE_MSG', '')
+        'WELCOME_ENTRANCE_MSG': getattr(settings, 'WELCOME_ENTRANCE_MSG', 'Bienvenue !'),
+        'WELCOME_SUBTITLE_ENTRANCE_MSG': getattr(settings, 'WELCOME_SUBTITLE_ENTRANCE_MSG', ''),
+        'ENTRANCE_SHOPPING_BTN': getattr(settings, 'ENTRANCE_SHOPPING_BTN', 'Je viens faire mes courses'),
+        'ENTRANCE_SERVICE_BTN': getattr(settings, 'ENTRANCE_SERVICE_BTN', 'Je viens faire mon service')
     }
     for_shoping_msg = getattr(settings, 'ENTRANCE_COME_FOR_SHOPING_MSG', '')
 

outils/config.example.py

@@ -16,9 +16,11 @@ SUBSCRIPTION_PAYMENT_MEANINGS = [
 ]
 
 # Borne d'accueil /members/
-WELCOME_ENTRANCE_MSG="Bienvenue dans ce super-marché"
+WELCOME_ENTRANCE_MSG = "Bienvenue dans ce super-marché"
 # Sous-titre optionel
-#WELCOME_SUBTITLE_ENTRANCE_MSG="Vous êtes venu aujourd'hui pour…"
+#WELCOME_SUBTITLE_ENTRANCE_MSG = "Vous êtes venu aujourd'hui pour…"
+#ENTRANCE_SHOPPING_BTN = "…faire <b>mes courses 🛒"
+#ENTRANCE_SERVICE_BTN = "…faire <b>mon service 🤝"
 
 # Shop
 COMPANY_NAME = "Demo interfoodcoop"

outils/config.md

@@ -202,12 +202,23 @@
 
 ### Entrance module
 
+- WELCOME_ENTRANCE_MSG = "Bienvenue dans ce super-marché"
+
+        Message shown as H1 at screen top
+
+- WELCOME_SUBTITLE_ENTRANCE_MSG = "Vous êtes venu aujourd'hui pour..."
+
+        Text to introduce button texts (Here for shopping or for a shift)
+
 - ENTRANCE_COME_FOR_SHOPING_MSG = "Hey coucou toi ! Cet été nous sommes plus de <strong>1000 acheteur·euses</strong> pour seulement  <strong>300 coopérateur·rice·s</strong> en service. <br />Tu fais tes courses à La Cagette cet été ?<br/> Inscris-toi sur ton espace membre !"
 
 - ENTRANCE_FTOP_BUTTON_DISPLAY = False
 
         Hide the "I come as FTOP" button when set on False
 
+- ENTRANCE_SHOPPING_BTN = "…faire <b>mes courses 🛒"
+
+- ENTRANCE_SERVICE_BTN = "…faire <b>mon service 🤝"
 
 ### Member space
 

templates/members/index.html

-{% extends "base.html" %}
+{% extends "members/base.html" %}
 {% load static %}
 {% block additionnal_css %}
-  <link rel="stylesheet" href="{% static "css/member.css" %}?v=">
+  <link rel="stylesheet" href="{% static 'css/member.css' %}?v=">
+  {{ block.super }}
 {% endblock %}
 {% block additionnal_scripts %}
  <script type="text/javascript">
@@ -31,10 +32,10 @@
     <h4 class="col-6 txtcenter">{{WELCOME_SUBTITLE_ENTRANCE_MSG|safe}}</h4>
   {% endif %}
     <div class="col-1"></div>
-    <a class="col-4 row-2 btn txtcenter b_yellow" data-next="shopping_entry">…faire <b>mes courses 🛒</b></a>
+    <a class="col-4 row-2 btn txtcenter b_yellow" data-next="shopping_entry">{{ENTRANCE_SHOPPING_BTN|safe}}</b></a>
     <div class="col-1 row-2"></div>
     <div class="col-1 row-2"></div>
-    <a class="col-4 row-2 btn txtcenter b_green" data-next="service_entry">…faire <b>mon service 🤝</b></a>
+    <a class="col-4 row-2 btn txtcenter b_green" data-next="service_entry">{{ENTRANCE_SERVICE_BTN|safe}}</b></a>
     <div class="col-1 row-2"></div>
 </section>
 <section class="grid-6 has-gutter" id="shopping_entry">