feature/IVYPORTAL-18032-UI-facelift-conflict

- Handle feedback
axonivy-market · Dec 17, 2024 · bd3734e · bd3734e
1 parent cbc283b
commit bd3734e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/AxonIvyPortal/portal/cms/cms_de.yaml b/AxonIvyPortal/portal/cms/cms_de.yaml
@@ -410,6 +410,7 @@ ch.ivy.addon.portalkit.ui.jsf:
     active: Aktiviert
     add: Hinzufügen
     addDocument: Dokument hinzufügen
+    addLink: Link hinzufügen
     addNote: Notiz hinzufügen
     allCategories: Alle Kategorien
     allTypes: Alle Typen

diff --git a/AxonIvyPortal/portal/cms/cms_en.yaml b/AxonIvyPortal/portal/cms/cms_en.yaml
@@ -409,6 +409,7 @@ ch.ivy.addon.portalkit.ui.jsf:
     active: Active
     add: Add
     addDocument: Add document
+    addLink: Add Link
     addNote: Add note
     allCategories: All Categories
     allTypes: All types

diff --git a/AxonIvyPortal/portal/cms/cms_es.yaml b/AxonIvyPortal/portal/cms/cms_es.yaml
@@ -411,6 +411,7 @@ ch.ivy.addon.portalkit.ui.jsf:
     active: Activado
     add: Añadir
     addDocument: Agregar documento
+    addLink: Añadir enlace
     addNote: Agregar nota
     allCategories: Todas las categorias
     allTypes: Todos los tipos

diff --git a/AxonIvyPortal/portal/cms/cms_fr.yaml b/AxonIvyPortal/portal/cms/cms_fr.yaml
@@ -408,6 +408,7 @@ ch.ivy.addon.portalkit.ui.jsf:
     active: Activé
     add: Ajouter
     addDocument: Ajouter un document
+    addLink: Ajouter un lien
     addNote: Ajouter une note
     allCategories: Toutes les catégories
     allTypes: Tous les types

diff --git a/...l/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml b/...l/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml
@@ -192,13 +192,9 @@
     </h:form>
 
     <f:facet name="footer">
-      <p:commandLink id="cancel-edit-process-command"
-        value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
-        actionListener="#{processWidgetBean.removeTempExternalLinkImage}"
-        oncomplete="PF('edit-process-dialog').hide()"
-        styleClass="u-mar-right-10" />
-      <p:commandButton id="save-process-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/save')}" icon="#{visibilityBean.generateButtonIcon('si si-check-1')}"
-        process="#{cc.clientId}:edit-process-form" actionListener="#{processWidgetBean.updateProcessData()}" update="#{cc.clientId}:edit-process-form:edit-external-link-error-message"
+      <p:commandButton id="save-process-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/save')}"
+        process="#{cc.clientId}:edit-process-form" actionListener="#{processWidgetBean.updateProcessData()}" styleClass="w-full"
+        update="#{cc.clientId}:edit-process-form:edit-external-link-error-message"
         oncomplete="if(!args.validationFailed){PF('edit-process-dialog').hide(); updateProcessListOnSaveSuccessful();}" form="#{cc.clientId}:edit-process-form"/>
     </f:facet>
   </p:dialog>
@@ -390,15 +386,10 @@
     </h:form>
 
     <f:facet name="footer">
-      <p:commandLink id="cancel-adding-external-link-command"
-        value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
-        actionListener="#{externalLinkBean.removeImage()}"
-        oncomplete="PF('add-external-link-dialog').hide()"
-        styleClass="u-mar-right-15" />
-      <p:commandButton id="adding-new-external-link-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/add')}"
-        icon="#{visibilityBean.generateButtonIcon('si si-add-small')}" process="#{cc.clientId}:add-external-link-form"
+      <p:commandButton id="adding-new-external-link-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/addLink')}"
+        process="#{cc.clientId}:add-external-link-form"
         form="#{cc.clientId}:add-external-link-form" actionListener="#{processWidgetBean.createNewExternalLink()}"
-        update="#{cc.clientId}:add-external-link-form"
+        update="#{cc.clientId}:add-external-link-form" styleClass="w-full"
         oncomplete="if(!args.validationFailed){PF('add-external-link-dialog').hide(); updateProcessListOnSaveSuccessful();}" />
     </f:facet>
   </p:dialog>