diff --git a/dictionaries/ui/layouts/en.dictionary.itop.activity-panel.php b/dictionaries/ui/layouts/en.dictionary.itop.activity-panel.php index 3b1e7ab41f..66edd938d0 100644 --- a/dictionaries/ui/layouts/en.dictionary.itop.activity-panel.php +++ b/dictionaries/ui/layouts/en.dictionary.itop.activity-panel.php @@ -40,8 +40,8 @@ Dict::Add('EN US', 'English', 'English', array( 'UI:Layout:ActivityPanel:ComposeButton:Tooltip' => 'Compose a new log entry', // Case log entry - 'UI:Layout:ActivityPanel:MutltipleEntriesSaveConfirmation:Title' => 'Multiple logs save', - 'UI:Layout:ActivityPanel:MutltipleEntriesSaveConfirmation:Explanation' => 'By pressing the "save" button, you will submit entries for all the edited logs at once.', + 'UI:Layout:ActivityPanel:MultipleEntriesSaveConfirmation:Title' => 'Multiple logs save', + 'UI:Layout:ActivityPanel:MultipleEntriesSaveConfirmation:Explanation' => 'By pressing the "save" button, you will submit entries for all the edited logs at once.', // Placeholder 'UI:Layout:ActivityPanel:NoEntry:Placeholder:Hint' => 'It\'s calm up here, no activity yet', diff --git a/templates/base/layouts/activity-panel/layout.html.twig b/templates/base/layouts/activity-panel/layout.html.twig index 0f403ed1af..1242e2d625 100644 --- a/templates/base/layouts/activity-panel/layout.html.twig +++ b/templates/base/layouts/activity-panel/layout.html.twig @@ -19,42 +19,42 @@ {% endfor %} - {% set sExtraCSSClass = (oUIBlock.GetCaseLogTabs() is empty) ? 'ibo-is-active' : '' %} -
- - {{ 'UI:Layout:ActivityPanel:Tab:Activity:Title'|dict_s }} - -
-
- - - - - - -
- -
- {% for sCaseLogAttCode, aCaseLogData in oUIBlock.GetCaseLogTabs() %} - {{ include('base/layouts/activity-panel/tab-toolbar/caselog.html.twig', {oUIBlock: oUIBlock, iRank: loop.index, bIsActive: (loop.index == 1), aFilteredCaseLogsAttCodes: [sCaseLogAttCode]}) }} - {% endfor %} - {{ include('base/layouts/activity-panel/tab-toolbar/activity.html.twig', {oUIBlock: oUIBlock, bIsActive: (oUIBlock.GetCaseLogTabs()|length == 0)}) }} -
-
{{ 'UI:Layout:ActivityPanel:MutltipleEntriesSaveConfirmation:Explanation'|dict_s }}
+ {% set sExtraCSSClass = (oUIBlock.GetCaseLogTabs() is empty) ? 'ibo-is-active' : '' %} + + +
+
+ {% for sCaseLogAttCode, aCaseLogData in oUIBlock.GetCaseLogTabs() %} + {{ include('base/layouts/activity-panel/tab-toolbar/caselog.html.twig', {oUIBlock: oUIBlock, iRank: loop.index, bIsActive: (loop.index == 1), aFilteredCaseLogsAttCodes: [sCaseLogAttCode]}) }} + {% endfor %} + {{ include('base/layouts/activity-panel/tab-toolbar/activity.html.twig', {oUIBlock: oUIBlock, bIsActive: (oUIBlock.GetCaseLogTabs()|length == 0)}) }} +
+
{{ 'UI:Layout:ActivityPanel:MultipleEntriesSaveConfirmation:Explanation'|dict_s }}
-
-
- {% if oUIBlock.HasAnEditableCaseLogTab() and oUIBlock.IsCaseLogsSubmitAutonomous() %} + + + {% if oUIBlock.HasAnEditableCaseLogTab() and oUIBlock.IsCaseLogsSubmitAutonomous() %} @@ -62,16 +62,16 @@ {% endif %}
{% if oUIBlock.GetGroupedEntries()|length > 0 %} - {% for aEntryGroup in oUIBlock.GetGroupedEntries() %} - {{ include('base/layouts/activity-panel/entry-group.html.twig', {aEntryGroup: aEntryGroup}) }} - {% endfor %} - {% else %} -
-
- {{ source("illustrations/undraw_reading_time.svg") }} -
-
{{ 'UI:Layout:ActivityPanel:NoEntry:Placeholder:Hint'|dict_s }}
-
- {% endif %} + {% for aEntryGroup in oUIBlock.GetGroupedEntries() %} + {{ include('base/layouts/activity-panel/entry-group.html.twig', {aEntryGroup: aEntryGroup}) }} + {% endfor %} + {% else %} +
+
+ {{ source("illustrations/undraw_reading_time.svg") }} +
+
{{ 'UI:Layout:ActivityPanel:NoEntry:Placeholder:Hint'|dict_s }}
+
+ {% endif %}
\ No newline at end of file