IBX-3529: changed header list title

src/bundle/Resources/translations/bookmark.en.xliff

@@ -41,11 +41,6 @@
         <target state="new">Path</target>
         <note>key: bookmark.list.path</note>
       </trans-unit>
-      <trans-unit id="0cf4491e1bb4fde851986596d3adfb4dbe2f5a17" resname="bookmark.table.header">
-        <source>Bookmarks</source>
-        <target state="new">Bookmarks</target>
-        <note>key: bookmark.table.header</note>
-      </trans-unit>
     </body>
   </file>
 </xliff>

src/bundle/Resources/translations/content_type.en.xliff

@@ -356,11 +356,6 @@
         <target state="new">Name</target>
         <note>key: content_type.view.list.column.name</note>
       </trans-unit>
-      <trans-unit id="7c8c43d61131312dbeeeac5dc536a4f95154f33d" resname="content_type.view.list.title">
-        <source>Content Types in '%identifier%'</source>
-        <target state="new">Content Types in '%identifier%'</target>
-        <note>key: content_type.view.list.title</note>
-      </trans-unit>
       <trans-unit id="dc7335e54d834bb6a342bf0bcb113850de4b69f9" resname="content_type.view.view.title">
         <source>%name%</source>
         <target state="new">%name%</target>
@@ -491,6 +486,11 @@
         <target state="new">Description</target>
         <note>key: field_definition.description</note>
       </trans-unit>
+      <trans-unit id="83622f13aaf2bf484e7c92ced0b65d2e392a157d" resname="field_definition.enabled">
+        <source>Enabled</source>
+        <target state="new">Enabled</target>
+        <note>key: field_definition.enabled</note>
+      </trans-unit>
       <trans-unit id="60b0ee9222a502c38adf1be704d4984564190e8e" resname="field_definition.ezauthor.default_author">
         <source>Default value</source>
         <target state="new">Default value</target>

src/bundle/Resources/translations/drafts.en.xliff

@@ -66,11 +66,6 @@
         <target state="new">Version</target>
         <note>key: drafts.list.version</note>
       </trans-unit>
-      <trans-unit id="8db5ed41af83e43b26fd95de8c718eef14b2c239" resname="drafts.table.header">
-        <source>Drafts</source>
-        <target state="new">Drafts</target>
-        <note>key: drafts.table.header</note>
-      </trans-unit>
     </body>
   </file>
 </xliff>

src/bundle/Resources/translations/ezplatform_url_wildcard.en.xliff

@@ -51,11 +51,6 @@
         <target state="new">Type</target>
         <note>key: url_wildcard.label.type</note>
       </trans-unit>
-      <trans-unit id="e656d6fad42e88206dbf86e5229b6f3f6ceb8eff" resname="url_wildcard.list.title">
-        <source>URL wildcards</source>
-        <target state="new">URL wildcards</target>
-        <note>key: url_wildcard.list.title</note>
-      </trans-unit>
       <trans-unit id="ba35963490c40e4b68169e8d9e7c59bd62677aa7" resname="url_wildcard.modal.create.cancel">
         <source>Cancel</source>
         <target state="new">Cancel</target>

src/bundle/Resources/translations/fieldtypes_preview.en.xliff

@@ -171,6 +171,11 @@
         <target state="new">Content Type</target>
         <note>key: ezobjectrelation.content_type</note>
       </trans-unit>
+      <trans-unit id="79f0c6856a30e0436b61aa28cfc859df8289edfb" resname="ezobjectrelation.created">
+        <source>Created</source>
+        <target state="new">Created</target>
+        <note>key: ezobjectrelation.created</note>
+      </trans-unit>
       <trans-unit id="feb25b24199466f077038c5e6e38209deae21471" resname="ezobjectrelation.name">
         <source>Name</source>
         <target state="new">Name</target>

