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-112464 Replaces className usages #89357

Closed
wants to merge 26 commits into from
Closed

LPS-112464 Replaces className usages #89357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ce4f361
LPS-112464 Renames processCssClass to processCssClasses
jbalsas May 28, 2020
b9d9a52
LPS-114005 - Apply the use of sheet clay taglib in analytics-settings…
marcoscv-work May 27, 2020
0cd99a5
LPS-114006 - Apply the use of autofit clay taglib in app-builder-web
marcoscv-work May 27, 2020
f625dab
LPS-114007 - Apply the use of sheet and autofit clay taglib in portal…
marcoscv-work May 27, 2020
c3b5dd2
LPS-114009 - Remove unneeded autofit-row use
marcoscv-work May 27, 2020
3e200a1
LPS-114013 - Apply the use of sheet clay taglib in calendar-web
marcoscv-work May 26, 2020
ce39f6e
LPS-114014 - Apply the use of sheet and autofit clay taglib in change…
marcoscv-work May 27, 2020
c8cc4e3
LPS-114031 - Apply the use of content layout and sheet clay taglibs i…
marcoscv-work May 27, 2020
acf7806
LPS-114030 - Apply the use of sheet clay taglib in expando-web
marcoscv-work May 27, 2020
d881316
LPS-114026 Replace layout classes with new clay taglibs in dynamic-da…
edalgrin May 26, 2020
be6f381
LPS-114027 Replace layout classes with new clay taglibs in dynamic-da…
edalgrin May 27, 2020
123784a
LPS-114028 Replace layout classes with new clay taglibs in dynamic-da…
edalgrin May 27, 2020
f9afeaa
LPS-114029 Replace layout classes with new clay taglibs in dynamic-da…
edalgrin May 27, 2020
80cdd8a
LPS-114043 - Apply the use of clay content taglib in oauth2-provider
marcoscv-work May 28, 2020
e063d95
LPS-114043 - Apply the use of clay col taglib in oauth2-provider
marcoscv-work May 28, 2020
3e3a057
LPS-114044 - Apply the use of clay content taglib in portal-search-tu…
marcoscv-work May 28, 2020
67b0c5c
LPS-114038 Replace layout classes with new clay taglibs in layout-adm…
edalgrin May 27, 2020
473c2fe
LPS-114040 Replace layout classes with new clay taglibs in layout-seo…
edalgrin May 28, 2020
a81bdad
LPS-114039 Replace layout classes with new clay taglibs in layout-pag…
edalgrin May 28, 2020
684f04f
LPS-114041 - Apply the use of sheet clay taglib in marketplace-app-ma…
marcoscv-work May 28, 2020
14a76aa
LPS-114042 - Apply the use of clay content taglib in message-boards
marcoscv-work May 28, 2020
0425d5c
LPS-114042 Fix compilation problem: declare variable before so it can…
ambrinchaudhary May 28, 2020
1454556
LPS-114046 Replace layout classes with new clay taglibs in portal-set…
edalgrin May 28, 2020
8a9293a
LPS-114047 Replace layout classes with new clay taglibs in portal-wor…
edalgrin May 28, 2020
c5d6923
LPS-114045 Replace layout classes with new clay taglibs in portal-sea…
edalgrin May 28, 2020
06370cf
LPS-112464 Replaces className usages
jbalsas May 28, 2020
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
8 changes: 5 additions & 3 deletions ...ps/analytics/analytics-settings-web/src/main/resources/META-INF/resources/add_channel.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,10 @@ PortalUtil.addPortletBreadcrumbEntry(request, LanguageUtil.get(resourceBundle, "
<aui:form action="<%= addChannelURL %>" method="post" name="fm">
<aui:input name="redirect" type="hidden" value="<%= redirect %>" />

<div class="portlet-analytics-settings sheet sheet-lg">
<h2 class="autofit-row">
<clay:sheet
cssClass="portlet-analytics-settings"
>
<h2>
<liferay-ui:message key="new-property" />
</h2>

Expand Down Expand Up @@ -141,7 +143,7 @@ PortalUtil.addPortletBreadcrumbEntry(request, LanguageUtil.get(resourceBundle, "
<aui:button disabled="<%= true %>" id="add-channel-button" type="submit" value="done" />
</aui:button-row>
</div>
</div>
</clay:sheet>
</aui:form>

<aui:script use="liferay-search-container">
Expand Down
8 changes: 5 additions & 3 deletions ...s/analytics/analytics-settings-web/src/main/resources/META-INF/resources/edit_channel.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ PortalUtil.addPortletBreadcrumbEntry(request, LanguageUtil.get(resourceBundle, "
<aui:input name="redirect" type="hidden" value="<%= redirect %>" />
<aui:input name="channelId" type="hidden" value="<%= channelId %>" />

<div class="portlet-analytics-settings sheet sheet-lg">
<h2 class="autofit-row">
<clay:sheet
cssClass="portlet-analytics-settings"
>
<h2>
<liferay-ui:message arguments="<%= channelName %>" key="sites-to-sync-x" />
</h2>

Expand Down Expand Up @@ -127,5 +129,5 @@ PortalUtil.addPortletBreadcrumbEntry(request, LanguageUtil.get(resourceBundle, "
<aui:button type="submit" value="done" />
</aui:button-row>
</div>
</div>
</clay:sheet>
</aui:form>
6 changes: 4 additions & 2 deletions ...nalytics/analytics-settings-web/src/main/resources/META-INF/resources/edit_properties.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ if (!Validator.isBlank(analyticsConfiguration.token())) {
String keywords = ParamUtil.getString(request, "keywords");
%>

<div class="pb-2 portlet-analytics-settings sheet sheet-lg">
<clay:sheet
cssClass="pb-2 portlet-analytics-settings"
>
<h2>
<liferay-ui:message key="sync-sites-to-property" />
</h2>
Expand Down Expand Up @@ -130,4 +132,4 @@ String keywords = ParamUtil.getString(request, "keywords");
</liferay-ui:search-container>
</c:otherwise>
</c:choose>
</div>
</clay:sheet>
10 changes: 4 additions & 6 deletions ...pps/analytics/analytics-settings-web/src/main/resources/META-INF/resources/edit_sites.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@ GroupDisplayContext groupDisplayContext = new GroupDisplayContext("/analytics/ed

<portlet:actionURL name="/analytics/edit_synced_sites" var="editSyncedSitesURL" />

<div class="sheet sheet-lg">
<h2 class="autofit-row">
<span class="autofit-col autofit-col-expand">
<liferay-ui:message key="choose-sites-to-sync" />
</span>
<clay:sheet>
<h2>
<liferay-ui:message key="choose-sites-to-sync" />
</h2>

<clay:management-toolbar
Expand Down Expand Up @@ -78,4 +76,4 @@ GroupDisplayContext groupDisplayContext = new GroupDisplayContext("/analytics/ed
<aui:button disabled="<%= !connected %>" type="submit" value="save-and-sync" />
</aui:button-row>
</aui:form>
</div>
</clay:sheet>
12 changes: 6 additions & 6 deletions ...ics/analytics-settings-web/src/main/resources/META-INF/resources/edit_synced_contacts.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ Set<String> syncedUserGroupIds = SetUtil.fromArray(analyticsConfiguration.synced

<portlet:actionURL name="/analytics/edit_synced_contacts" var="editSyncedContactsURL" />

<div class="portlet-analytics-settings sheet sheet-lg">
<h2 class="autofit-row">
<span class="autofit-col autofit-col-expand">
<liferay-ui:message key="contact-data" />
</span>
<clay:sheet
cssClass="portlet-analytics-settings"
>
<h2>
<liferay-ui:message key="contact-data" />
</h2>

<aui:form action="<%= editSyncedContactsURL %>" method="post" name="fm">
Expand Down Expand Up @@ -160,4 +160,4 @@ Set<String> syncedUserGroupIds = SetUtil.fromArray(analyticsConfiguration.synced
<aui:button disabled="<%= !connected %>" type="submit" value="save" />
</aui:button-row>
</aui:form>
</div>
</clay:sheet>
16 changes: 6 additions & 10 deletions ...lytics-settings-web/src/main/resources/META-INF/resources/edit_synced_contacts_groups.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,15 @@ PortalUtil.addPortletBreadcrumbEntry(request, LanguageUtil.get(resourceBundle, "
</clay:row>
</clay:container-fluid>

<div class="sheet sheet-lg">
<h2 class="autofit-row">
<span class="autofit-col autofit-col-expand">
<liferay-ui:message key="select-contacts-by-user-groups" />
</span>
<clay:sheet>
<h2>
<liferay-ui:message key="select-contacts-by-user-groups" />
</h2>

<hr />

<div class="autofit-row form-text">
<span class="autofit-col autofit-col-expand pb-3">
<liferay-ui:message key="select-contacts-by-user-groups-help" />
</span>
<div class="c-pb-3 form-text">
<liferay-ui:message key="select-contacts-by-user-groups-help" />
</div>

<%
Expand Down Expand Up @@ -106,4 +102,4 @@ PortalUtil.addPortletBreadcrumbEntry(request, LanguageUtil.get(resourceBundle, "
<aui:button href="<%= redirect %>" type="cancel" value="cancel" />
</aui:button-row>
</aui:form>
</div>
</clay:sheet>
16 changes: 6 additions & 10 deletions ...settings-web/src/main/resources/META-INF/resources/edit_synced_contacts_organizations.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,15 @@ PortalUtil.addPortletBreadcrumbEntry(request, LanguageUtil.get(resourceBundle, "
</clay:row>
</clay:container-fluid>

<div class="sheet sheet-lg">
<h2 class="autofit-row">
<span class="autofit-col autofit-col-expand">
<liferay-ui:message key="select-contacts-by-organizations" />
</span>
<clay:sheet>
<h2>
<liferay-ui:message key="select-contacts-by-organizations" />
</h2>

<hr />

<div class="autofit-row form-text">
<span class="autofit-col autofit-col-expand pb-3">
<liferay-ui:message key="select-contacts-by-organizations-help" />
</span>
<div class="c-pb-3 form-text">
<liferay-ui:message key="select-contacts-by-organizations-help" />
</div>

<%
Expand Down Expand Up @@ -106,4 +102,4 @@ PortalUtil.addPortletBreadcrumbEntry(request, LanguageUtil.get(resourceBundle, "
<aui:button href="<%= redirect %>" type="cancel" value="cancel" />
</aui:button-row>
</aui:form>
</div>
</clay:sheet>
10 changes: 4 additions & 6 deletions ...nalytics-settings-web/src/main/resources/META-INF/resources/edit_workspace_connection.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ if (analyticsConfiguration != null) {

<portlet:actionURL name="/analytics/edit_workspace_connection" var="editWorkspaceConnectionURL" />

<div class="sheet sheet-lg">
<clay:sheet>
<c:if test="<%= AnalyticsSettingsUtil.isAnalyticsEnabledWithOAuth(themeDisplay.getCompanyId()) %>">
<aui:alert type="warning">
<div class="mb-2">
Expand All @@ -79,10 +79,8 @@ if (analyticsConfiguration != null) {
</aui:alert>
</c:if>

<h2 class="autofit-row">
<span class="autofit-col autofit-col-expand">
<liferay-ui:message key="connect-analytics-cloud" />
</span>
<h2>
<liferay-ui:message key="connect-analytics-cloud" />
</h2>

<aui:form action="<%= editWorkspaceConnectionURL %>" data-senna-off="true" method="post" name="fm" onSubmit='<%= renderResponse.getNamespace() + "confirmation(event);" %>'>
Expand Down Expand Up @@ -177,7 +175,7 @@ if (analyticsConfiguration != null) {
<aui:button disabled="<%= !connected %>" href="<%= selectSitesURL.toString() %>" primary="<%= true %>" value="select-sites" />
</aui:button-row>
</aui:fieldset>
</div>
</clay:sheet>

<script>
function <portlet:namespace />confirmation(event) {
Expand Down
18 changes: 12 additions & 6 deletions ...es/apps/app-builder/app-builder-web/src/main/resources/META-INF/resources/layout/view.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,30 +35,36 @@ if (mvcPath.startsWith("/edit_entry.jsp")) {
<clay:container-fluid
cssClass="p-0"
>
<div class="app-builder-standalone-menu autofit-row">
<div class="autofit-col autofit-col-expand">
<clay:content-row
cssClass="app-builder-standalone-menu"
>
<clay:content-col
expand="true"
>
<a class="company-link" href="<%= PortalUtil.addPreservedParameters(themeDisplay, themeDisplay.getURLPortal(), false, true) %>">
<span class="company-details text-truncate">
<img alt="" class="company-logo" src='<%= themeDisplay.getPathImage() + "/company_logo?img_id=" + company.getLogoId() + "&t=" + WebServerServletTokenUtil.getToken(company.getLogoId()) %>' />

<span class="company-name"><%= HtmlUtil.escape(company.getName()) %></span>
</span>
</a>
</div>
</clay:content-col>

<div style="display: none;">
<liferay-portlet:runtime
portletName="<%= PortletKeys.LOGIN %>"
/>
</div>

<div class="autofit-col text-right">
<clay:content-col
cssClass="text-right"
>
<liferay-portlet:runtime
portletProviderAction="<%= PortletProvider.Action.VIEW %>"
portletProviderClassName="com.liferay.admin.kernel.util.PortalUserPersonalBarApplicationType$UserPersonalBar"
/>
</div>
</div>
</clay:content-col>
</clay:content-row>

<h1 class="app-builder-standalone-name <%= editEntryCssClass %>"><%= HtmlUtil.escape(appName) %></h1>
</clay:container-fluid>
Expand Down
4 changes: 2 additions & 2 deletions ...pps/calendar/calendar-web/src/main/resources/META-INF/resources/edit_calendar_booking.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ while (manageableCalendarsIterator.hasNext()) {
<aui:input name="workflowAction" type="hidden" value="<%= WorkflowConstants.ACTION_PUBLISH %>" />

<div class="lfr-form-content">
<div class="sheet sheet-lg">
<clay:sheet>
<liferay-ui:error exception="<%= CalendarBookingDurationException.class %>" message="please-enter-a-start-date-that-comes-before-the-end-date" />
<liferay-ui:error exception="<%= CalendarBookingRecurrenceException.class %>" message="the-last-repeating-date-should-come-after-the-event-start-date" />

Expand Down Expand Up @@ -508,7 +508,7 @@ while (manageableCalendarsIterator.hasNext()) {
</aui:fieldset>

<%@ include file="/calendar_booking_recurrence_container.jspf" %>
</div>
</clay:sheet>
</div>

<aui:button-row cssClass="d-block">
Expand Down
4 changes: 2 additions & 2 deletions ...ge-tracking-web/src/main/resources/META-INF/resources/change_lists/edit_ct_collection.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ portletDisplay.setShowBackIcon(true);
<liferay-ui:error exception="<%= CTCollectionDescriptionException.class %>" message="the-publication-description-is-too-long" />
<liferay-ui:error exception="<%= CTCollectionNameException.class %>" message="the-publication-name-is-too-long" />

<div class="custom-sheet sheet sheet-lg">
<clay:sheet>
<aui:form action='<%= actionURL + "&etag=0&strip=0" %>' cssClass="lfr-export-dialog" method="post" name="editChangeListFm">
<aui:input name="ctCollectionId" type="hidden" value="<%= ctCollectionId %>" />

Expand Down Expand Up @@ -93,4 +93,4 @@ portletDisplay.setShowBackIcon(true);
<aui:button href="<%= redirect %>" type="cancel" />
</aui:button-row>
</aui:form>
</div>
</clay:sheet>