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 #comment Design fix #time 6h

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-05-14 18:39:24 +04:00
parent bfdba6cd7f
commit a535268ae8
8 changed files with 33 additions and 33 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.201-d", "phraseanet-production-client": "0.34.203-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",

3
templates/web/prod/WorkZone/Browser/Browser.html.twig
View File

@@ -86,7 +86,8 @@
</div> </div>
<style> <style>
.dialog-Medium { .dialog-Medium {
height: 523px!important; height: 544px!important;
overflow: hidden!important;
} }
.paginator a { .paginator a {
background: none!important; background: none!important;

22
templates/web/prod/WorkZone/Browser/Results.html.twig
View File

@@ -50,7 +50,7 @@
{% if Basket.getPusher() %} {% if Basket.getPusher() %}
<p> <p>
{% set user_name = '<a href="/user/' ~ Basket.getPusher().getId() ~ '/" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Basket.getPusher(app).getId() }) ~ '" class="UserTips">' ~ Basket.getPusher(app).getDisplayName() ~ '</a>' %} {% set user_name = '<a href="/user/' ~ Basket.getPusher().getId() ~ '/" class="UserTips">' ~ Basket.getPusher(app).getDisplayName() ~ '</a>' %}
{% trans with {'%user_name%' : user_name} %}Received from %user_name%{% endtrans %} {% trans with {'%user_name%' : user_name} %}Received from %user_name%{% endtrans %}
</p> </p>
{% endif %} {% endif %}
@@ -65,7 +65,7 @@
{% set list_participants = list_participants ~ ', ' %} {% set list_participants = list_participants ~ ', ' %}
{% endif %} {% endif %}
{% set list_participants = list_participants ~ '<a class="UserTips" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Participant.getUser().getId() }) ~ '" href="/user/' ~ Participant.getUser().getId() ~ '/">' %} {% set list_participants = list_participants ~ '<a class="UserTips" href="/user/' ~ Participant.getUser().getId() ~ '/">' %}
{% set list_participants = list_participants ~ Participant.getUser().getDisplayName() %} {% set list_participants = list_participants ~ Participant.getUser().getDisplayName() %}
{% set list_participants = list_participants ~ '</a>' %} {% set list_participants = list_participants ~ '</a>' %}
{% endfor %} {% endfor %}
@@ -84,9 +84,8 @@
</div> </div>
</div> </div>
<div class="PNB footer"> <div class="PNB footer">
<table> <div class="paginator-wrapper">
<tr> <span class="paginator-result">
<td>
{% if Total == 0 %} {% if Total == 0 %}
{{ 'No results' | trans }} {{ 'No results' | trans }}
{% elseif Total == 1 %} {% elseif Total == 1 %}
@@ -94,19 +93,18 @@
{% else %} {% else %}
{% trans with {'%Total%' : Total} %}%Total% results{% endtrans %} {% trans with {'%Total%' : Total} %}%Total% results{% endtrans %}
{% endif %} {% endif %}
</td> </span>
<td class="paginator"> <span class="paginator">
{% if Page - 1 > 0 %} {% if Page - 1 > 0 %}
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page - 1) }) }}" class="result prev_res icon-round-chevron_left-24px">&nbsp;</a> <a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page - 1) }) }}" class="prev_res icon-round-chevron_left-24px">&nbsp;</a>
{% endif %} {% endif %}
<span> <span>
Page {{ Page }} / {{ MaxPage }} Page {{ Page }} / {{ MaxPage }}
</span> </span>
{% if Page + 1 <= MaxPage %} {% if Page + 1 <= MaxPage %}
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page + 1) }) }}" class="result next_res icon-round-chevron_right-24px">&nbsp;</a> <a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page + 1) }) }}" class="next_res icon-round-chevron_right-24px">&nbsp;</a>
{% endif %} {% endif %}
</td> </span>
</tr> </div>
</table>
</div> </div>

4
templates/web/prod/actions/publish/publish.html.twig
View File

@@ -42,9 +42,9 @@
</label> </label>
<br /> <br />
{% endif %} {% endif %}
<label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b></label> <label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b> &nbsp;<span class="feed_title_warning feed_warning">{{ 'publication : title warning' | trans }}</span></label>
<input class="required_text input-block-level" style="max-width:500px" type="text" name="title" id="feed_add_title" value="{{title}}" /> <input class="required_text input-block-level" style="max-width:500px" type="text" name="title" id="feed_add_title" value="{{title}}" />
<label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b></label> <label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b> &nbsp;<span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle warning' | trans }}</span></label>
<textarea id="feed_add_subtitle" style="max-width:500px" class="input-block-level" name="subtitle" rows="5">{{desc}}</textarea> <textarea id="feed_add_subtitle" style="max-width:500px" class="input-block-level" name="subtitle" rows="5">{{desc}}</textarea>
<label for="feed_add_author_name"><b>{{ 'publication : autheur' | trans }}</b></label> <label for="feed_add_author_name"><b>{{ 'publication : autheur' | trans }}</b></label>
<input class="required_text input-block-level" style="max-width:500px" type="text" name="author_name" id="feed_add_author_name" value="{{ app.getAuthenticatedUser().getDisplayName() }}" /> <input class="required_text input-block-level" style="max-width:500px" type="text" name="author_name" id="feed_add_author_name" value="{{ app.getAuthenticatedUser().getDisplayName() }}" />

4
templates/web/prod/actions/publish/publish_edit.html.twig
View File

