hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-2875 upgrade of Phraseanet-production-client

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-01-16 18:51:25 +04:00
parent 0474aeca4d
commit 0ea9508ce0
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0",
"npm": "^6.0.0",
"npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.99-d",
"phraseanet-production-client": "0.34.101-d",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",

10
templates/web/prod/WorkZone/Macros.html.twig
View File

@@ -126,7 +126,8 @@
{% endif %}
-->
<td>
<a class="contextMenuTrigger icon-display-grid" href="#"></a>
<a class="contextMenuTrigger" href="#"> <i class="icomoon icon-circle fa-stack-2x fa-inverse-bg" aria-hidden="true"></i>
<i class="icomoon icon-round-more_horiz-24px white fa-stack-1x fa-inverse" aria-hidden="true"></i></a>
</td>
</tr>
</table>
@@ -327,12 +328,12 @@
<div style="position:absolute;background-color:#959595;color:black;font-weight:bold;padding:3px;z-index:90;">
{{record.getNumber()}}
</div>
{{thumbnail.format(record.get_thumbnail,82,82, '', true, false)}}
{{thumbnail.format(record.get_thumbnail,140,140, '', true, false)}}
<div class="bottom">
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_caption_display') == '1' %}
<span class="icon-stack captionRolloverTips captionTips"
tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id(), 'context' : 'basket', 'number' : record.getNumber() }) }}">
<i class="icomoon icon-round-list-24px white" style="background: #777;border-radius: 2px;padding: 0px 1px;line-height: 1;margin: 0 4px 4px 4px;"></i>
<i class="icomoon icon-round-list-24px white" ></i>
</span>
{% endif %}
<a
@@ -346,7 +347,8 @@
href="#"
{% endif %}
class="WorkZoneElementRemover {{ wz_scope }}" title="{{ 'delete' | trans }}" >
<i class="fa fa-times" aria-hidden="true"></i>
<i class="icomoon icon-circle fa-stack-2x" aria-hidden="true"></i>
<i class="icomoon icon-round-close-24px fa-stack-1x " aria-hidden="true"></i>
</a>
</div>

2
templates/web/prod/actions/edit_default.html.twig
View File

@@ -97,7 +97,7 @@
{#<i id="editSGtri_{{ i }}" style="visibility:hidden;" class="fa fa-caret-right" aria-hidden="true"></i>#}
<span class="fa-stack fieldTips"
tooltipsrc="{{ path('prod_tooltip_metadata', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}">
<i class="fa fa-circle fa-stack-2x" aria-hidden="true"></i>
<i class="fa fa-circle fa-stack-2x fa-inverse-bg" aria-hidden="true"></i>
<i class="fa fa-info fa-stack-1x fa-inverse" aria-hidden="true"></i>
</span>
{% if field.get_dces_element %}

2
templates/web/prod/results/record.html.twig
View File

@@ -104,7 +104,7 @@
{% if settings.show_context_menu %}
<span class="fa-stack contextMenuTrigger" id="contextTrigger_{{ record.id }}"
tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}">
<i class="icomoon icon-circle fa-stack-2x" aria-hidden="true"></i>
<i class="icomoon icon-circle fa-stack-2x fa-inverse-bg" aria-hidden="true"></i>
<i class="icomoon icon-round-more_horiz-24px white fa-stack-1x fa-inverse" aria-hidden="true"></i>
</span>
<table cellspacing="0" cellpadding="0" style="display:none;" id="answerContext_{{record.id}}" class="contextMenu answercontextmenu">

8
yarn.lock
View File

@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0"
pym.js "^1.3.1"
phraseanet-production-client@0.34.99-d:
version "0.34.99-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.99-d.tgz#fc06941163f698dc77ebca8a4c16663aa3ac458a"
integrity sha512-016LZam+eNQqAYyduiGinT79YkGeUDWZ9uk7r01BHmgsYjWc+UoCvUvExhCCHcoyMm+qd29VfHhQAWoyCCkG6g==
phraseanet-production-client@0.34.101-d:
version "0.34.101-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.101-d.tgz#6cf5b2f57085d082143d38fba8d411e0933d9362"
integrity sha512-6Ln1zPuz+GljRScCfMiTrvKUZfpAIuhEqmIAXBY3JPpxA1wUpdGbxYK+Rhy29JBhRmemxBPv0YuE3glKsytg9g==
dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6"