From 7c24e2bd51da8ba1b1bef1a56b356b6dd00ed205 Mon Sep 17 00:00:00 2001
From: Harrys <hra@esokia-webagency.com>
Date: Wed, 9 Sep 2020 18:38:42 +0400
Subject: [PATCH] PHRAS-3188 : Front expose : add expose edit modal

---
 .../Controller/Prod/LanguageController.php    |   1 +
 package.json                                  |   2 +-
 .../web/prod/WorkZone/ExposeEdit.html.twig    | 236 ++++++++++--------
 templates/web/prod/index.html.twig            |   4 +-
 yarn.lock                                     |   8 +-
 5 files changed, 141 insertions(+), 110 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php
index 661ea24150..e86b858b92 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php
@@ -158,6 +158,7 @@ class LanguageController
             'create new user'     => $translator->trans('prod:push: create new user'),
             'prod:videoeditor:subtitletab:message:: error'     => $translator->trans('prod:videoeditor:subtitletab:message:: error'),
             'prod:videoeditor:subtitletab:message:: success'     => $translator->trans('prod:videoeditor:subtitletab:message:: success'),
+            'Edit expose title'     => $translator->trans('prod:workzone:expose:modal:: title'),
         ]);
     }
 }
diff --git a/package.json b/package.json
index 6ec99ff013..fb82c53e69 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "normalize-css": "^2.1.0",
     "npm": "^6.0.0",
     "npm-modernizr": "^2.8.3",
-    "phraseanet-production-client": "0.34.271-d",
+    "phraseanet-production-client": "0.34.273-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/templates/web/prod/WorkZone/ExposeEdit.html.twig b/templates/web/prod/WorkZone/ExposeEdit.html.twig
index 317883ea4c..663232ed34 100644
--- a/templates/web/prod/WorkZone/ExposeEdit.html.twig
+++ b/templates/web/prod/WorkZone/ExposeEdit.html.twig
@@ -1,109 +1,139 @@
 {% macro display_edit(app) %}
-<div id='DIALOG-expose-edit' style="display: none">
-    <div class="logo_expose"><img
-                src="https://raw.githubusercontent.com/alchemy-fr/phraseanet-services/master/expose/front/public/logo192.png"
-                width="192" height="192" alt="Expose logo"/></div>
-    <div class="form-group  field-entity"><label class="form-control-label"
-                                                 for="publication_parent">Parent</label>
+    <div id='DIALOG-expose-edit' style="display: none">
 
+        <div class="expose-edit-wrapper">
+            <form name="publication-data" id="publication-data-form">
+                <div class="edit-publication-block">
+                    <div class="ui-widget">
+                        <label>Name </label>
+                        <input type="text" value="" name="title" class="publication-field"/>
+                    </div>
+                    <div class="ui-widget">
+                        <label>Slug: </label>
+                        <input type="text" value="" name="slug" class="publication-field"/>
+                    </div>
+                    <div class="ui-widget">
+                        <label>Parent publication </label>
+                        <div id="publication-list-data" class="ui-widget publication_parent_wrapper ">
+                            <select id="publication_parent" name="parentId" tabindex="-1" aria-hidden="true"
+                                    class="publication-field">
+                                <option value="">Select a parent publication</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="ui-widget">
+                        <label>Enabled </label>
+                        <input id="enabled-field" type="checkbox" class="publication-field" name="enabled">
+                    </div>
+                    <div class="ui-widget available-wrapper">
+                        <label>Available (leave blank for permanet publication): </label>
+                        <div class="available-widget">
+                            <label>From </label>
+                            <input type="text" value="" name="from" class="use-datepicker publication-field"/>
+                        </div>
+                        <div class="available-widget">
+                            <label>To </label>
+                            <input type="text" value="" name="to" class="use-datepicker publication-field"/>
+                        </div>
+                    </div>
+                    <div class="ui-widget profile-wrapper">
+                        <label>Profile </label>
+                        <select id="profile-field" name="profile" tabindex="-1" aria-hidden="true"
+                                class="publication-field">
+                            <option value="">Select Parent publication</option>
+                        </select>
+                    </div>
+                    <div class="ui-widget">
+                        <label>Publicity listing </label>
+                        <input id="listing-field" type="checkbox" class="publication-field" name="listing">
+                    </div>
+                    <div class="ui-widget profile-wrapper">
+                        <label>Access rules </label>
+                        <select id="access-field" name="access" tabindex="-1" aria-hidden="true"
+                                class="publication-field">
+                            <option value="">open access</option>
+                        </select>
+                    </div>
+                    <div class="ui-widget profile-wrapper">
+                        <label>Layout </label>
+                        <select id="layout-field" name="layout" tabindex="-1" aria-hidden="true"
+                                class="publication-field">
+                            <option value="">Select Layout</option>
+                        </select>
+                    </div>
+                    <div class="ui-widget profile-wrapper">
+                        <label>Theme </label>
+                        <select id="theme-field" name="theme" tabindex="-1" aria-hidden="true"
+                                class="publication-field">
+                            <option value="">Select Theme</option>
+                        </select>
+                    </div>
+
+                </div>
+                <div class="right-publication inner-publication">
+                    <div class="ui-widget">
+                        <label>Layout: </label>
+                        <select id="publication_layout" name="layout" class="form-control publication-field">
+                            <option value="" selected="selected"></option>
+                            <option value="gallery">Gallery</option>
+                            <option value="mapbox">Mapbox</option>
+                            <option value="download">Download</option>
+                        </select>
+                    </div>
+                    <div class="ui-widget">
+                        <label>Enabled: </label>
+                        <select id="enabled_combobox" name="enabled" class="publication-field">
+                            <option value="" selected="selected"></option>
+                            <option value="true">true</option>
+                            <option value="false">false</option>
+                        </select>
+                    </div>
+                    <div class="ui-widget">
+                        <label>PubliclyListed: </label>
+                        <select id="publication_publiclyListed" name="publiclyListed" class="publication-field">
+                            <option value="" selected="selected"></option>
+                            <option value="true">true</option>
+                            <option value="false">false</option>
+                        </select>
+                    </div>
+                    <div class="ui-widget">
+                        <label>SecurityMethod: </label>
+                        <select id="publication_securityMethod" name="securityMethod" class="form-control">
+                            <option value="" selected="selected"></option>
+                            <option value="password">password</option>
+                            <option value="authentication">authentication</option>
+                        </select>
+                    </div>
+                    <div class="ui-widget publication_securityMethod_error hidden"
+                         id="publication_securityMethod_error">
+                        <p class="error form-error alert alert-error">Not implemented</p>
+                    </div>
+                    <div class="ui-widget securityOptions_wrapper visibility-hidden">
+                        <label>Password: </label><input class="publication-field" type="text" name="password"
+                                                        id="publication_password"/>
+                    </div>
+
+                </div>
+            </form>
+        </div>
     </div>
