From e788351663797d6bf50c9f65e10552f2fc68f71e Mon Sep 17 00:00:00 2001
From: giangnt <giangnt@exoplatform.com>
Date: Fri, 30 Aug 2013 11:34:41 +0700
Subject: [PATCH 1/2] UI-2828  [PLF 4] Calendar Gadget - Configure Mode

---
 .../portlet/juzu/calendar/templates/settings.gtmpl         | 2 +-
 .../src/main/webapp/skin/less/calendar.less                | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/extension/portlets/homepagePortlets/src/main/java/org/exoplatform/platform/portlet/juzu/calendar/templates/settings.gtmpl b/extension/portlets/homepagePortlets/src/main/java/org/exoplatform/platform/portlet/juzu/calendar/templates/settings.gtmpl
index c3a290be7f..207b9b3bf2 100644
--- a/extension/portlets/homepagePortlets/src/main/java/org/exoplatform/platform/portlet/juzu/calendar/templates/settings.gtmpl
+++ b/extension/portlets/homepagePortlets/src/main/java/org/exoplatform/platform/portlet/juzu/calendar/templates/settings.gtmpl
@@ -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 ->
diff --git a/extension/portlets/homepagePortlets/src/main/webapp/skin/less/calendar.less b/extension/portlets/homepagePortlets/src/main/webapp/skin/less/calendar.less
index 35d1027c7a..901d015138 100644
--- a/extension/portlets/homepagePortlets/src/main/webapp/skin/less/calendar.less
+++ b/extension/portlets/homepagePortlets/src/main/webapp/skin/less/calendar.less
@@ -217,7 +217,7 @@
     background-color: #FFE347;
 }
 
-.plum_purple {
+.plum_purple, .plum {
     background-color: #CEA6AC;
 }
 
@@ -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;
 			}
 		}
 	}	
@@ -249,6 +249,7 @@
 	}
 	.PLFcalendarSearchKey {
 		width: 100%;
+		.placeholder(#999);
 	}
 	.settingValidationButton  {
 		text-align: right;

From 065baef62de2ddb3cf7a617eea22ae948daacad3 Mon Sep 17 00:00:00 2001
From: giangnt <giangnt@exoplatform.com>
Date: Fri, 30 Aug 2013 11:41:59 +0700
Subject: [PATCH 2/2] UI-2828  [PLF 4] Calendar Gadget - Configure Mode: change
 uiIconAdd  to uiIconSimplePlusMini

---
 .../platform/portlet/juzu/calendar/templates/settings.gtmpl     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/portlets/homepagePortlets/src/main/java/org/exoplatform/platform/portlet/juzu/calendar/templates/settings.gtmpl b/extension/portlets/homepagePortlets/src/main/java/org/exoplatform/platform/portlet/juzu/calendar/templates/settings.gtmpl
index 207b9b3bf2..9fe1d45e55 100644
--- a/extension/portlets/homepagePortlets/src/main/java/org/exoplatform/platform/portlet/juzu/calendar/templates/settings.gtmpl
+++ b/extension/portlets/homepagePortlets/src/main/java/org/exoplatform/platform/portlet/juzu/calendar/templates/settings.gtmpl
@@ -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>