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-34054 Fix asset tags admin 'merge-tags' dialog #279

Closed
wants to merge 1 commit into from
Closed

LPS-34054 Fix asset tags admin 'merge-tags' dialog #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
82 changes: 0 additions & 82 deletions portal-web/docroot/html/portlet/asset_tag_admin/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,88 +180,6 @@
}
}

.portlet-asset-tag-admin-dialog {
.fieldset {
margin-bottom: 0;
}

.lfr-panel-container {
background-color: transparent;
border-width: 0;
}

.asset-tag-layer .overlay {
overflow: visible;
width: 230px;
}

.yui3-widget-bd {
.asset-tag-layer {
padding: 0 10px;

.field-content {
margin-bottom: 10px;
}

label {
display: block;
font-weight: bold;
}

.field {
input, select {
width: 200px;
}
}

.button-holder {
margin-top: 10px;
}
}
}

.tags-admin-merge-tag {
.arrows-container {
top: 50%;
margin-top: -20px;
}

.selected-tags-container, .target-tags-container {
padding: 0.5em;
}

.selected-tags-list, .target-tags-list {
width: 100%;
}

.tag-move {
display: block;
height: 18px;
position: relative;
top: 30px;
width: 18px;
}

.tag-move-down {
background-image: url(@theme_image_path@/arrows/02_down.png);
margin-top: 0.2em;
}

.tag-move-up {
background-image: url(@theme_image_path@/arrows/02_up.png);
}

.tag-options {
text-align: left;
}

.tags-merge-label {
margin-left: 0.5em;
vertical-align: middle;
}
}
}

.ie {
.portlet-asset-tag-admin {
.tag-item a {
Expand Down
28 changes: 15 additions & 13 deletions portal-web/docroot/html/portlet/asset_tag_admin/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@ AUI.add(

var TPL_TAG_MERGE_BODY = '<div class="container-fluid tags-admin-merge-tag">' +
'<div class="row">' +
'<div class="column span6">' +
'<div class="span6">' +
'<div class="selected-tags-container">' +
'<label for="{namespace}selectedTagsList">' + Liferay.Language.get('tags-to-be-merged') + ':</label>' +
'<select id="{namespace}selectedTagsList" class="selected-tags-list" multiple>' +
'</select>' +
'</div>' +
'<div class="btn-group" id="{namespace}sortSelect">' +
'<button class="btn btn-mini tag-move-up" id="{namespace}tagMoveUp"><i class="icon-chevron-up"></i></button>' +
'<button class="btn btn-mini tag-move-down" id="{namespace}tagMoveDown"><i class="icon-chevron-down"></i></button>' +
'</div>' +
'</div>' +
'<div class="span1" id="{namespace}sortSelect">' +
'<button class="tag-move tag-move-up" id="{namespace}tagMoveUp"></button>' +
'<button class="tag-move tag-move-down" id="{namespace}tagMoveDown"></button>' +
'</div>' +
'<div class="column span6">' +
'<div class="span6">' +
'<div class="target-tags-container">' +
'<label class="tags-label" for="{namespace}targetTagsList">' + Liferay.Language.get('target-tag') + ':</label>' +
'<select id="{namespace}targetTagsList" class="target-tags-list">' +
Expand All @@ -75,16 +75,18 @@ AUI.add(

var TPL_TAG_MERGE_FOOTER =
'<div class="container-fluid tags-admin-merge-tag">' +
'<div class="row">' +
'<div class="row-fluid">' +
'<div class="span7">' +
'<div class="tag-options">' +
'<input id="{namespace}mergeOnlySelectedTags" type="checkbox">' +
'<label class="tags-merge-label" for="{namespace}mergeOnlySelectedTags">' + Liferay.Language.get('merge-only-selected-tags') + '</label>' + '<br>' +
'<input checked id="{namespace}overrideProperties" type="checkbox">' +
'<label class="tags-merge-label" for="{namespace}overrideProperties">' + Liferay.Language.get('override-tags-properties') + '</label>' +
'<div class="tag-options pull-left">' +
'<label class="checkbox">' +
'<input id="{namespace}mergeOnlySelectedTags" type="checkbox">' + Liferay.Language.get('merge-only-selected-tags') +
'</label>' +
'<label class="checkbox">' +
'<input checked id="{namespace}overrideProperties" type="checkbox">' + Liferay.Language.get('override-tags-properties') +
'</label>' +
'</div>' +
'</div>' +
'<div class="column span5">' +
'<div class="span5">' +
'<div id="{namespace}buttonsContainer"></div>' +
'</div>' +
'</div>' +
Expand Down