-    <div class="publication-block">
-        <form name="publication-data" id="publication-data-form">
-            <div class="parent_block">
-                <div id="publication-list-data" class="ui-widget publication_parent_wrapper ">
-                    <select id="publication_parent" name="parentId" tabindex="-1" aria-hidden="true"
-                            class="publication-field">
-                        <option value="">Select a parent publication</option>
-                    </select>
-                </div>
-                <div class="parent_info publication_parent_wrapper" id="parent_info">
+    <script type="text/javascript">
+        $.datepicker.regional['default'] = {
+            closeText: "Close",
+            prevText: "{{ 'workzone:datepicker:prevText' | trans }}",
+            nextText: "{{ 'workzone:datepicker:nextText' | trans }}",
+            currentText: "Today",
+            monthNames: ["{{ 'workzone:datepicker:january' | trans }}", "{{ 'workzone:datepicker:february' | trans }}", "{{ 'workzone:datepicker:march' | trans }}", "{{ 'workzone:datepicker:april' | trans }}", "{{ 'workzone:datepicker:may' | trans }}", "{{ 'workzone:datepicker:june' | trans }}",
+                "{{ 'workzone:datepicker:july' | trans }}", "{{ 'workzone:datepicker:august' | trans }}", "{{ 'workzone:datepicker:september' | trans }}", "{{ 'workzone:datepicker:october' | trans }}", "{{ 'workzone:datepicker:november' | trans }}", "{{ 'workzone:datepicker:december' | trans }}"],
+            dayNames: ["{{ 'workzone:datepicker:sunday' | trans }}", "{{ 'workzone:datepicker:monday' | trans }}", "{{ 'workzone:datepicker:tuesday' | trans }}", "{{ 'workzone:datepicker:wednesday' | trans }}", "{{ 'workzone:datepicker:thursday' | trans }}", "{{ 'workzone:datepicker:friday' | trans }}", "{{ 'workzone:datepicker:saturday' | trans }}"],
+            dayNamesMin: ["D", "L", "M", "M", "J", "V", "S"],
+            dateFormat: "d MM yy",
+            altField: ".alternate",
+            altFormat: "yy-mm-dd",
+            minDate: 0
 
-                </div>
+        };
 
