Skip to content
This repository has been archived by the owner on Jan 15, 2022. It is now read-only.

Fix/4.0.x/ui 2828 #366

Open
wants to merge 2 commits into
base: stable/4.0.x
Choose a base branch
from
Open

Fix/4.0.x/ui 2828 #366

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
e788351
UI-2828 [PLF 4] Calendar Gadget - Configure Mode
JN88 Aug 30, 2013
065baef
UI-2828 [PLF 4] Calendar Gadget - Configure Mode: change uiIconAdd …
JN88 Aug 30, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ets/src/main/java/org/exoplatform/platform/portlet/juzu/calendar/templates/settings.gtmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</div>
<div class= "uiContentBox " >
<p>&{display.additional.calendar.label}</p>
<input type="text" class="PLFcalendarSearchKey" value="&{search.calendar.label}"/>
<input type="text" class="PLFcalendarSearchKey" placeholder="&{search.calendar.label}"/>
<ul id="nonDisplayedCalendarContainer" class="calendarItems NonDisplayedCalendar">
<% if (nonDisplayedCalendar != null) {
nonDisplayedCalendar.each { cal ->
Expand All @@ -51,7 +51,7 @@
<li id="${cal.id}" class="calendarItem clearfix" title="${calendarName}">
<a href="javascript:void(0);" class="addButton pull-right" style="display: none;" data-placement="bottom" rel="tooltip" data-original-title="add">
<input type="hidden" name="calendarId" value="${cal.id}"/>
<i class="uiIconAdd "></i>
<i class="uiIconSimplePlusMini uiIconLightGray"></i>
</a>
<a class="${cal.calendarColor} colorBox pull-left" href="javascript:void(0);"></a>
<a href="javascript:void(0);" class="calName" data-original-title="${calendarName}" data-placement="bottom" rel="tooltip">${calendarName}</a>
Expand Down
7 changes: 4 additions & 3 deletions extension/portlets/homepagePortlets/src/main/webapp/skin/less/calendar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
background-color: #FFE347;
}

.plum_purple {
.plum_purple, .plum {
background-color: #CEA6AC;
}

Expand All @@ -237,10 +237,10 @@
}
.uiIconDel {
.square(14px);
background: url(/homepage-portlets/style/images/calendar/del.png) no-repeat 2px 2px;
background: url(/homepage-portlets/style/images/calendar/del.png) no-repeat 2px center;
cursor:pointer;
&:hover {
background-position: -13px 2px;
background-position: -13px center;
}
}
}
Expand All @@ -249,6 +249,7 @@
}
.PLFcalendarSearchKey {
width: 100%;
.placeholder(#999);
}
.settingValidationButton {
text-align: right;
Expand Down