feat: Added view_this_revision button (#10095)

openfoodfacts · May 24, 2024 · 433a711 · 433a711
1 parent 95688be
commit 433a711
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/po/common/common.pot b/po/common/common.pot
@@ -2571,6 +2571,10 @@ msgctxt "view"
 msgid "view"
 msgstr ""
 
+msgctxt "view_this_revision"
+msgid "View this revision"
+msgstr ""
+
 msgctxt "view_list_for_products_from_the_entire_world"
 msgid "View the list for matching products from the entire world"
 msgstr ""

diff --git a/po/common/en.po b/po/common/en.po
@@ -2595,6 +2595,10 @@ msgctxt "view"
 msgid "view"
 msgstr "view"
 
+msgctxt "view_this_revision"
+msgid "View this revision"
+msgstr "View this revision"
+
 msgctxt "view_list_for_products_from_the_entire_world"
 msgid "View the list for matching products from the entire world"
 msgstr "View the list for matching products from the entire world"

diff --git a/templates/web/pages/product/includes/edit_history.tt.html b/templates/web/pages/product/includes/edit_history.tt.html
@@ -7,10 +7,10 @@ <h2 id="history">[% lang('history') %]</h2>
   [% FOREACH revision IN revisions %]
   <li>
     [% revision.date %] - [% display_editor_link(revision.userid) %][% IF revision.uuid %] (UUID: [% revision.uuid %])[% END %] [% revision.diffs %] [% IF
-    revision.comment %] - [% revision.comment %] [% END %] -
-    <a href="[% this_product_url %]?rev=[% revision.number %]">[% lang('view') %]</a>
+    revision.comment %] - [% revision.comment %] [% END %] &nbsp;
+    <a href="[% this_product_url %]?rev=[% revision.number %]" class="button tiny">[% lang('view_this_revision') %]</a>
     [% IF has_permission_product_revert AND product.rev != revision.number %]
-    - <a class="button tiny alert product_revert_button" data-code="[% product.code %]" data-rev="[% revision.number %]">[% lang('revert') %]</a>
+    &nbsp; <a class="button tiny alert product_revert_button" data-code="[% product.code %]" data-rev="[% revision.number %]">[% lang('revert') %]</a>
     <span id="revert_result_[% revision.number %]"></span>
     [% END %]
   </li>

diff --git a/tests/integration/expected_test_results/web_html/fr-edit-product.html b/tests/integration/expected_test_results/web_html/fr-edit-product.html
@@ -3417,8 +3417,8 @@ <h2 id="history">Changes history</h2>
 <ul id="history_list">
 
   <li>
-    <time datetime="--ignore--">--ignore--</time> - <a href="/editor/tests" lang="no_language">tests</a> Data (Added: lang, product_name, quantity, brands, categories, labels, link, countries, nutrition_data_per, nutrition_data_prepared_per, serving_size, ingredients_text, generic_name_en, ingredients_text_en, origin_en, product_name_en, ingredients_text_fr, product_name_fr) -- Nutriments (Added: nutrition-score-fr)   - (app)  -
-    <a href="/product/3300000000002/organic-apple-and-raspberry-pie-les-tartes-de-robert?rev=1">view</a>
+    <time datetime="--ignore--">--ignore--</time> - <a href="/editor/tests" lang="no_language">tests</a> Data (Added: lang, product_name, quantity, brands, categories, labels, link, countries, nutrition_data_per, nutrition_data_prepared_per, serving_size, ingredients_text, generic_name_en, ingredients_text_en, origin_en, product_name_en, ingredients_text_fr, product_name_fr) -- Nutriments (Added: nutrition-score-fr)   - (app)  &nbsp;
+    <a href="/product/3300000000002/organic-apple-and-raspberry-pie-les-tartes-de-robert?rev=1" class="button tiny">View this revision</a>
 
   </li>
 

diff --git a/tests/integration/expected_test_results/web_html/world-edit-product.html b/tests/integration/expected_test_results/web_html/world-edit-product.html
@@ -3417,8 +3417,8 @@ <h2 id="history">Changes history</h2>
 <ul id="history_list">
 
   <li>
-    <time datetime="--ignore--">--ignore--</time> - <a href="/editor/tests" lang="no_language">tests</a> Data (Added: lang, product_name, generic_name, quantity, brands, categories, labels, link, countries, origin, nutrition_data_per, nutrition_data_prepared_per, serving_size, ingredients_text, generic_name_en, ingredients_text_en, origin_en, product_name_en, ingredients_text_fr) -- Nutriments (Added: nutrition-score-fr)   - (app)  -
-    <a href="/product/3300000000001/apple-pie-bob-s-pies?rev=1">view</a>
+    <time datetime="--ignore--">--ignore--</time> - <a href="/editor/tests" lang="no_language">tests</a> Data (Added: lang, product_name, generic_name, quantity, brands, categories, labels, link, countries, origin, nutrition_data_per, nutrition_data_prepared_per, serving_size, ingredients_text, generic_name_en, ingredients_text_en, origin_en, product_name_en, ingredients_text_fr) -- Nutriments (Added: nutrition-score-fr)   - (app)  &nbsp;
+    <a href="/product/3300000000001/apple-pie-bob-s-pies?rev=1" class="button tiny">View this revision</a>
 
   </li>