Merge branch 'master' into PHRAS-3618-bin-maintenance

2025-10-16 22:43:19 +00:00 · 2022-01-25 14:59:19 +01:00
parent 7f1e747ea3 c4c0a4e870
commit 5726f9a8c0
12 changed files with 1133 additions and 1149 deletions
--- a/Phraseanet-production-client/README.md
+++ b/Phraseanet-production-client/README.md
@@ -24,7 +24,7 @@ Node `^5.0.0`.
 - Generate dist ```npm run dist```
 - Go back to Phraseanet folder : ```cd ..```
 - Copy assets in www/assets folder ```make install_asset```
- - ... or simply one cmd : ```cd Phraseanet-production-client && npm run dist && cd .. && make install_assets```
+ - ... or simply one cmd : ```cd Phraseanet-production-client && npm run dist && cd .. && make install_assets && rm -rf cache/*```

 ### Push
 - If features is finished ```dist``` folder is to be commited with sources.
--- a/Phraseanet-production-client/config/config.js
+++ b/Phraseanet-production-client/config/config.js
@@ -13,5 +13,5 @@ module.exports = {
    setupDir: _root + 'tests/setup/node.js',
    karmaConf: _root + 'config/karma.conf.js',
    // change this version when you change JS file for lazy loading
-    assetFileVersion: 37
+    assetFileVersion: 38
 };
