Skip to content

Commit

Permalink
Bug/ivyportal 18042 not nice UI in portal 12.0.0 (#1321)
Browse files Browse the repository at this point in the history
* bug/IVYPORTAL-18042-Not-nice-UI-in-Portal-12.0.0

- Update Workflows events dialog

* bug/IVYPORTAL-18042-Not-nice-UI-in-Portal-12.0.0

- Update UI workflows event table

* bug/IVYPORTAL-18042-Not-nice-UI-in-Portal-12.0.0

- Update height of edit configuration widget

* bug/IVYPORTAL-18042-Not-nice-UI-in-Portal-12.0.0

- Update css on Welcome widget
  • Loading branch information
lmluat-axonivy authored Dec 19, 2024
1 parent 004a197 commit d2caf2e
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@
<p:dataTable id="events-table" widgetVar="events-table" var="event" value="#{data.workflowEvents}"
sortBy="#{taskBean.taskWorkflowEventSortByTimestamp}"
emptyMessage="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/noRecordsFound')}" scrollable="true"
scrollHeight="300"
reflow="true" lazy="false" styleClass="ui-g-12">

<p:column width="300" sortBy="#{event.displayName}">
<p:column width="250" sortBy="#{event.displayName}">
<f:facet name="header">
<h:outputText value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/noteHistory/eventType')}" />
</f:facet>
Expand All @@ -39,7 +38,7 @@
</p:column>

<c:set var="taskState" value="#{taskBean.getTranslatedState(event.taskBusinessState)}" />
<p:column width="200" sortBy="#{taskState}"
<p:column width="80" sortBy="#{taskState}"
styleClass="note-history-fullname-column">
<f:facet name="header">
<h:outputText value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/taskList/defaultColumns/STATE')}" />
Expand All @@ -49,15 +48,15 @@
</h:panelGroup>
</p:column>

<p:column width="200" sortBy="#{event.involvedUsername}">
<p:column width="150" sortBy="#{event.involvedUsername}">
<f:facet name="header">
<h:outputText value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/author')}" />
</f:facet>
<pc:securityMemberNameAndAvatar
displayName="#{event.involvedUsername}" securityMember="#{event.involvedUser}" />
</p:column>

<p:column width="200" sortBy="#{event.timestamp}" field="timestamp" filterable="false" styleClass="u-hidden-sm-down">
<p:column width="100" sortBy="#{event.timestamp}" field="timestamp" filterable="false" styleClass="u-hidden-sm-down">
<f:facet name="header">
<h:outputText value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/creationDate')}" />
</f:facet>
Expand Down
10 changes: 9 additions & 1 deletion AxonIvyPortal/portal/webContent/resources/css/dashboard.css
Original file line number Diff line number Diff line change
Expand Up @@ -1625,7 +1625,15 @@ body .ui-widget.new-widget-dialog__introduction {

.welcome-widget-configuration .welcome-text-input-panel {
display: flex;
align-items: center;
flex-direction: row;
}

@media screen and (max-width: 1366px) {
.welcome-widget-configuration .welcome-text-input-panel {
display: flex;
flex-direction: column;
align-items: flex-start;
}
}

.welcome-widget-configuration .welcome-text-input-panel .greeting-text {
Expand Down
2 changes: 1 addition & 1 deletion AxonIvyPortal/portal/webContent/resources/css/module.css
Original file line number Diff line number Diff line change
Expand Up @@ -2084,7 +2084,7 @@ _:-ms-input-placeholder, :root a.compact-task-start-link {
}

.workflow-events-dialog {
max-width: 70%;
max-width: 55%;
}

.task-workflow-event-command {
Expand Down

0 comments on commit d2caf2e

Please sign in to comment.