Merge branch 'develop'

Fix : provider security
Fix : probleme css dot nav tuto
2018-01-24 12:04:38 +01:00 · 2018-01-24 12:04:20 +01:00 · 2018-01-22 15:36:16 +01:00 · 2018-01-22 15:09:57 +01:00 · 2018-01-22 15:09:49 +01:00 · 2018-01-22 15:09:36 +01:00
8 changed files with 17 additions and 13 deletions
@@ -7,10 +7,10 @@
                    <div class="owl-carousel tuto-carousel">
                        <div class="item-tuto-webcam carousel-item">
                            <div class="row">
-                                <div class="col s4 offset-s1">
+                                <div class="col s4 offset-s1 hide-on-med-and-down">
                                    <img class="responsive-img" src="{{ asset('img/img_popupcv/cv_video_step_1.svg')}}" alt="">
                                </div>
-                                <div class="col s6 offset-s1 left-align">
+                                <div class="col s11 m11 l6 offset-s1 left-align">
                                    <strong><span class="color-blue1">30 Minutes</span> avant l’enregistrement</strong>
                                    <br /><br />
                                    <u>Préparez un discours <strong>clair</strong> et <strong>concis</strong></u>
@@ -31,10 +31,10 @@
                        </div>
                        <div class="item-tuto-webcam carousel-item">
                            <div class="row">
-                                <div class="col s4 offset-s1">
+                                <div class="col s4 offset-s1 hide-on-med-and-down">
                                    <img class="responsive-img" src="{{ asset('img/img_popupcv/cv_video_step_2.svg')}}" alt="">
                                </div>
-                                <div class="col s6 offset-s1 left-align">
+                                <div class="col s11 m11 l6 offset-s1 left-align">
                                    <strong><span class="color-blue1">2 Minutes</span> avant l’enregistrement</strong>
                                    <br /><br />
                                    <u>Préparer votre lieu de tournage :</u>
@@ -51,10 +51,10 @@
                        </div>
                        <div class="item-tuto-webcam carousel-item">
                            <div class="row">
-                                <div class="col s4 offset-s1">
+                                <div class="col s4 offset-s1 hide-on-med-and-down">
                                    <img class="responsive-img" src="{{ asset('img/img_popupcv/cv_video_step_3.svg')}}" alt="">
                                </div>
-                                <div class="col s6 offset-s1 left-align">
+                                <div class="col s11 m11 l6 offset-s1 left-align">
                                    <strong><span class="color-blue1">10 secondes</span> avant l’enregistrement</strong>
                                    <br /><br />
                                    <u>Quelques informations à savoir avant le grand bain :</u>
@@ -67,7 +67,7 @@
                                        <li>Recommencez autant de fois que nécessaire.</li>
                                    </ul>
                                    <br /><br />
-                                    Bon courage !
+                                    C’est à vous !
                                    </strong>
                                </div>
                            </div>
@@ -185,7 +185,7 @@
        var urlDelete = '';
        var idObject = null;
        var typeObject = null;
-        var videoExist = true;
+        var videoExist = false;
        var mediaDefaultUrl = '{{ path("media_default") }}';
        var idUser = '{{ app.user.id }}';
        var mediaEditTitleUrl = "{{ path('media_edit_title', {'id': 'id_video'})|escape('js') }}";
@@ -27,3 +27,4 @@ parameters:

    elastic_host: tt-website.elasticsearch.prod
    elastic_port: 9200
+    delivery_addresses: thomas@e-declic.com
@@ -3,8 +3,8 @@ security:
        in_memory:
            memory: ~
        fos_userbundle:
-            #id: fos_user.user_provider.username_email
-            id: app.user_provider
+            id: fos_user.user_provider.username_email
+            #id: app.user_provider

    firewalls:
        dev:
@@ -15553,6 +15553,7 @@ table.highlight > tbody > tr:hover {
  #answerPage .col-content.bg-arrow {
    background: url(/img/img_popupcv/step_arrow.svg) 40px no-repeat #FFFFFF; }
  #answerPage #modal-tuto {
+    min-height: 540px;
    background: #FFFFFF; }
    #answerPage #modal-tuto .col-content {
      margin-bottom: 0; }
@@ -50,6 +50,8 @@ $(document).ready(function(){
        openModal();
    }
    $(".view-tuto").on('click', function(){
+        var toIndex = 0;
+        $(".tuto-carousel").trigger("to.owl.carousel", [toIndex, 1, true]);
        openModal();
    });

@@ -10,7 +10,6 @@
        margin-top: 40px;
    }
 }
-
 .tuto-carousel{
    .owl-item {
        display: inline !important;
@@ -49,7 +48,7 @@
 }
 .carousel-fixed-item{
    margin-right: 45px;
-    margin-top: -40px;
+    margin-top:-40px;
    position: relative;
    z-index: 100;
 }
@@ -75,6 +74,7 @@
        background: url(/img/img_popupcv/step_arrow.svg) 40px no-repeat #FFFFFF;;
    } 
    #modal-tuto{
+        min-height: 540px;
        background: $white;
        .col-content{
            margin-bottom: 0;
Author	SHA1	Message	Date
Thomas MONCHICOURT	0f195907c5	Merge branch 'develop'	2018-01-24 12:04:38 +01:00
Thomas MONCHICOURT	8dabe7ba82	Fix : provider security	2018-01-24 12:04:20 +01:00
Thomas MONCHICOURT	0bfed4b932	Fix : probleme css dot nav tuto	2018-01-22 15:36:16 +01:00
Thomas MONCHICOURT	bf875db942	Fix : dropzone js error	2018-01-22 15:09:57 +01:00
Thomas MONCHICOURT	5c47a00d0e	Fix : Start to first panel tuto when restart	2018-01-22 15:09:49 +01:00
Thomas MONCHICOURT	0f8fe7732e	Fix : amelioration graphique tuto	2018-01-22 15:09:36 +01:00
Thomas MONCHICOURT	bed4cbc7b1	Fix : Start to first panel tuto when restart	2018-01-22 14:27:48 +01:00
Thomas MONCHICOURT	b09ca38415	Fix : dropzone js error	2018-01-22 14:07:12 +01:00
Thomas MONCHICOURT	c0f09f715c	Fix : delevery address	2018-01-22 12:10:57 +01:00
Thomas MONCHICOURT	4cb07a74b6	Fix : conf preprod	2018-01-22 09:29:58 +01:00