src/bundle/Resources/translations/ibexa_headline.en.xliff

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
+  <file source-language="en" target-language="en" datatype="plaintext" original="not.available">
+    <header>
+      <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
+      <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
+    </header>
+    <body>
+      <trans-unit id="c9563252bb35a86dd4f1506a8df7d0c62e4fbec7" resname="headline.list">
+        <source>List (%count%)</source>
+        <target state="new">List (%count%)</target>
+        <note>key: headline.list</note>
+      </trans-unit>
+      <trans-unit id="56ecd8ac13f8d74a8ee87f892f008df0a7b8e24e" resname="headline.results">
+        <source>Results (%count%)</source>
+        <target state="new">Results (%count%)</target>
+        <note>key: headline.results</note>
+      </trans-unit>
+      <trans-unit id="712043a232cfd027c25bdb45a62cefee76ea619d" resname="headline.results.search">
+        <source>Results for "%phrase%" (%count%)</source>
+        <target state="new">Results for "%phrase%" (%count%)</target>
+        <note>key: headline.results.search</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>

src/bundle/Resources/translations/language.en.xliff

@@ -91,11 +91,6 @@
         <target state="new">Languages</target>
         <note>key: language.list</note>
       </trans-unit>
-      <trans-unit id="ce129521119cb2cd7bf10d1f95657390fb9cccfd" resname="language.list.number_of_results">
-        <source>List (%number_of_results%)</source>
-        <target state="new">List (%number_of_results%)</target>
-        <note>key: language.list.number_of_results</note>
-      </trans-unit>
       <trans-unit id="2a52961302ce7dfa4a21c5e0bcc239f5a9a36cfe" resname="language.modal.message">
         <source>Do you want to delete the language(s)?</source>
         <target state="new">Do you want to delete the language(s)?</target>

src/bundle/Resources/translations/object_state.en.xliff

@@ -121,11 +121,6 @@
         <target state="new">Edit</target>
         <note>key: object_state.view.list.action.edit</note>
       </trans-unit>
-      <trans-unit id="9af39e306536772c1d7cd402ab587fee66b0231b" resname="object_state.view.list.title">
-        <source>Object states (%count%)</source>
-        <target state="new">Object states (%count%)</target>
-        <note>key: object_state.view.list.title</note>
-      </trans-unit>
       <trans-unit id="dc3b85ca7a255f5f7b961727623f0fc11a3678f0" resname="object_state.view.title">
         <source>Object state: %name%</source>
         <target state="new">Object state: %name%</target>

src/bundle/Resources/translations/role.en.xliff

@@ -111,11 +111,6 @@
         <target state="new">Policies</target>
         <note>key: policy.view.list.title</note>
       </trans-unit>
-      <trans-unit id="bcb306dff55cc9a5c5b0277414dd1aab59c96176" resname="policy.view.list.title.count">
-        <source>Policies (%count%)</source>
-        <target state="new">Policies (%count%)</target>
-        <note>key: policy.view.list.title.count</note>
-      </trans-unit>
       <trans-unit id="9b1c2c53df24e9d0d141037860eb87d2878bdb05" resname="policy.view.policy.title">
         <source>Policy type:</source>
         <target state="new">Policy type:</target>
@@ -231,11 +226,6 @@
         <target state="new">Name</target>
         <note>key: role.view.list.column.name</note>
       </trans-unit>
-      <trans-unit id="a0c33e3728b23f13b825e36808834a6930551873" resname="role.view.list.title">
-        <source>Roles</source>
-        <target state="new">Roles</target>
-        <note>key: role.view.list.title</note>
-      </trans-unit>
       <trans-unit id="ed20cb1159498f2085d5df44b0d43c977abaa791" resname="role.view.view.title">
         <source>Role "%identifier%"</source>
         <target state="new">Role "%identifier%"</target>
@@ -291,10 +281,10 @@
         <target state="new">User/Group</target>
         <note>key: role_assignment.view.list.panel.assignments.column.user_group</note>
       </trans-unit>
