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-3072 fix on publication

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-05-15 16:06:26 +04:00
parent 5bed9f486f
commit 80497e85f6
3 changed files with 12 additions and 12 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", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.204-d", "phraseanet-production-client": "0.34.205-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

14
templates/web/prod/results/feeds_entry.html.twig
View File

@@ -4,7 +4,7 @@
<table class="head"> <table class="head">
<tr> <tr>
<td> <td>
<h1 class="title"> <h1 class="title {% if entry.feed.isOwner(app.getAuthenticator().user) or entry.isPublisher(app.getAuthenticator().user) %}with_btn {% endif %}">
{% if feed.aggregated %} {% if feed.aggregated %}
<img style="height:16px;" src="{% if entry.feed.iconUrl == false %} /assets/common/images/icons/rss32.gif{% else %}/custom/feed_{{ entry.feed.id }}.jpg{% endif %}"/> <img style="height:16px;" src="{% if entry.feed.iconUrl == false %} /assets/common/images/icons/rss32.gif{% else %}/custom/feed_{{ entry.feed.id }}.jpg{% endif %}"/>
{% endif %} {% endif %}
@@ -18,12 +18,12 @@
<td style="width:60px;text-align:right;"> <td style="width:60px;text-align:right;">
{% if entry.feed.isOwner(app.getAuthenticator().user) or entry.isPublisher(app.getAuthenticator().user) %} {% if entry.feed.isOwner(app.getAuthenticator().user) or entry.isPublisher(app.getAuthenticator().user) %}
<div class="feed_btn_wrapper"> <div class="feed_btn_wrapper">
<a class="options feed_edit feed_icon" title="{{ 'boutton::editer' | trans }}" href="{{ path('prod_feeds_entry_edit', { 'id' : entry.id }) }}"> <a class="options feed_edit feed_icon" title="{{ 'boutton::editer' | trans }}" href="{{ path('prod_feeds_entry_edit', { 'id' : entry.id }) }}">
<i class="fa fa-edit"></i> <i class="fa fa-edit"></i>
</a> </a>
<a class="feed_delete feed_icon" title="{{ 'boutton::supprimer' | trans }} href="{{ path('prod_feeds_entry_delete', { 'id' : entry.id }) }}"> <a class="feed_delete feed_icon" title="{{ 'boutton::supprimer' | trans }}" href="{{ path('prod_feeds_entry_delete', { 'id' : entry.id }) }}">
<i class="fa fa-times-circle"></i> <i class="fa fa-times-circle"></i>
</a> </a>
</div> </div>
{% endif %} {% endif %}
</td> </td>

8
yarn.lock
View File

@@ -7578,10 +7578,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@0.34.204-d: phraseanet-production-client@0.34.205-d:
version "0.34.204-d" version "0.34.205-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.204-d.tgz#603100301a94441b87d3d323e6ba92fd9d66b9dd" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.205-d.tgz#71703400af8a74a08f2d10c4438fce3db18260f1"
integrity sha512-eL8HhoV9IesgOrtkpOwBQ5pKBXC8QPG4MTh/NwmV/LSQvGOsRG1Qyy6ZDIyOg3hKB31BqNr0cdFyzE+d2uw0RQ== integrity sha512-Qi6wfIffR7uKhkETy4gyMgvrdqp4xZhXf/TyiXxi8jnDnGX5pH0bloh/v2VHo43Gx5K2aAba9hTGFwVsa0P5UA==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"