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-34440 New Add Content/Apps #10704

Closed
wants to merge 13 commits into from
Closed

LPS-34440 New Add Content/Apps #10704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e6521c5
LPS-34440 Convert the Add Application part to using panels rather tha…
ealonso Apr 17, 2013
1f93bb2
LPS-34443 Refactor and rewrite incremental search for applications
ealonso Apr 17, 2013
f28c177
LPS-34443 Move add portlet from layout_configuration to dockbar_add_c…
ealonso Apr 17, 2013
29230c6
LPS-34443 Create vars for duplicated strings
ealonso Apr 17, 2013
fe12446
LPS-34440 Move drag and drop from layout_configuration to dockbar_add…
ealonso Apr 17, 2013
c861369
LPS-34440 Add a new 'add' button to add content or portlets directly …
ealonso Apr 22, 2013
e0851e1
LPS-34440 Use the same method to add contents and add applications in js
ealonso Apr 22, 2013
43ffb2e
LPS-34440 - Source formatting
ipeychev Apr 23, 2013
084ed30
LPS-34441 - Fix Drag&Drop on descriptive and list view
ipeychev Apr 23, 2013
c004723
LPS-34440 - Source formatting
ealonso Apr 23, 2013
1f3c4c5
LPS-34440 Persist state in panels after search
ealonso Apr 23, 2013
b88f99d
LPS-34440 Split AddContent in AddContentSearch, AddContentPreview and…
ealonso Apr 26, 2013
bb42b15
LPS-34440 - Source formatting
natecavanaugh Apr 29, 2013
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
1 change: 0 additions & 1 deletion portal-impl/src/portal.properties
View file
Open in desktop
Expand Up @@ -1583,7 +1583,6 @@
\
liferay/address.js,\
liferay/dockbar.js,\
liferay/layout_configuration.js,\
liferay/layout_exporter.js,\
liferay/session.js,\
\
Expand Down
162 changes: 76 additions & 86 deletions portal-web/docroot/html/css/portal/add_content.css
View file
Open in desktop
Expand Up @@ -64,11 +64,16 @@

.lfr-content-category {
margin: 0;
padding: 4px 0;

.lfr-portlet-item {
padding-bottom: 1px;
padding-top: 1px;
margin-left: 0;
padding-bottom: 3px;
padding-left: 30px;
padding-top: 3px;

&.lfr-archived-setup {
padding-left: 40px;
}

p {
padding-left: 2em;
Expand All @@ -77,6 +82,7 @@
}

.lfr-title-category {
border-top: 1px solid transparent;
padding: 7px 6px 6px 2em;
}
}
Expand All @@ -97,6 +103,41 @@
width: 16px;
}

.content-item {
&:hover {
.add-content-item {
display: inline;

&.lfr-portlet-used {
display: none;
}
}
}

&.display-style-icon {
float: left;
}

.add-content-item {
cursor: pointer;
display: none;
padding: 7px 5px;
position: absolute;
right: 0;
z-index: 1;
}

.app-view-entry {
cursor: move;

&.lfr-portlet-used {
&, .taglib-text {
cursor: default;
}
}
}
}

.search-panel {
padding: 5px;
overflow: hidden;
Expand Down Expand Up @@ -148,6 +189,7 @@
}

.lfr-panel-titlebar {
border-top: 1px solid transparent;
cursor: pointer;
margin-bottom: 0;
padding: 7px 6px 6px;
Expand Down Expand Up @@ -175,7 +217,7 @@
width: 145px;
}

&.display-list a {
&.display-list {
padding: 5px 8px 5px 20px;
}

Expand Down Expand Up @@ -207,33 +249,9 @@
margin-bottom: 8px;
}

.portal-add-content {
.lfr-portlet-used {
cursor: default;
}

.portlet-msg-info {
margin-bottom: 0;
margin-top: 10px;
}

.lfr-portlet-used a {
display: none;
}
}

.lfr-add-content {
margin-bottom: 0.5em;

h2 {
cursor: pointer;
margin: 0;

a {
display: block;
padding-left: 20px;
}
}
.portal-add-content .portlet-msg-info {
margin-bottom: 0;
margin-top: 10px;
}

.lfr-install-more {
Expand Down Expand Up @@ -302,30 +320,34 @@

.add-application-tab {
.lfr-add-content {
h2 a {
color: #2D2D2D;
font-size: 13px;
}

.lfr-content-category {
background: url("@theme_image_path@/common/shadow_top_bg.png") repeat-x 0 0;
background: url(@theme_image_path@/common/shadow_top_bg.png) repeat-x 0 0;

.lfr-portlet-item {
background-position: 2em 50%;
background-position: 3px 50%;
color: #2D2D2D;
font-size: 12px;

p a {
.taglib-text {
color: #2D2D2D;
font-size: 10px;
font-weight: normal;
}

&.lfr-portlet-used {
.taglib-text {
color: #CCC;
}
}

&:hover, &.over {
background-color: #EBF0F5;
text-decoration: underline;
}

&.lfr-archived-setup {
background-position: 22px 50%;
}

&.lfr-portlet-used:hover, &.lfr-portlet-used.over {
background-color: #D3DBE4;
text-decoration: none;
Expand All @@ -338,7 +360,7 @@
}

.lfr-title-category {
border-top: 1px solid #F0F1F2;
border-top-color: #F0F1F2;
}
}
}
Expand All @@ -349,6 +371,11 @@
font-size: 0;
}

.content-item .add-content-item {
font-size: 10px;
font-weight: bold;
}

.search-panel {
background: #D3DBE4 url(@theme_image_path@/common/shadow_bottom_bg.png) repeat-x 0 100%;

Expand Down Expand Up @@ -405,7 +432,7 @@
border-color: #979798 #FAFAFB #FAFAFB #BDBDBE;

.lfr-panel-titlebar {
border-top: 1px solid #F0F1F2;
border-top-color: #F0F1F2;

.lfr-panel-title {
font-size: 13px;
Expand All @@ -417,13 +444,6 @@
background: url(@theme_image_path@/common/shadow_top_bg.png) repeat-x 0 0;

.app-view-entry-taglib.entry-display-style {
a {
color: #2D2D2D;
font-size: 12px;
font-weight: normal;
text-decoration: none;
}

&.aui-focus {
text-shadow: 0 0;
}
Expand All @@ -445,51 +465,21 @@
}

.taglib-text {
font-size: 12px;
font-weight: normal;
text-decoration: none;
}
}
}
}
}

.portal-add-content {
.lfr-portlet-used {
color: #ccc;
}

.portlet-msg-info {
color: #333;
}
}

.lfr-add-content {
h2 {
font-size: 1.1em;
font-weight: bold;

a {
background: url(@theme_image_path@/add_content/portlet_category.png) no-repeat 0 50%;
}
}

&, .lfr-add-content {
&.collapsed h2 {
background: url(@theme_image_path@/arrows/01_plus.png) no-repeat 100% 50%;
border-width: 0;
}

&.expanded h2 {
background: url(@theme_image_path@/arrows/01_minus.png) no-repeat 100% 50%;
}
}
}

.lfr-add-content-search .aui-field-label {
font-weight: normal;
.portal-add-content .portlet-msg-info {
color: #333;
}

.lfr-install-more {
border-top-color: #ccc;
border-top-color: #CCC;

a {
background: url(@theme_image_path@/common/install_more.png) no-repeat 0 50%;
Expand All @@ -498,6 +488,6 @@
}

.lfr-content-category.visible {
border-bottom-color: #ddd;
border-top-color: #ddd;
border-bottom-color: #DDD;
border-top-color: #DDD;
}