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-84493 SF #62480

Closed
wants to merge 3 commits into from
Closed

LPS-84493 SF #62480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c410a44
LPS-84493 Added container to wrap the content.
palius Aug 22, 2018
2ca35be
LPS-84493 Title is no longer cropped.
palius Aug 22, 2018
d137610
LPS-84493 SF
palius Aug 22, 2018
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
4 changes: 4 additions & 0 deletions modules/apps/staging/staging-bar-web/src/main/resources/META-INF/resources/css/main.scss
View file
Open in desktop
Expand Up @@ -200,4 +200,8 @@
right: 0;
top: 100%;
}
}

.header-title-with-overflow {
overflow: visible !important;
}
126 changes: 64 additions & 62 deletions ...staging/staging-bar-web/src/main/resources/META-INF/resources/merge_layout_set_branch.jsp
View file
Open in desktop
Expand Up @@ -32,72 +32,74 @@ if (layoutSetBranches.contains(layoutSetBranch)) {
}
%>

<div class="site-pages-variation taglib-header">
<a class="icon-monospaced list-unstyled portlet-icon-back text-default" href="<%= HtmlUtil.escapeAttribute(redirect) %>" title="<%= HtmlUtil.escapeAttribute(LanguageUtil.get(resourceBundle, "back")) %>">
<liferay-ui:icon
icon="angle-left"
markupView="lexicon"
/>
</a>

<h3 class="header-title">
<span>
<%= HtmlUtil.escape(LanguageUtil.get(resourceBundle, "merge-site-pages-variation")) %>
</span>
</h3>
</div>

<div id="<portlet:namespace />mergeLayoutSetBranch">
<portlet:actionURL name="mergeLayoutSetBranch" var="mergeLayoutSetBranchURL">
<portlet:param name="mvcRenderCommandName" value="viewLayoutSetBranches" />
</portlet:actionURL>

<aui:form action="<%= mergeLayoutSetBranchURL %>" enctype="multipart/form-data" method="post" name="fm4">
<aui:input name="redirect" type="hidden" value="<%= redirect %>" />
<aui:input name="groupId" type="hidden" value="<%= groupId %>" />
<aui:input name="layoutSetBranchId" type="hidden" value="<%= layoutSetBranchId %>" />
<aui:input name="mergeLayoutSetBranchId" type="hidden" />

<liferay-ui:search-container
id="layoutSetBranchesSearchContainer"
total="<%= layoutSetBranches.size() %>"
>
<liferay-ui:search-container-results
results="<%= layoutSetBranches %>"
<div class="container-fluid-1280">
<div class="site-pages-variation taglib-header">
<a class="icon-monospaced list-unstyled portlet-icon-back text-default" href="<%= HtmlUtil.escapeAttribute(redirect) %>" title="<%= HtmlUtil.escapeAttribute(LanguageUtil.get(resourceBundle, "back")) %>">
<liferay-ui:icon
icon="angle-left"
markupView="lexicon"
/>

<liferay-ui:search-container-row
className="com.liferay.portal.kernel.model.LayoutSetBranch"
escapedModel="<%= true %>"
keyProperty="layoutSetBranchId"
modelVar="curLayoutSetBranch"
</a>

<h3 class="header-title header-title-with-overflow">
<span>
<%= HtmlUtil.escape(LanguageUtil.get(resourceBundle, "merge-site-pages-variation")) %>
</span>
</h3>
</div>

<div id="<portlet:namespace />mergeLayoutSetBranch">
<portlet:actionURL name="mergeLayoutSetBranch" var="mergeLayoutSetBranchURL">
<portlet:param name="mvcRenderCommandName" value="viewLayoutSetBranches" />
</portlet:actionURL>

<aui:form action="<%= mergeLayoutSetBranchURL %>" enctype="multipart/form-data" method="post" name="fm4">
<aui:input name="redirect" type="hidden" value="<%= redirect %>" />
<aui:input name="groupId" type="hidden" value="<%= groupId %>" />
<aui:input name="layoutSetBranchId" type="hidden" value="<%= layoutSetBranchId %>" />
<aui:input name="mergeLayoutSetBranchId" type="hidden" />

<liferay-ui:search-container
id="layoutSetBranchesSearchContainer"
total="<%= layoutSetBranches.size() %>"
>

<%
long curLayoutSetBranchId = curLayoutSetBranch.getLayoutSetBranchId();

String layoutSetBranchDisplayName = layoutSetBranchDisplayContext.getLayoutSetBranchDisplayName(curLayoutSetBranch);
%>

<liferay-ui:search-container-column-text
name="branch"
value="<%= layoutSetBranchDisplayName %>"
<liferay-ui:search-container-results
results="<%= layoutSetBranches %>"
/>

<liferay-ui:search-container-column-text>
<a class="layout-set-branch" data-layoutSetBranchId="<%= curLayoutSetBranchId %>" data-layoutSetBranchMessage="<%= LanguageUtil.format(request, "are-you-sure-you-want-to-merge-changes-from-x", layoutSetBranchDisplayName, false) %>" data-layoutSetBranchName="<%= HtmlUtil.escapeAttribute(curLayoutSetBranch.getName()) %>" href="#" id="<portlet:namespace /><%= curLayoutSetBranchId %>" onClick="<portlet:namespace />selectLayoutSetBranch('<%= curLayoutSetBranchId %>');">
<liferay-ui:message key="select" />
</a>
</liferay-ui:search-container-column-text>
</liferay-ui:search-container-row>

<liferay-ui:search-iterator
markupView="lexicon"
paginate="<%= false %>"
searchContainer="<%= searchContainer %>"
/>
</liferay-ui:search-container>
</aui:form>
<liferay-ui:search-container-row
className="com.liferay.portal.kernel.model.LayoutSetBranch"
escapedModel="<%= true %>"
keyProperty="layoutSetBranchId"
modelVar="curLayoutSetBranch"
>

<%
long curLayoutSetBranchId = curLayoutSetBranch.getLayoutSetBranchId();

String layoutSetBranchDisplayName = layoutSetBranchDisplayContext.getLayoutSetBranchDisplayName(curLayoutSetBranch);
%>

<liferay-ui:search-container-column-text
name="branch"
value="<%= layoutSetBranchDisplayName %>"
/>

<liferay-ui:search-container-column-text>
<a class="layout-set-branch" data-layoutSetBranchId="<%= curLayoutSetBranchId %>" data-layoutSetBranchMessage="<%= LanguageUtil.format(request, "are-you-sure-you-want-to-merge-changes-from-x", layoutSetBranchDisplayName, false) %>" data-layoutSetBranchName="<%= HtmlUtil.escapeAttribute(curLayoutSetBranch.getName()) %>" href="#" id="<portlet:namespace /><%= curLayoutSetBranchId %>" onClick="<portlet:namespace />selectLayoutSetBranch('<%= curLayoutSetBranchId %>');">
<liferay-ui:message key="select" />
</a>
</liferay-ui:search-container-column-text>
</liferay-ui:search-container-row>

<liferay-ui:search-iterator
markupView="lexicon"
paginate="<%= false %>"
searchContainer="<%= searchContainer %>"
/>
</liferay-ui:search-container>
</aui:form>
</div>
</div>

<aui:script>
Expand Down