Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LPS-90531 Update styling on date input #68977

Closed
wants to merge 2 commits into from
Closed

LPS-90531 Update styling on date input #68977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bd2775
LPS-90531 Set search by keyword default to true
thektan Mar 4, 2019
c763e4d
LPS-90531 Update styling on date input
thektan Mar 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/apps/expando/expando-web/src/main/resources/META-INF/resources/css/main.scss
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
margin-right: 5px;
}

.localized-input-wrapper {
.date-input-wrapper, .localized-input-wrapper {
margin-bottom: 1.5rem;

.control-label {
Expand Down
2 changes: 1 addition & 1 deletion ...s/expando/expando-web/src/main/resources/META-INF/resources/edit/advanced_properties.jspf
View file
Open in desktop
Expand Up @@ -69,7 +69,7 @@
</aui:script>
</c:when>
<c:otherwise>
<aui:input label="searchable-as-keyword" name="Property--index-type--" type="toggle-switch" value="<%= propertyIndexType %>" />
<aui:input checked="<%= (column != null) ? (propertyIndexType == ExpandoColumnConstants.INDEX_TYPE_KEYWORD) : true %>" label="searchable-as-keyword" name="Property--index-type--" type="toggle-switch" value="<%= propertyIndexType %>" />

<div class="form-text">
<liferay-ui:message key="custom-field-index-type-help" />
Expand Down
46 changes: 25 additions & 21 deletions ...s/expando/expando-web/src/main/resources/META-INF/resources/edit/default_value_input.jspf
View file
Open in desktop
Expand Up @@ -38,27 +38,31 @@
}
%>

<aui:field-wrapper label="default-value">
<liferay-ui:input-date
dayParam="defaultValueDay"
dayValue="<%= defaultValueDate.get(Calendar.DATE) %>"
disabled="<%= false %>"
firstDayOfWeek="<%= defaultValueDate.getFirstDayOfWeek() - 1 %>"
monthParam="defaultValueMonth"
monthValue="<%= defaultValueDate.get(Calendar.MONTH) %>"
yearParam="defaultValueYear"
yearValue="<%= defaultValueDate.get(Calendar.YEAR) %>"
/>

<liferay-ui:input-time
amPmParam="defaultValueAmPm"
amPmValue="<%= defaultValueDate.get(Calendar.AM_PM) %>"
disabled="<%= false %>"
hourParam="defaultValueHour"
hourValue="<%= defaultValueDate.get(Calendar.HOUR) %>"
minuteParam="defaultValueMinute"
minuteValue="<%= defaultValueDate.get(Calendar.MINUTE) %>"
/>
<aui:field-wrapper cssClass="date-input-wrapper" label="default-value">
<div class="form-group-autofit">
<liferay-ui:input-date
cssClass="form-group-item"
dayParam="defaultValueDay"
dayValue="<%= defaultValueDate.get(Calendar.DATE) %>"
disabled="<%= false %>"
firstDayOfWeek="<%= defaultValueDate.getFirstDayOfWeek() - 1 %>"
monthParam="defaultValueMonth"
monthValue="<%= defaultValueDate.get(Calendar.MONTH) %>"
yearParam="defaultValueYear"
yearValue="<%= defaultValueDate.get(Calendar.YEAR) %>"
/>

<liferay-ui:input-time
amPmParam="defaultValueAmPm"
amPmValue="<%= defaultValueDate.get(Calendar.AM_PM) %>"
cssClass="form-group-item"
disabled="<%= false %>"
hourParam="defaultValueHour"
hourValue="<%= defaultValueDate.get(Calendar.HOUR) %>"
minuteParam="defaultValueMinute"
minuteValue="<%= defaultValueDate.get(Calendar.MINUTE) %>"
/>
</div>
</aui:field-wrapper>
</c:when>
<c:when test="<%= type == ExpandoColumnConstants.DATE_ARRAY %>">
Expand Down