Merge branch 'master' into PHRAS-3169_Prod_video_tools_vtt_with_number

lib/Alchemy/Phrasea/Application.php

@@ -618,7 +618,7 @@ class Application extends SilexApplication
         );
 
         $this['tmp.lazaret.path'] = $factory->createDefinition(
-            ['main', 'storage', 'quarantine'],
+            ['main', 'storage', 'lazaret'],
             function (Application $app) {
                 return $app['tmp.path'].'/lazaret';
             }

resources/www/common/styles/main.scss

@@ -164,3 +164,20 @@ $mainMenuLinkBackgroundHoverColor: transparent;
 
 }
 
+.acceptDl-info {
+  background-color: #d9edf7;
+  border: 1px solid #bce8f1;
+  border-radius: 3px;
+  color: #3a87ad;
+  display: inline-block;
+  padding: 9px 24px 5px 9px;
+  margin-bottom: 20px;
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
+  a, label {
+    color: #3a87ad!important;
+  }
+  a {
+    text-decoration: underline;
+  }
+}
+

resources/www/lightbox/styles/main.scss

@@ -713,3 +713,21 @@ a.btn-info {
 }
 
 /** End Lightbox summary modal**/
+
+.humane{
+  position: fixed;
+  z-index: 100000;
+  font-family: Ubuntu, Arial, sans-serif;
+  text-align: center;
+  font-size: 15px;
+  top: 100px;
+  right: 70px;
+  width: 400px;
+  background: #2d2d72;
+  color: rgb(255, 255, 255);
+  box-shadow: rgb(0, 0, 0) 0px 4px 4px -4px;
+  transform: translateY(-40px);
+  transition: all 0.3s ease-out 0s;
+  padding: 10px;
+  border-radius: 5px;
+}

templates/web/common/dialog_export.html.twig

@@ -152,9 +152,8 @@
                             </div>
                         {% endif %}
                         {{ _self.choose_title('download', choose_export_title, default_export_title) }}
-
                         {% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %}
-                            <div class="well-small">
+                            <div class="well-small acceptDl-info">
                                 <label for="TOU_acceptDL" class="checkbox">
                                     <input type="checkbox" name="TOU_accept" id="TOU_acceptDL" value="1"  />
                                     {% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}
@@ -180,18 +179,20 @@
                             {{ 'export::mail: destinataire' | trans }}
                             <input type="text" value="" name="destmail" class="required span4">
                             {% set my_email = app.getAuthenticatedUser().getEmail() %}
-                            {% if my_email != '' %}
+                            <div class="acceptDl-info">
-                                <label class="checkbox">
+                                {% if my_email != '' %}
-                                    <input type="checkbox" name="reading_confirm" value="1" />
+                                        <label class="checkbox">
-                                    {% trans with {'%my_email%' : my_email} %}Recevoir un accuse de reception a %my_email%{% endtrans %}
+                                            <input type="checkbox" name="reading_confirm" value="1" />
-                                </label>
+                                            {% trans with {'%my_email%' : my_email} %}Recevoir un accuse de reception a %my_email%{% endtrans %}
-                            {% else %}
+                                        </label>
-                                <label class="checkbox">
+                                {% else %}
-                                    {{ 'Accuse de reception indisponible, vous n\'avez pas declare d\'adresse email' | trans }}
+                                    <label class="checkbox">
-                                    <input type="checkbox" name="reading_confirm" value="1" readonly />
+                                        {{ 'Accuse de reception indisponible, vous n\'avez pas declare d\'adresse email' | trans }}
-                                </label>
+                                        <input type="checkbox" name="reading_confirm" value="1" readonly />
-                            {% endif %}
+                                    </label>
-                            <span style="font-style: italic; color: #999999;">{{ 'Entrez plusieurs adresses email en les separant par des points-virgules' | trans }}</span>
+                                {% endif %}
+                                <span style="font-style: italic; color: #999999;">{{ 'Entrez plusieurs adresses email en les separant par des points-virgules' | trans }}</span>
+                            </div>
                         </div>
                         <div>
                             <p>{{ 'export::mail: contenu du mail' | trans }}</p>
@@ -235,7 +236,7 @@
                         {{ _self.choose_title('sendmail', choose_export_title, default_export_title) }}
 
                         {% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %}
-                            <div class="well-small">
+                            <div class="well-small acceptDl-info">
                                 <label for="TOU_acceptMail" class="checkbox">
                                     <input type="checkbox" name="TOU_accept" id="TOU_acceptMail" value="1"  />
                                     {% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}
@@ -388,7 +389,7 @@
                     </div>
 
                     {% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %}
-                        <div class="well-small">
+                        <div class="well-small acceptDl-info">
                             <label for="TOU_acceptOrder" class="checkbox">
                                 <input type="checkbox" name="TOU_accept" id="TOU_acceptOrder" value="1"  />
                                 {% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}
@@ -469,7 +470,7 @@
                         {% endif %}
 
                         {% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %}
-                            <div class="well-small">
+                            <div class="well-small acceptDl-info">
                                 <label for="TOU_acceptFTP" class="checkbox">
                                     <input type="checkbox" name="TOU_accept" id="TOU_acceptFTP" value="1"  />
                                     {% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}

templates/web/lightbox/index.html.twig

@@ -11,10 +11,6 @@
     <link type="text/css" rel="stylesheet" href="/assets/lightbox/css/lightbox{% if not app.debug %}.min{% endif %}.css" media="screen"/>
 {% endblock %}
 
-  {% block icon %}
-  <link rel="shortcut icon" type="image/x-icon" href="/assets/lightbox/images/favicon.ico">
-  {% endblock %}
-
 {% block content %}
     <div id="main_index" style="margin-top:50px;">
         <table id="main_wrapper" cellspacing="0" cellpadding="0">

templates/web/lightbox/index_layout.html.twig

@@ -1,5 +1,8 @@
 {% extends "common/index_bootstrap.html.twig" %}
 
+{% block icon %}
+    <link rel="shortcut icon" type="image/x-icon" href="/assets/lightbox/images/favicon.ico">
+{% endblock %}
 {% block extra_content %}
     <div id="DIALOG"></div>
 {% endblock %}

templates/web/lightbox/validate.html.twig

@@ -15,6 +15,7 @@
 {% block content %}
     {% set basket_element = basket.getElements().first() %}
     <div class="PNB10">
+        <input type="hidden" id="export-send-mail-notif" value="{{ 'prod::export: send mail notification' | trans }} ">
         <div class="PNB" id="top_container">
             <div id="record_wrapper" class="PNB single" style="right:250px;">
                 <div id="record_main" class="PNB record_display_box" style="bottom:auto;right:auto;">