From 15ee10e5a37107a71145c0a04a47d18585fb8706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20St=C3=B6hr?= <stoehr@effective-webwork.de>
Date: Thu, 1 Jun 2023 17:04:48 +0200
Subject: [PATCH] Improve correction icon

---
 .../main/resources/messages/messages_de.properties  |  1 -
 .../main/resources/messages/messages_en.properties  |  1 -
 .../main/resources/messages/messages_es.properties  |  1 -
 .../main/webapp/WEB-INF/resources/css/kitodo.css    | 13 +++++--------
 .../templates/includes/base/commentTooltip.xhtml    |  5 ++---
 .../templates/includes/comments/comments.xhtml      |  5 ++---
 .../includes/comments/newCommentDialog.xhtml        |  4 +++-
 .../currentTasksEdit/taskBoxActivities.xhtml        |  2 +-
 .../includes/desktop/processesWidget.xhtml          |  9 ++++-----
 .../templates/includes/processes/processList.xhtml  |  9 ++++-----
 .../includes/taskBatchEdit/taskEditActions.xhtml    |  5 ++---
 .../WEB-INF/templates/includes/tasks/taskList.xhtml |  9 ++++-----
 12 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/Kitodo/src/main/resources/messages/messages_de.properties b/Kitodo/src/main/resources/messages/messages_de.properties
index 6279e82f39d..0f381d6331f 100644
--- a/Kitodo/src/main/resources/messages/messages_de.properties
+++ b/Kitodo/src/main/resources/messages/messages_de.properties
@@ -227,7 +227,6 @@ copyRolesToClient=Rollen zum Mandanten hinzuf\u00FCgen
 copyTemplates=Projekt inkl. Templates kopieren
 correction=Korrektur
 correctionFor=Korrektur f\u00FCr Schritt
-correctionK=K
 correctionMessage=Korrekturmeldung
 correctionMessageSend=Korrekturmeldung senden
 correctionMessageSendAllTasks=Korrekturmeldung f\u00FCr alle Schritte senden
diff --git a/Kitodo/src/main/resources/messages/messages_en.properties b/Kitodo/src/main/resources/messages/messages_en.properties
index 40ca9181f3e..2ad7ae1a9d2 100644
--- a/Kitodo/src/main/resources/messages/messages_en.properties
+++ b/Kitodo/src/main/resources/messages/messages_en.properties
@@ -227,7 +227,6 @@ copyRolesToClient=Copy roles to client
 copyTemplates=Copy Project including Templates
 correction=Correction
 correctionFor=Correction for step
-correctionK=C
 correctionMessage=Correction message
 correctionMessageSend=Send correction message
 correctionMessageSendAllTasks=send correction message to all tasks
diff --git a/Kitodo/src/main/resources/messages/messages_es.properties b/Kitodo/src/main/resources/messages/messages_es.properties
index 3084b6a1365..6d8e7bba5b8 100644
--- a/Kitodo/src/main/resources/messages/messages_es.properties
+++ b/Kitodo/src/main/resources/messages/messages_es.properties
@@ -229,7 +229,6 @@ copyRolesToClient=Añadir funciones al cliente
 copyTemplates=Copiar el proyecto incluyendo las plantillas
 correction=Corrección
 correctionFor=Corrección del paso
-correctionK=C
 correctionMessage=Mensaje de corrección
 correctionMessageSend=Enviar mensaje de corrección
 correctionMessageSendAllTasks=Enviar mensaje de corrección para todos los pasos
diff --git a/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css b/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css
index de14da398ea..e19b450f45d 100644
--- a/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css
+++ b/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css
@@ -1779,15 +1779,8 @@ Mass import
     color: var(--medium-gray);
 }
 
-.correction-marker {
-    color: var(--focused-orange);
-    font-size: var(--input-height);
-    font-weight: bold;
-}
-
 .correction {
     color: var(--focused-orange);
-    font-weight: bold;
 }
 
 .corrected {
@@ -2272,6 +2265,10 @@ form#metadata div label,
     display: none;
 }
 