@@ -27,9 +27,9 @@
<div class="span6"> <div class="span6">
<h1>{{ 'Editer' | trans }}</h1> <h1>{{ 'Editer' | trans }}</h1>
<br /> <br />
<label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b></label> <label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b> &nbsp;<span class="feed_title_warning feed_warning">{{ 'publication : title warning' | trans }}</span></label>
<input class="required_text input-block-level" style="max-width:500px" type="text" name="title" id="feed_add_title" value="{{ entry.getTitle() }}" /> <input class="required_text input-block-level" style="max-width:500px" type="text" name="title" id="feed_add_title" value="{{ entry.getTitle() }}" />
<label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b></label> <label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b> &nbsp;<span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle warning' | trans }}</span></label>
<textarea id="feed_add_subtitle" style="max-width:500px" class="input-block-level" name="subtitle" rows="5">{{ entry.getSubTitle() }}</textarea> <textarea id="feed_add_subtitle" style="max-width:500px" class="input-block-level" name="subtitle" rows="5">{{ entry.getSubTitle() }}</textarea>
<label for="feed_add_author_name"><b>{{ 'publication : autheur' | trans }}</b></label> <label for="feed_add_author_name"><b>{{ 'publication : autheur' | trans }}</b></label>
<input class="required_text input-block-level" style="max-width:500px" type="text" name="author_name" id="feed_add_author_name" value="{{ entry.getAuthorName() }}" /> <input class="required_text input-block-level" style="max-width:500px" type="text" name="author_name" id="feed_add_author_name" value="{{ entry.getAuthorName() }}" />

11
templates/web/prod/results/entry.html.twig
View File

@@ -23,11 +23,11 @@
</td> </td>
<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) %}
<a class="tools options feed_edit" href="{{ path('prod_feeds_entry_edit', { 'id' : entry.id }) }}"> <a class="options feed_edit" title="{{ 'boutton::editer' | trans }}" href="{{ path('prod_feeds_entry_edit', { 'id' : entry.id }) }}">
<img src="/assets/common/images/icons/file-edit.png" title="{{ 'boutton::editer' | trans }}"/> <i class="fa fa-edit"></i>
</a> </a>
<a class="tools feed_delete"href="{{ path('prod_feeds_entry_delete', { 'id' : entry.id }) }}"> <a class="feed_delete" title="{{ 'boutton::supprimer' | trans }} href="{{ path('prod_feeds_entry_delete', { 'id' : entry.id }) }}">
<img src="/assets/common/images/icons/delete.png" title="{{ 'boutton::supprimer' | trans }}"/> <i class="fa fa-times-circle"></i>
</a> </a>
{% endif %} {% endif %}
</td> </td>
@@ -50,8 +50,7 @@
<a class="ajax_answers" href="{{ path('prod_feeds_feed', { 'id' : entry.feed.id }) }}"> <a class="ajax_answers" href="{{ path('prod_feeds_feed', { 'id' : entry.feed.id }) }}">
{% set feed_name = entry.feed.title %} {% set feed_name = entry.feed.title %}
{% trans with {'%feed_name%' : feed_name} %}dans %feed_name%{% endtrans %} {% trans with {'%feed_name%' : feed_name} %}dans %feed_name%{% endtrans %}
<img style="height:16px;" src="{% if entry.feed.iconUrl == false %}/assets/common/images/icons/rss32.gif{% else %}/custom/feed_{{ entry.feed.id }}.jpg{% endif %}"/> <i class="fa fa-rss-square"></i></a>
</a>
{% endif %} {% endif %}
</div> </div>

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

@@ -17,12 +17,14 @@
</td> </td>
<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) %}
<a class="tools options feed_edit" href="{{ path('prod_feeds_entry_edit', { 'id' : entry.id }) }}"> <div class="feed_btn_wrapper">
<img src="/assets/common/images/icons/file-edit.png" title="{{ 'boutton::editer' | trans }}" width="16" height="16"/> <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>
</a> </a>
<a class="tools feed_delete"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 }) }}">
<img src="/assets/common/images/icons/delete.png" title="{{ 'boutton::supprimer' | trans }}" width="16" height="16"/> <i class="fa fa-times-circle"></i>
</a> </a>
</div>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@@ -44,7 +46,7 @@
<a class="ajax_answers" href="{{ path('prod_feeds_feed', { 'id' : entry.feed.id }) }}"> <a class="ajax_answers" href="{{ path('prod_feeds_feed', { 'id' : entry.feed.id }) }}">
{% set feed_name = entry.feed.title %} {% set feed_name = entry.feed.title %}
{% trans with {'%feed_name%' : feed_name} %}dans %feed_name%{% endtrans %} {% trans with {'%feed_name%' : feed_name} %}dans %feed_name%{% endtrans %}
<img style="height:16px;" src="{% if entry.feed.iconUrl == false %}/assets/common/images/icons/rss32.gif{% else %}/custom/feed_{{ entry.feed.id }}.jpg{% endif %}"/> <i class="fa fa-rss-square"></i>
</a> </a>
{% endif %} {% endif %}
</div> </div>

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.201-d: phraseanet-production-client@0.34.203-d:
version "0.34.201-d" version "0.34.203-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.201-d.tgz#c668b8a44761e21b06a0c38362c23749c68d865e" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.203-d.tgz#46c2505f05f4e68b29e3eb8358a5bcd15e6b5d27"
integrity sha512-7jQH9zv/DMaDmj79240LrdZzShNYpdmGEfhPN3Km1UGd1W0Phs/0kGfW0jB4hWzV1LO1SIRx4A4vIzr6UQVipg== integrity sha512-yJ0iEuY87VEveXHsr1u+X4DWlwM1BnDuvJfGIS8XEx9wB0st9F/5sxbQJ3dgFRQE9YHoZr+TI6iUFReNprWgNA==
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"