--- a/Phraseanet-production-client/dist/authenticate.js
+++ b/Phraseanet-production-client/dist/authenticate.js
@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=37";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=38";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {
--- a/Phraseanet-production-client/dist/authenticate.min.js
+++ b/Phraseanet-production-client/dist/authenticate.min.js
@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=37";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=38";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {
--- a/Phraseanet-production-client/dist/commons.js
+++ b/Phraseanet-production-client/dist/commons.js
@@ -91,7 +91,7 @@
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=37";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=38";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {
--- a/Phraseanet-production-client/dist/commons.min.js
+++ b/Phraseanet-production-client/dist/commons.min.js
@@ -91,7 +91,7 @@
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=37";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=38";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {
--- a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
+++ b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
@@ -59,7 +59,7 @@ class PhraseanetExtension extends \Twig_Extension
    {
        return [
            // change this version when you change JS file to force the navigation to reload js file
-            'assetFileVersion' => 37
+            'assetFileVersion' => 38
        ];

    }
--- a/resources/www/thesaurus/styles/main.scss
+++ b/resources/www/thesaurus/styles/main.scss
@@ -398,7 +398,7 @@ H3, H4 {
  padding-bottom: 10px;
 }

-.populate_btn {
+.populate_btn, #kth_import {
  position: absolute;
  background: #884c92;
  z-index: 2;
@@ -416,6 +416,11 @@ H3, H4 {
  }
 }

+#kth_import {
+  right: 150px !important;
+  text-decoration: none;
+}
+
 .thesaurus-page {
  .ui-widget-header {
    border: 1px solid darken(#884c92, 20%);
@@ -430,4 +435,5 @@ H3, H4 {
 #flagsMenu p {
  color: #fff;
  padding: 0 10px;
+  cursor: pointer;
 }
--- a/templates/web/thesaurus/export-text-dialog.html.twig
+++ b/templates/web/thesaurus/export-text-dialog.html.twig
@@ -52,7 +52,6 @@
                url = "./export_"+format+".php?bid={{ bid }}&piv={{ piv }}&id={{ id }}&typ={{ typ }}&dlg=0&smp=1";
                url += "&osl=" + ($('.osl_1')[0].checked ? "1" : $('.osl_0')[0].checked ? "0" : "0");
                url += "&iln=" + ($('.iln')[0].checked ? "1" : "0");
-                url += "&hit=" + ($('.hit')[0].checked ? "1" : "0");
                url += "&ilg=" + ($('.ilg')[0].checked ? "1" : "0");
                document.getElementById("ifrsample").src = url;
            }
@@ -101,10 +100,6 @@
                                    <input type='checkbox' name='ilg' class="ilg" value='1' onclick="chgFormat();">
                                    {{ 'thesaurus:: export : inclure la langue' | trans }}
                                </div>
-                                <div style="white-space:nowrap">
-                                    <input type='checkbox' name='hit' class="hit" value='1' onclick="chgFormat();">
-                                    {{ 'thesaurus:: export : inclure les hits' | trans }}
-                                </div>
                            </div>
                        </td>
                        <td valign="top" style="padding:10px">
--- a/templates/web/thesaurus/import-dialog.html.twig
+++ b/templates/web/thesaurus/import-dialog.html.twig
@@ -60,9 +60,6 @@
                    <tr>
                        <td style="text-align:left"><input type="checkbox" disabled="disabled" name="dlk" checked="checked">{{ 'thesaurus:: supprimer les liens des champs tbranch' | trans }}</td>
                    </tr>
-                    <tr>
-                        <td style="text-align:left"><input type="checkbox" disabled="disabled" name="rdx">{{ 'thesaurus:: reindexer la base apres l\'import' | trans }}</td>
-                    </tr>
                </table>
                <br/>
                <div class="thesaurus_confirm_bottom_block">
@@ -71,6 +68,6 @@
                </div>
            </div>
        </form>
-        <iframe style="display:block; height:50px;" name="IFRIM"></iframe>
+        <iframe style="display:block; height:50px;border:0px;" name="IFRIM"></iframe>
    </body>
 </html>
--- a/templates/web/thesaurus/properties.html.twig
+++ b/templates/web/thesaurus/properties.html.twig
@@ -18,6 +18,20 @@
            {
                font-weight:900;
            }
+            #TSY thead {
+                display:table;
+                table-layout:fixed;
+            }
+            #TSY table tbody {
+                display: block;
+                height: 150px;
+                overflow: scroll;
+            }
+            #TSY tbody tr {
+                display:table;
+                width:100%;
+                table-layout:fixed;
+            }
        </style>

        <script type="text/javascript">
@@ -27,6 +41,7 @@
            }
            $( document ).ready(function() {
                loaded();
+                $('#TSY table thead').width($("#LSY")[0].scrollWidth);
            });
        </script>
 <div class="menu" id="syMenu" style="z-index:999">
@@ -48,56 +63,52 @@
        <div id="TSY" class="tableContainer" style="margin:10px; position:relative; top:0px; left:0px">
            <div>
                <table border="0" cellpadding="0" cellspacing="0" style="width:100%; ">
-                    <col style="width:40px;" />
-                    <col style="width:30px;" />
-                    <col style="width:auto;" />
-                    <col style="width:40px;" />
-                    <col style="width:140px;" />
-                    <col style="width:14px;" />
                    <thead>
                        <tr>
-                            <th>&nbsp;</th>
-                            <th>&nbsp;</th>
+                            <th style="width:40px;">&nbsp;</th>
+                            <th style="width:30px;">&nbsp;</th>
                            <th>{{ 'thesaurus:: synonymes' | trans }}</th>
-                            <th colspan="3">{{ 'thesaurus:termePorperties:termeId' | trans }}</th>
+                            <th style="width:180px;" colspan="2">{{ 'thesaurus:termePorperties:termeId' | trans }}</th>
                        </tr>
                    </thead>
-                </table>
-            </div>
-            <div style="position:relative; height:150px; overflow:scroll">
-                <div style="position:relative; height:150px; ">
-                    <table border="0" cellpadding="0" cellspacing="0" style="width:100%;">
-                        <col style="width:40px;" />
-                        <col style="width:30px;" />
-                        <col style="width:auto;" />
-                        <col style="width:40px;" />
-                        <col style="width:140px;" />
-                        <tbody id="LSY" style="">
+                    <tbody id="LSY" style="">

-                        {% for data in synonyms %}
-                            <tr class='s_' id='SYN_{{ data['id'] }}' hits='{{ data['hits'] }}'>
-                                <td style='text-align:center;'>
+                    {% for data in synonyms %}
+                        <tr class='s_' id='SYN_{{ data['id'] }}' hits='{{ data['hits'] }}'>
+                            <td style='text-align:center;width:40px;'>
                                {% if loop.index > 0 %}
                                    <img id="BTNU_{{ data['id'] }}" src="/assets/thesaurus/images/up.gif" />
                                {% endif %}
                                {% if not loop.last %}
                                    <img id="BTND_{{ data['id'] }}" src="/assets/thesaurus/images/down.gif" />
                                {% endif %}
-                                </td>
-                                {% if data['lng'] %}
-                                    <td id='FLG_{{ data['id'] }}'>{{ data['lng'] }}</td>
-                                {% else %}
-                                    <td id='FLG_{{ data['id'] }}'></td>
-                                {% endif %}
-                                <td>{{ data['t'] }}</td>
-                                <td>{{ data['id'] }}</td>
-                                <td><span class="delete_term"></span></td>
-                            </tr>
-                        {% endfor %}
-                        </tbody>
-                    </table>
-                </div>
+                            </td>
+                            {% if data['lng'] %}
+                                <td id='FLG_{{ data['id'] }}' style='width:30px;'>{{ data['lng'] }}</td>
+                            {% else %}
+                                <td style="width:30px;" id='FLG_{{ data['id'] }}' style='width:30px;'></td>
+                            {% endif %}
+                            <td>{{ data['t'] }}</td>
+                            <td style="width:100px;">{{ data['id'] }}</td>
+                            <td style="width:calc( 86px - 1em )" ><span class="delete_term"></span></td>
+                        </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
            </div>
+{#            <div style="position:relative; height:150px; overflow:scroll">#}
+{#                <div style="position:relative; height:150px; ">#}
+{#                    <table border="0" cellpadding="0" cellspacing="0" style="width:100%;">#}
+{#                        <col style="width:40px;" />#}
+{#                        <col style="width:30px;" />#}
+{#                        <col style="width:auto;" />#}
+{#                        <col style="width:40px;" />#}
+{#                        <col style="width:140px;" />#}
+{#                        <col style="width:14px;" />#}
+
+{#                    </table>#}
+{#                </div>#}
+{#            </div>#}
        </div>
    <center>
        <form onsubmit="return(false);">
@@ -117,8 +128,13 @@
            if(action != "SELECT" || !menuelem_id) {
                return;
            }
+
            lng = menuelem_id.substr(9,2);

+            if (lng == '') {
+                return;
+            }
+
            url = "xmlhttp/changesylng.x.php";
            parms  = "bid={{ bid | url_encode }}";
            parms += "&typ={{ typ | url_encode }}";
@@ -261,6 +277,7 @@

                td = tr.appendChild(document.createElement("td"));
                td.style.textAlign = "center";
+                td.style.width = "40px";
                if(nsy > 0)
                {
                    img = td.appendChild(document.createElement("img"));
@@ -280,6 +297,7 @@

                td = tr.appendChild(document.createElement("td"));
                td.id = "FLG_"+(nsy+1);
+                td.style.width = "30px";
                // td.innerText = n.getAttribute("lng");
                span = td.appendChild(document.createElement("span"));
                span.innerHTML = n.getAttribute("lng");
@@ -293,11 +311,14 @@
                td.innerHTML = n.getAttribute("hits");*/

                td = tr.appendChild(document.createElement("td"));
+                td.style.width = "100px";
                td.innerHTML = n.getAttribute("id");

                if(n.getAttribute("sel")) {
                    myGUI.select(tr);
                }
+                td = tr.appendChild(document.createElement("td"));
+                td.style.width = "calc( 86px - 1em )";
            }

            newtbody = oldtbody.parentNode.replaceChild(tbody, oldtbody);
--- a/templates/web/thesaurus/thesaurus.html.twig
+++ b/templates/web/thesaurus/thesaurus.html.twig