From f21d126295ffad6bb59a13705a947e0ed059635e Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia-webagency.com>
Date: Fri, 15 May 2020 13:05:51 +0400
Subject: [PATCH] PHRAS-3072

---
 lib/Alchemy/Phrasea/Controller/Prod/FeedController.php    | 6 ++++--
 templates/web/prod/WorkZone/Browser/Results.html.twig     | 4 ++--
 templates/web/prod/actions/publish/publish.html.twig      | 4 +++-
 templates/web/prod/actions/publish/publish_edit.html.twig | 6 ++++--
 templates/web/prod/results/entry.html.twig                | 3 ++-
 templates/web/prod/results/feeds_entry.html.twig          | 2 +-
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php b/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php
index 86c8baa370..96a32d883c 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php
@@ -268,9 +268,11 @@ class FeedController extends Controller
             'texte' => '<p>' . $this->app->trans(
                     '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>
-                <div><input type="text" style="width:100%" value="' . $link->getURI() . '"/></div>',
-            'titre' => $this->app->trans('publications::votre rss personnel')
+                <div class="feed_input_block"><input type="text" readonly="readonly" id="input-select-copy" class="input_select_copy" value="' . $link->getURI()
+                . '"/><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()
diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig
index 01625fcb4f..9ac3a5fa06 100644
--- a/templates/web/prod/WorkZone/Browser/Results.html.twig
+++ b/templates/web/prod/WorkZone/Browser/Results.html.twig
@@ -96,13 +96,13 @@
         </span>
         <span class="paginator">
           {% 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 %}
           <span>
             Page {{ Page }} / {{ MaxPage }}
           </span>
           {% 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 %}
         </span>
     </div>
diff --git a/templates/web/prod/actions/publish/publish.html.twig b/templates/web/prod/actions/publish/publish.html.twig
index a161199184..db56c040df 100644
--- a/templates/web/prod/actions/publish/publish.html.twig
+++ b/templates/web/prod/actions/publish/publish.html.twig
@@ -42,10 +42,12 @@
                         </label>
                         <br />
                         {% 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}}" />
+                        <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>
                         <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>
                         <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>
diff --git a/templates/web/prod/actions/publish/publish_edit.html.twig b/templates/web/prod/actions/publish/publish_edit.html.twig
index bcfee39324..090ac9a0d6 100644
--- a/templates/web/prod/actions/publish/publish_edit.html.twig
+++ b/templates/web/prod/actions/publish/publish_edit.html.twig
@@ -27,10 +27,12 @@
                     <div class="span6">
                         <h1>{{ 'Editer' | trans }}</h1>
                         <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() }}" />
-                        <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>
+                        <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>
                         <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>
diff --git a/templates/web/prod/results/entry.html.twig b/templates/web/prod/results/entry.html.twig
index f0c271425b..3d4609c379 100644
--- a/templates/web/prod/results/entry.html.twig
+++ b/templates/web/prod/results/entry.html.twig
@@ -50,7 +50,8 @@
             <a class="ajax_answers" href="{{ path('prod_feeds_feed', { 'id' : entry.feed.id }) }}">
                 {% set feed_name = entry.feed.title %}
                 {% 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 %}
     </div>
 
diff --git a/templates/web/prod/results/feeds_entry.html.twig b/templates/web/prod/results/feeds_entry.html.twig
index ba8af43574..c77304b43c 100644
--- a/templates/web/prod/results/feeds_entry.html.twig
+++ b/templates/web/prod/results/feeds_entry.html.twig
@@ -46,7 +46,7 @@
             <a class="ajax_answers" href="{{ path('prod_feeds_feed', { 'id' : entry.feed.id }) }}">
                 {% set feed_name = entry.feed.title %}
                 {% 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>
         {% endif %}
     </div>