+.comment-correction {
+    margin-right: var(--group-margin);
+}
+
 .comment-author {
     font-weight: bold;
     margin-right: .2em;
@@ -3885,7 +3882,7 @@ footer {
     width: 1em;
 }
 
-.ui-tooltip.comments .icon .correction-marker {
+.ui-tooltip.comments .icon .correction {
     font-size: inherit;
 }
 
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/base/commentTooltip.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/base/commentTooltip.xhtml
index 29b45260c51..be851259e9d 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/base/commentTooltip.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/base/commentTooltip.xhtml
@@ -22,9 +22,8 @@
         <p:dataViewListItem>
             <h:panelGrid columns="4" columnClasses="icon,date,name,message">
                 <h:panelGroup>
-                    <h:outputText value="#{msgs.correctionK}"
-                                  id="commentIcon"
-                                  styleClass="correction-marker #{comment.isCorrected() ? 'corrected' : ''}"
+                    <h:outputText id="commentIcon"
+                                  styleClass="fa fa-exclamation-circle correction #{comment.isCorrected() ? 'corrected' : ''}"
                                   rendered="#{comment.getType() eq 'ERROR'}"/>
                 </h:panelGroup>
 
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/comments/comments.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/comments/comments.xhtml
index 028edb7fc46..55f73dfbfad 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/comments/comments.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/comments/comments.xhtml
@@ -21,9 +21,8 @@
             <!-- Existing comments -->
             <p:dataTable id="commentsGrid" value="#{CommentForm.getAllComments()}" var="item">
                 <p:column style="width: 100%;">
-                    <p:outputLabel value="#{msgs.correctionK} "
-                                   styleClass="#{(item.corrected) ? 'correction corrected' : 'correction'}"
-                                   rendered="#{item.type eq 'ERROR'}"/>
+                    <h:outputText styleClass="comment-correction fa fa-exclamation-circle #{(item.corrected) ? 'correction corrected' : 'correction'}"
+                                  rendered="#{item.type eq 'ERROR'}"/>
 
                     <h:outputText value="#{item.author ne null ? item.author.fullName : 'System'}"
                                   styleClass="comment-author"/>
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/comments/newCommentDialog.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/comments/newCommentDialog.xhtml
index 639ee5eda2a..d0d7f220a39 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/comments/newCommentDialog.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/comments/newCommentDialog.xhtml
@@ -65,7 +65,9 @@
                 <!-- Switch between normal and correction comment -->
                 <p:panelGrid columns="1">
                     <p:column>
-                        <p:outputLabel value="#{msgs.correctionMessage}" for="correctionMessageSwitch"/>
+                        <p:outputLabel for="correctionMessageSwitch">
+                            #{msgs.correctionMessage} <i class="fa fa-exclamation-circle"></i>
+                        </p:outputLabel>
                         <p:selectBooleanCheckbox id="correctionMessageSwitch"
                                                  value="#{CommentForm.correctionComment}"
                                                  disabled="#{!CommentForm.correctionCommentAllowed}"
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/currentTasksEdit/taskBoxActivities.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/currentTasksEdit/taskBoxActivities.xhtml
index 44f83fbe442..8eec5119b2f 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/currentTasksEdit/taskBoxActivities.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/currentTasksEdit/taskBoxActivities.xhtml
@@ -124,7 +124,7 @@
                                    oncomplete="PF('newCommentDialog').show()"
                                    rendered="#{CommentForm.correctionCommentAllowed}"
                                    update=":newCommentForm">
-                        <h:outputText><i class="fa fa-commenting" /> #{msgs.correctionMessageWrite}</h:outputText>
+                        <h:outputText><i class="fa fa-exclamation-circle" /> #{msgs.correctionMessageWrite}</h:outputText>
                     </p:commandLink>
 
                     <!-- Edit Cancel-buttons -->
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/desktop/processesWidget.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/desktop/processesWidget.xhtml
index 10fcc183949..deec22e7fec 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/desktop/processesWidget.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/desktop/processesWidget.xhtml
@@ -39,11 +39,10 @@
                   width="85"
                   headerText="#{msgs.comments}">
             <h:panelGroup id="commentIcon">
-                <h:panelGroup styleClass="fa fa-comment"
-                              rendered="#{process.hasComments() and DesktopForm.hasCorrectionTask(process.id) eq 0}"/>
-                <h:outputText value="#{msgs.correctionK}"
-                              styleClass="correction-marker #{DesktopForm.hasCorrectionTask(process.id) eq 1 ? 'corrected' : ''}"
-                              rendered="#{DesktopForm.hasCorrectionTask(process.id) gt 0}"/>
+                <h:panelGroup styleClass="fa fa-comment
+                    #{DesktopForm.hasCorrectionTask(process.id) gt 0 ? 'fa-exclamation-circle' : 'fa-comment'}
+                    #{DesktopForm.hasCorrectionTask(process.id) eq 1 ? 'corrected' : ''}"
+                              rendered="#{process.hasComments()}"/>
             </h:panelGroup>
             <p:tooltip for="commentIcon" styleClass="comments" trackMouse="true">
                 <ui:include src="/WEB-INF/templates/includes/base/commentTooltip.xhtml">
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/processes/processList.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/processes/processList.xhtml
index 521cb53d9ee..b9d1770b451 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/processes/processList.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/processes/processList.xhtml
@@ -112,11 +112,10 @@
                       rendered="#{ProcessForm.showColumn('process.comments')}"
                       headerText="#{msgs.comments}">
                 <h:panelGroup id="commentIcon">
-                    <h:panelGroup styleClass="fa fa-comment"
-                                  rendered="#{process.hasComments() and process.correctionCommentStatus eq 0}"/>
-                    <h:outputText value="#{msgs.correctionK}"
-                                  styleClass="correction-marker #{process.correctionCommentStatus eq 1 ? 'corrected' : ''}"
-                                  rendered="#{process.correctionCommentStatus gt 0}"/>
+                    <h:panelGroup styleClass="fa
+                        #{process.correctionCommentStatus gt 0 ? 'fa-exclamation-circle correction' : 'fa-comment'}
+                        #{process.correctionCommentStatus eq 1 ? 'corrected' : ''}"
+                                  rendered="#{process.hasComments()}"/>
                 </h:panelGroup>
                 <p:tooltip for="commentIcon" styleClass="comments" trackMouse="true" rendered="#{process.hasComments()}">
                     <ui:include src="/WEB-INF/templates/includes/base/commentTooltip.xhtml">
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/taskBatchEdit/taskEditActions.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/taskBatchEdit/taskEditActions.xhtml
index fafc4ef4d04..87b027c670b 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/taskBatchEdit/taskEditActions.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/taskBatchEdit/taskEditActions.xhtml
@@ -119,9 +119,8 @@
                                         <p:dataTable id="commentsGrid" value="#{CommentForm.getAllComments()}"
                                                      var="item">
                                             <p:column style="width: 100%;">
-                                                <p:outputLabel value="#{msgs.correctionK}"
-                                                               styleClass="#{(item.corrected) ? 'correction corrected' : 'correction'}"
-                                                               rendered="#{item.type eq 'ERROR'}"/>
+                                                <h:outputText styleClass="fa fa-exclamation-circle correction #{(item.corrected) ? 'corrected' : ''}"
+                                                              rendered="#{item.type eq 'ERROR'}"/>
 
                                                 <h:outputText
                                                         value="#{item.author.name} #{item.author.surname}: #{item.message}"
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/tasks/taskList.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/tasks/taskList.xhtml
index 699b8225247..29657f2f063 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/tasks/taskList.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/tasks/taskList.xhtml
@@ -119,11 +119,10 @@
                       sortBy="#{item.correctionCommentStatus}"
                       headerText="#{msgs.comments}">
                 <h:panelGroup id="commentIcon">
-                    <h:panelGroup styleClass="fa fa-comment"
-                                  rendered="#{item.getProcess().hasComments() and item.correctionCommentStatus eq 0}"/>
-                    <h:outputText value="#{msgs.correctionK}"
-                                  styleClass="correction-marker #{item.correctionCommentStatus eq 1 ? 'corrected' : ''}"
-                                  rendered="#{item.correctionCommentStatus gt 0}"/>
+                    <h:panelGroup styleClass="fa
+                        #{item.correctionCommentStatus gt 0 ? 'fa-exclamation-circle correction' : 'fa-comment'}
+                        #{item.correctionCommentStatus eq 1 ? 'corrected' : ''}"
+                                  rendered="#{item.getProcess().hasComments()}"/>
                 </h:panelGroup>
                 <p:tooltip for="commentIcon" styleClass="comments" trackMouse="true">
                     <ui:include src="/WEB-INF/templates/includes/base/commentTooltip.xhtml">