-            </div>
-            <div class="left-publication inner-publication">
-                <div class="ui-widget">
-                    <label>Title: </label>
-                    <input type="text" value="" name="title" class="publication-field"/>
-                </div>
-                <div class="ui-widget">
-                    <label>Slug: </label>
-                    <input type="text" value="" name="slug" class="publication-field"/>
-                </div>
-                <div class="ui-widget">
-                    <label>Add profile: </label>
-                    <input id="add-profile" type="checkbox" class="publication-field"/>
-                </div>
-                <div class="ui-widget profile-wrapper hide">
-                    <label>Profile: </label>
-                    <input type="text" value="" name="profile" class="publication-field"
-                           id="profile-field"/>
-                </div>
-
-            </div>
-            <div class="right-publication inner-publication">
-                <div class="ui-widget">
-                    <label>Layout: </label>
-                    <select id="publication_layout" name="layout" class="form-control publication-field">
-                        <option value="" selected="selected"></option>
-                        <option value="gallery">Gallery</option>
-                        <option value="mapbox">Mapbox</option>
-                        <option value="download">Download</option>
-                    </select>
-                </div>
-                <div class="ui-widget">
-                    <label>Enabled: </label>
-                    <select id="enabled_combobox" name="enabled" class="publication-field">
-                        <option value="" selected="selected"></option>
-                        <option value="true">true</option>
-                        <option value="false">false</option>
-                    </select>
-                </div>
-                <div class="ui-widget">
-                    <label>PubliclyListed: </label>
-                    <select id="publication_publiclyListed" name="publiclyListed" class="publication-field">
-                        <option value="" selected="selected"></option>
-                        <option value="true">true</option>
-                        <option value="false">false</option>
-                    </select>
-                </div>
-                <div class="ui-widget">
-                    <label>SecurityMethod: </label>
-                    <select id="publication_securityMethod" name="securityMethod" class="form-control">
-                        <option value="" selected="selected"></option>
-                        <option value="password">password</option>
-                        <option value="authentication">authentication</option>
-                    </select>
-                </div>
-                <div class="ui-widget publication_securityMethod_error hidden"
-                     id="publication_securityMethod_error">
-                    <p class="error form-error alert alert-error">Not implemented</p>
-                </div>
-                <div class="ui-widget securityOptions_wrapper visibility-hidden">
-                    <label>Password: </label><input class="publication-field" type="text" name="password"
-                                                    id="publication_password"/>
-                </div>
-
-            </div>
-        </form>
-        <form name="publication-json" id="publication-json">
-            <div id="advancedSettingBlock">
-                <h3 class="toggleSetting">Advanced setting</h3>
-                <div id="advancedSettingInner" class="hidden">
-                    <div>
-                                <textarea name="advancedSetting" id="advancedSetting" cols="100"
-                                          rows="11"></textarea></div>
-
-                </div>
-            </div>
-            <div class="publication-btn-container">
-                <button type="submit" class="btn btn-success" id="create-publication">
-                    Create publication {% if lst %} from {{ lst|split(';')|length }} selected {% endif %}
-                </button>
-                <p><span id="pub-error" class="hidden alert alert-error"></span></p>
-                <p><span id="pub-success" class="hidden alert alert-success"></span></p>
-            </div>
-        </form>
-    </div>
-</div>
+        $(".use-datepicker").datepicker($.datepicker.regional['default']);
+    </script>
 {% endmacro %}
\ No newline at end of file
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 33de791ac7..b3f38996ea 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -184,11 +184,11 @@
                         {% include 'prod/tab_headers.html.twig' %}
 
                             {% import 'prod/WorkZone/Macros.html.twig'  as  WorkZoneMacros %}
-                            {% set expose_activate = 'true' %}
+                            {% set expose_activate = app['conf'].get(['phraseanet-service', 'expose', 'activate_service_expose']) %}
                             {% if expose_activate == 'true' %}
                                 {% block tab_headers_wrapper %}
                                     <div id="baskets_wrapper" class="PNB">
-                                    <div id="expose_tabs" class="tabs">
+                                    <div id="expose_tabs" class="tabs" aria-expanded="false">
                                         <ul>
                                             <li class="th_tab expose_li"><a href="#baskets"><span>{{ 'prod::basketTab:basket' | trans }}</span></a></li>
                                             <li class="th_tab expose_li"><a href="#expose_tab"><span>{{ 'prod::basketTab:expose' | trans }}</span></a></li>
diff --git a/yarn.lock b/yarn.lock
index a917bd3e6c..5c97f03ec7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7678,10 +7678,10 @@ phraseanet-common@^0.4.5-d:
     js-cookie "^2.1.0"
     pym.js "^1.3.1"
 
-phraseanet-production-client@0.34.271-d:
-  version "0.34.271-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.271-d.tgz#442d48438a3da349983a669644c9e65cdd3bd2ed"
-  integrity sha512-keQUprf9V6mi00B5cUbhYbbuTF4TGaPBGuiYuDiqlJrxre/Nr4eW9Xv997STJPjpdRkQmK7fF3Sqs5r+3/ZNow==
+phraseanet-production-client@0.34.273-d:
+  version "0.34.273-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.273-d.tgz#7babef9ccef9f318941041e4199fc0e03b191156"
+  integrity sha512-cWbkTtJohyJh4t6udjcLISO7EjKCT3ydDJRcWZHWLIQUx1pSlovDGu7Tf1RyaFUdLhurn80ytaLQo1q0gxuvWQ==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"