-      <trans-unit id="4b3ecf13ffafd795bc971bc6292ea7f5a0bbe64c" resname="role_assignment.view.list.title.count">
-        <source>Assignments (%count%)</source>
-        <target state="new">Assignments (%count%)</target>
-        <note>key: role_assignment.view.list.title.count</note>
+      <trans-unit id="b152833aa8e0248096e41ded7c2f10bb778e363b" resname="role_assignment.view.list.title">
+        <source>Assignments</source>
+        <target state="new">Assignments</target>
+        <note>key: role_assignment.view.list.title</note>
       </trans-unit>
       <trans-unit id="ed6ad791e1da76394f851307e19efdabb22a1595" resname="role_assignment.view.select.groups">
         <source>Select User Groups</source>

src/bundle/Resources/translations/section.en.xliff

@@ -41,11 +41,6 @@
         <target state="new">Content items you assign to this Section will show up here.</target>
         <note>key: section.assigned_content.empty_desc</note>
       </trans-unit>
-      <trans-unit id="60771f4109f17ae27080b34e9322fd7cb02f45b3" resname="section.assigned_content.header">
-        <source>Content items in '%name%' (%count%)</source>
-        <target state="new">Content items in '%name%' (%count%)</target>
-        <note>key: section.assigned_content.header</note>
-      </trans-unit>
       <trans-unit id="adcc2af264c7ae84e69396a8ff7ea5a259abd01e" resname="section.assigned_content.name">
         <source>Name</source>
         <target state="new">Name</target>

src/bundle/Resources/translations/trash.en.xliff

@@ -111,11 +111,6 @@
         <target state="new">Section</target>
         <note>key: trash.section</note>
       </trans-unit>
-      <trans-unit id="06b530d8c8b3d7af7b3f2df9f5102927e7275de4" resname="trash.table.header">
-        <source>Trash</source>
-        <target state="new">Trash</target>
-        <note>key: trash.table.header</note>
-      </trans-unit>
     </body>
   </file>
 </xliff>

src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig

@@ -1,5 +1,7 @@
 {% extends "@ibexadesign/ui/layout.html.twig" %}
 
+{% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %}
+
 {% trans_default_domain 'bookmark' %}
 
 {% form_theme form_remove '@ibexadesign/ui/form_fields.html.twig' %}
