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

PHRAS-3072

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-05-15 13:05:51 +04:00
parent fe6b01aaae
commit f21d126295
6 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Alchemy/Phrasea/Controller/Prod/FeedController.php
View File

@@ -268,9 +268,11 @@ class FeedController extends Controller
'texte' => '<p>' . $this->app->trans( 'texte' => '<p>' . $this->app->trans(
'publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.' 'publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.'
) . '</p><p>' . $this->app->trans('publications::Ne le partagez pas, il est strictement confidentiel') . '</p> ) . '</p><p>' . $this->app->trans('publications::Ne le partagez pas, il est strictement confidentiel') . '</p>
<div><input type="text" style="width:100%" value="' . $link->getURI() . '"/></div>', <div class="feed_input_block"><input type="text" readonly="readonly" id="input-select-copy" class="input_select_copy" value="' . $link->getURI()
'titre' => $this->app->trans('publications::votre rss personnel') . '"/><button type="button" class="btn-info copy-feed" id="copy-feed">' . $this->app->trans('publications::copy') . '</button></div>',
'titre' => $this->app->trans('publications::votre rss personnel'),
]); ]);
} }
public function ensureUserHasPublishRight() public function ensureUserHasPublishRight()

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

@@ -96,13 +96,13 @@
</span> </span>
<span 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="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="result_page 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="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="result_page next_res icon-round-chevron_right-24px">&nbsp;</a>
{% endif %} {% endif %}
</span> </span>
</div> </div>

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

@@ -42,10 +42,12 @@
</label> </label>
<br /> <br />
{% endif %} {% endif %}
<label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b> &nbsp;<span class="feed_title_warning feed_warning">{{ 'publication : title warning' | trans }}</span></label> <label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b> &nbsp;<span>( {{ '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><span class="feed_title_warning feed_warning">{{ 'publication : title alert' | trans }}</span></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> <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><span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle alert' | trans }}</span></label>
<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() }}" />
<label for="feed_add_author_mail"><b>{{ 'publication : email autheur' | trans }}</b></label> <label for="feed_add_author_mail"><b>{{ 'publication : email autheur' | trans }}</b></label>

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

@@ -27,10 +27,12 @@
<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> &nbsp;<span class="feed_title_warning feed_warning">{{ 'publication : title warning' | trans }}</span></label> <label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b> &nbsp;<span>( {{ '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> &nbsp;<span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle warning' | trans }}</span></label> <label><span class="feed_title_warning feed_warning">{{ 'publication : title alert' | trans }}</span></label>
<label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b> &nbsp;<span>( {{ '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><span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle alert' | trans }}</span></label>
<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() }}" />
<label for="feed_add_author_mail"><b>{{ 'publication : email autheur' | trans }}</b></label> <label for="feed_add_author_mail"><b>{{ 'publication : email autheur' | trans }}</b></label>

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

@@ -50,7 +50,8 @@
<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 %}
<i class="fa fa-rss-square"></i></a> <img style="height:18px;" src="{% if entry.feed.iconUrl == false %}/assets/common/images/icons/rss32.gif{% else %}/custom/feed_{{ entry.feed.id }}.jpg{% endif %}"/>
</a>
{% endif %} {% endif %}
</div> </div>

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

@@ -46,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 %}
<i class="fa fa-rss-square"></i> <img style="height:18px;" src="{% if entry.feed.iconUrl == false %}/assets/common/images/icons/rss32.gif{% else %}/custom/feed_{{ entry.feed.id }}.jpg{% endif %}"/>
</a> </a>
{% endif %} {% endif %}
</div> </div>