@@ -80,7 +82,7 @@
                 'attr': { 'class': 'ibexa-toggle-btn-state', 'data-toggle-button-id': '#bookmark_remove_remove' }
             }) }}
             {% include '@ibexadesign/ui/component/table/table.html.twig' with {
-                headline: 'bookmark.table.header'|trans|desc('Bookmarks') ~ ' (' ~ pager.count ~ ')',
+                headline: custom_results_headline ?? results_headline(pager.getNbResults()),
                 head_cols: [
                     { has_checkbox: true },
                     { has_icon: true },

src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig

@@ -1,5 +1,7 @@
 {% extends "@ibexadesign/ui/layout.html.twig" %}
 
+{% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %}
+
 {% trans_default_domain 'drafts' %}
 
 {% form_theme form_remove '@ibexadesign/ui/form_fields.html.twig' %}
@@ -115,7 +117,7 @@
                 }
             }) }}
             {% include '@ibexadesign/ui/component/table/table.html.twig' with {
-                headline: 'drafts.table.header'|trans|desc('Drafts') ~ ' (' ~ pager.count ~ ')',
+                headline: custom_results_headline ?? results_headline(pager.getNbResults()),
                 head_cols: [
                     { has_checkbox: true },
                     { has_icon: true },

src/bundle/Resources/views/themes/admin/content_type/content_type_group/list.html.twig

@@ -1,5 +1,7 @@
 {% extends "@ibexadesign/ui/layout.html.twig" %}
 
+{% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %}
+
 {% form_theme form_content_type_groups_delete '@ibexadesign/ui/form_fields.html.twig'  %}
 
 {% trans_default_domain 'content_type' %}
@@ -113,7 +115,7 @@
         {% endfor %}
 
         {% embed '@ibexadesign/ui/component/table/table.html.twig' with {
-            headline: 'content_type_group.view.list.title'|trans|desc('Content Type groups'),
+            headline: custom_results_headline ?? results_headline(pager.getNbResults()),
             head_cols: [
                 { has_checkbox: true },
                 { content: 'content_type_group.view.list.column.identifier'|trans|desc('Name') },

src/bundle/Resources/views/themes/admin/content_type/list.html.twig

@@ -1,6 +1,7 @@
 {% trans_default_domain 'content_type' %}
 
 {% import "@ibexadesign/content_type/macros.html.twig" as macros %}
+{% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %}
 
 {% form_theme form_content_types_delete '@ibexadesign/ui/form_fields.html.twig'  %}
 
@@ -76,7 +77,7 @@
     {% endfor %}
 
     {% embed '@ibexadesign/ui/component/table/table.html.twig' with {
-        headline: 'content_type.view.list.title'|trans({ '%identifier%': content_type_group.identifier })|desc('Content Types in \'%identifier%\''),
+        headline: custom_results_headline ?? results_headline(pager.getNbResults()),
         head_cols: [
             { has_checkbox: true },
             { has_icon: true },

src/bundle/Resources/views/themes/admin/language/list.html.twig

@@ -1,5 +1,7 @@
 {% extends "@ibexadesign/ui/layout.html.twig" %}
 
+{% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %}
+
 {% form_theme form_languages_delete '@ibexadesign/ui/form_fields.html.twig'  %}
 
 {% trans_default_domain 'language' %}
@@ -114,7 +116,7 @@
         {% endfor %}
 
         {% embed '@ibexadesign/ui/component/table/table.html.twig' with {
-            headline: 'language.list.number_of_results'|trans({ '%number_of_results%': pager.nbResults })|desc('List (%number_of_results%)'),
+            headline: custom_results_headline ?? results_headline(pager.getNbResults()),
             head_cols: [
                 { has_checkbox: true },
                 { content: 'language.name'|trans|desc('Name') },

src/bundle/Resources/views/themes/admin/object_state/list.html.twig

@@ -1,5 +1,7 @@
 {% form_theme form_states_delete '@ibexadesign/ui/form_fields.html.twig'  %}
 
+{% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %}
+
 {% trans_default_domain 'object_state' %}
 
 {% block content %}
@@ -58,7 +60,7 @@
     {% endfor %}
 
     {% embed '@ibexadesign/ui/component/table/table.html.twig' with {
-        headline: 'object_state.view.list.title'|trans({'%count%': object_states|length})|desc('Object states (%count%)'),
+        headline: custom_results_headline ?? results_headline(object_states|length),
         head_cols: [
             { has_checkbox: true },
             { content: 'object_state.name'|trans|desc('Object state name') },

src/bundle/Resources/views/themes/admin/object_state/object_state_group/list.html.twig

@@ -1,5 +1,7 @@
 {% extends "@ibexadesign/ui/layout.html.twig" %}
 
+{% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %}
+
 {% form_theme form_state_groups_delete '@ibexadesign/ui/form_fields.html.twig'  %}
 
 {% trans_default_domain 'object_state' %}
@@ -102,7 +104,7 @@
         {% endfor %}
 
         {% embed '@ibexadesign/ui/component/table/table.html.twig' with {
-            headline: 'object_state_group.view.list.title'|trans|desc('Object state groups'),
+            headline: custom_results_headline ?? results_headline(object_state_groups|length),
             head_cols: [
                 { has_checkbox: true },
                 { content: 'object_state_group.name'|trans|desc('Object state group name') },

src/bundle/Resources/views/themes/admin/section/assigned_content.html.twig

@@ -1,5 +1,7 @@
 {% trans_default_domain 'section' %}
 
+{% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %}
+
 {% form_theme form_section_content_assign '@ibexadesign/ui/form_fields.html.twig' '@ibexadesign/ui/form/assign_section_widget.html.twig'  %}
 
 {% set body_rows = [] %}
@@ -43,10 +45,7 @@
 {% endfor %}
 
 {% embed '@ibexadesign/ui/component/table/table.html.twig' with {
-    headline: 'section.assigned_content.header'|trans({
-            '%name%': section.name,
-            '%count%': pagerfanta.nbResults
-        })|desc('Content items in \'%name%\' (%count%)'),
+    headline: custom_results_headline ?? results_headline(pagerfanta.nbResults),
     head_cols: [
         { content: 'section.assigned_content.name'|trans|desc('Name') },
         { content: 'section.assigned_content.type'|trans|desc('Content Type') },

src/bundle/Resources/views/themes/admin/section/list.html.twig

@@ -1,5 +1,7 @@
 {% extends '@ibexadesign/ui/layout.html.twig' %}
 
+{% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %}
+
 {% form_theme form_sections_delete '@ibexadesign/ui/form_fields.html.twig'  %}
 {% form_theme form_section_content_assign '@ibexadesign/ui/form_fields.html.twig'  %}
 
@@ -124,7 +126,7 @@
         {% endfor %}
 
         {% embed '@ibexadesign/ui/component/table/table.html.twig' with {
-            headline: 'section.list.title'|trans|desc('Sections'),
+            headline: custom_results_headline ?? results_headline(pager.getNbResults()),
             head_cols: [
                 { has_checkbox: true },
                 { content: 'section.name'|trans|desc('Name') },

src/bundle/Resources/views/themes/admin/trash/list.html.twig

@@ -1,5 +1,7 @@
 {% extends "@ibexadesign/ui/layout.html.twig" %}
 
+{% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %}
+
 {% trans_default_domain 'trash' %}
 
 {% form_theme form_trash_item_restore '@ibexadesign/ui/form_fields.html.twig' %}
@@ -230,8 +232,10 @@
                 },
             ]) %}
 
+            {% set has_search_params = trash_search_params ? trash_search_params.creator or trash_search_params.content_type or trash_search_params.trashed or trash_search_params.section : false %}
+
             {% embed '@ibexadesign/ui/component/table/table.html.twig' with {
-                headline: 'trash.table.header'|trans|desc('Trash'),
+                headline: custom_results_headline ?? results_headline(pager.getNbResults(), has_search_params),
                 head_cols,
                 body_rows,
                 empty_table_info_text: 'trash.empty'|trans|desc('Trash is empty. Content you send to Trash will show up here.'),

src/bundle/Resources/views/themes/admin/ui/component/macros.html.twig

@@ -8,3 +8,18 @@
         {%- endif -%}
     {%- endfor -%}
 {%- endmacro -%}
+
+{% macro results_headline(count, has_filters = false, phrase = null) %}
+    {% trans_default_domain 'ibexa_headline' %}
+    {% set headline_content = 'headline.list'|trans({ '%count%': count })|desc('List (%count%)') %}
+
+    {% if has_filters %}
+        {% set headline_content = 'headline.results'|trans({ '%count%': count })|desc('Results (%count%)') %}
+    {% endif %}
+
+    {% if phrase %}
+        {% set headline_content = 'headline.results.search'|trans({ '%count%': count, '%phrase%': phrase })|desc('Results for "%phrase%" (%count%)') %}
+    {% endif %}
+
+    {{ headline_content }}
+{% endmacro %}

src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig

@@ -1,5 +1,7 @@
 {% trans_default_domain "ezplatform_url_wildcard" %}
 
+{% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %}
+
 {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %}
 {% form_theme form_list '@ibexadesign/ui/form_fields.html.twig' %}
 
@@ -91,7 +93,7 @@
     {% endfor %}
 
     {% embed '@ibexadesign/ui/component/table/table.html.twig' with {
-        headline: 'url_wildcard.list.title'|trans|desc('URL wildcards'),
+        headline: custom_results_headline ?? results_headline(url_wildcards.getNbResults()),
         head_cols: [
             { has_checkbox: true },
             { content: 'url_wildcard.label.alias'|trans|desc('URL alias wildcard') },