Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/css/layout.css
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/css/layout.css	(revision 6876)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/css/layout.css	(revision 6881)
@@ -226,4 +226,12 @@
 
 .new-event-win ul.attendee-permissions-list, li.attendee-permissions-list, .new-task-win ul.attendee-permissions-list{text-align: left;}
+.new-activity-win.active {
+	 width:700px;height:510px;text-align:left;
+}
+
+.new-activity-win > .content.ui-tabs.ui-widget-content {
+	border: none;
+}
+.new-activity-win ul.attendee-permissions-list, li.attendee-permissions-list{text-align: left;}
 
 li.attendee-permissions-list input{width: 20px !important; margin: 3px 0 0 0 !important;}
@@ -244,30 +252,36 @@
 .new-task-win fieldset.block-add-attendee .add-attendee-search input { max-width: 290px; width: 290px; padding: 0 0 0 7px;}
 
-
-fieldset.block-add-attendee .search-result-list { width: 255px; max-height: 215px; overflow: auto;}
-fieldset.block-add-attendee .search-result-list .ui-widget-content { border: none;}
-fieldset.block-add-attendee .search-result-list .empty { margin-left: 5px; }
+.new-activity-win .menu-addevent { 	text-align: right; }
+fieldset.block-add-attendee .add-attendee-search, fieldset.block-add-activity .add-activity-search { max-width: 250px; margin: 5px;}
+fieldset.block-add-attendee .add-attendee-search input, fieldset.block-add-activity .add-activity-search input { max-width: 220px; width: 220px; padding: 0 0 0 7px;}
+fieldset.block-add-attendee .search-result-list, fieldset.block-add-activity .search-result-list { width: 255px; max-height: 215px; overflow: auto;}
+fieldset.block-add-attendee .search-result-list .ui-widget-content, fieldset.block-add-activity .search-result-list .ui-widget-content { border: none;}
+fieldset.block-add-attendee .search-result-list .empty, fieldset.block-add-activity .search-result-list .empty { margin-left: 5px; }
 fieldset.block-add-user .add-user-search {max-width: 235px;}
 fieldset.block-add-user .search-result-list {max-width: 245px;} 
-fieldset.block-add-user .search-result-list .ui-widget-content {max-width: 245px;}
-
-.block-attendee-list, .block-add-attendee { float:left;}
+fieldset.block-add-user .search-result-list .ui-widget-content, fieldset.block-add-user .search-result-list .ui-widget-content {max-width: 245px;}
+
+#calendar_addactivity_details8 .block-attendee-list, #calendar_addactivity_details8 .block-activity-list { width:430px; margin-right: 5px; }
+
+.block-attendee-list, .block-activity-list, .block-add-activity { float:left;}
 .block-attendee-list { width:400px; margin-right: 5px; }
 .new-event-win .block-add-attendee { width:260px; margin-right: 5px; }
 .new-task-win .block-add-attendee { width:335px; margin-right: 5px; }
-.block-attendee-list dd, .block-add-attendee dd { border: 1px solid #BFBFBF; }
-.block-attendee-list dt, .block-add-attendee dt { background-color:#FFF; margin: 5px 0 -6px 5px; font-weight: bold; display: table;  position: relative;}
+.block-attendee-list dd, .block-add-attendee dd, .block-activity-list dd, .block-add-activity dd { border: 1px solid #BFBFBF; }
+.block-attendee-list dt, .block-add-attendee dt,.block-activity-list dt, .block-add-activity dt { background-color:#FFF; margin: 5px 0 -6px 5px; font-weight: bold; display: table;  position: relative; display: table;}
 .block-attendee-list dd.attendee-list { height: 196px; }
-.block-attendee-list dd.attendee-list ul { max-height: 186px; overflow: auto; margin-top: 10px;}
-.block-attendee-list dd.attendee-list-add {border-top:none !important; border:1px solid #BFBFBF;}
-.block-attendee-list dd.attendee-list-add fieldset.add-attendee-input { border:none !important; margin: 0; padding: 0 }
-.block-attendee-list dd.attendee-list-brief { border:none !important; margin: 5px 0; color:#777; }
-
-dl.block-add-attendee {
+.block-attendee-list dd.attendee-list ul, .block-activity-list dd.task-activity-list ul { max-height: 186px; overflow: auto; margin-top: 10px;}
+.block-attendee-list dd.attendee-list-add, .block-activity-list dd.activity-list-add {border-top:none !important; border:1px solid #BFBFBF;}
+.block-attendee-list dd.attendee-list-add fieldset.add-attendee-input, .block-activity-list dd.activity-list-add fieldset.add-activity-input { border:none !important; margin: 0; padding: 0 }
+.block-attendee-list dd.attendee-list-brief, .block-activity-list dd.activity-list-brief { border:none !important; margin: 5px 0; color:#777; }
+#calendar_addactivity_details8 .block-attendee-list, #calendar_addactivity_details8 .block-activity-list { width:430px; margin-right: 5px; }
+.block-activity-list dd.task-activity-list { height: 292px; }
+
+dl.block-add-attendee, dl.block-add-activity {
 	float: right;
 	display: block;
 }
 
-.new-event-win dl.block-add-attendee dd.add-attendee {
+.new-event-win dl.block-add-attendee dd.add-attendee, dl.block-add-activity dd.add-activity {
 	width: 260px;
 	min-height: 260px;
@@ -281,4 +295,11 @@
 }
 
+#calendar_addactivity_details8 dl.block-add-attendee dd.add-attendee ,#calendar_addactivity_details8 dl.block-add-activity dd.add-activity {
+	width: 260px;
+	min-height: 292px;
+	display: block;
+}
+
+
 ul.attendees-count {clear:left; float:left;}
 .attendees-count li {display: inline;}
@@ -294,4 +315,5 @@
 .attendees-list .me .add-attendee-options-button {position: absolute; top: 171px;}
 .attendees-list .hover-attendee { background-color: #DFEFFC;}
+.task-activity-list .hover-activity { background: #DFEFFC;}
 /*
 .attendees-list .attendee-options-button-edit { position: absolute; top:0; right:25px;}
@@ -301,5 +323,5 @@
 
 .attendee-options{ position: absolute; top: 0; left: 287px; background-color: white; z-index: 100; width: 90px; background-color: #FFF;	padding: 0 20px 0 3px; text-align: right;}
-.attendees-list .not-attendee { height:16px; }
+.attendees-list .not-attendee, .activitys-list .not-activity { height:16px; }
 
 .list-delegates{margin: 0 0 0 25px;}
@@ -308,5 +330,5 @@
 
 .attendees-list .me .add-attendee-search input { max-width: 125px; }
-.attendees-list li.organizer, .attendees-list li.me-delegated  {margin-bottom: 3px;}
+.attendees-list li.organizer, .attendees-list li.me-delegated, .activitys-list li.organizer {margin-bottom: 3px;}
 .attendees-list .organizer .button.swap {
 	float: right;
@@ -350,4 +372,16 @@
 }
 dd.attendee-list ul.attendee-list li label[title=''] { display:none }
+dd.task-activity-list ul.task-activity-list li {
+    overflow: hidden;
+	position: relative;
+}
+
+
+dd.task-activity-list ul.task-activity-list li label.name,
+dd.task-activity-list ul.task-activity-list li label.mail {
+	width: 99999px;
+	min-width: 99999px;
+}
+dd.task-activity-list ul.task-activity-list li label[title=''] { display:none }
 /*
 dd.attendee-list ul.attendee-list li .button.close {
@@ -873,4 +907,8 @@
 .new-task-win fieldset fieldset, .new-task-win fieldset.tab-level2 fieldset{ padding: 5px 0; }
 
+.new-activity-win fieldset { border: none;	margin: 0; padding: 0; }
+.new-activity-win fieldset.tab-level2 { padding: 0px 5px; }
+.new-activity-win fieldset fieldset, .new-activity-win fieldset.tab-level2 fieldset { padding: 5px 0; }
+
 .hidden {
 	display: none;
@@ -915,7 +953,12 @@
 .new-event-win form.form-addevent { padding: 9px; }
 
+.new-activity-win div.div-addtask { padding: 0; width: 774px; border: 0;}
+.new-activity-win div.div-addactivity { padding: 0; width: 734px; border: 0;}
+.new-activity-win form.form-addevent { padding: 9px; }
 .ui-dialog .ui-dialog-content { padding: 0; }
 .new-event-win div.div-addevent, .new-task-win div.div-addtask { padding: 0; width: 700px; border: 0;}
 .new-event-win form.form-addevent, .new-task-win form.form-addtask { padding: 9px; }
+.new-activity-win div.div-addevent { padding: 0; width: 700px; border: 0;}
+.new-activity-win form.form-addevent { padding: 9px; }
 
 .expresso-calendar-container input[type="text"] { height: 18px; }
@@ -940,5 +983,5 @@
 
 .expresso-calendar-container input.h1,
-.new-event-win input.h1, .new-task-win input.h1 {
+.new-event-win input.h1, .new-task-win input.h1, .new-activity-win input.h1 {
 	font-size: 150%;
 	font-weight: bold;
@@ -947,5 +990,5 @@
 }
 
-.new-event-win textarea, .new-task-win textarea {
+.new-event-win textarea, .new-task-win textarea, .new-activity-win textarea {
 	width:600px;
 	height: 210px;
@@ -958,4 +1001,6 @@
 .new-event-win p.input-group label, .new-task-win p.input-group label { display: inline-block; width: 65px;}
 .new-event-win p.input-group label.input-group, .new-task-win p.input-group label.input-group { display: inline-block; width: 110px; font-weight: bold;}
+.new-activity-win p.input-group label { display: inline-block; width: 65px;}
+.new-activity-win p.input-group label.input-group { display: inline-block; width: 110px; font-weight: bold;}
 
 input.number {text-align: right}
@@ -999,4 +1044,20 @@
 .new-event-win fieldset.block-attendee-list, .new-task-win fieldset.block-attendee-list { width: 300px; max-height:180px; padding: 5px; float: left;}
 .new-event-win fieldset.block-attendee-list ul, .new-task-win fieldset.block-attendee-list ul {  height:160px; overflow: auto;}
+/**/
+.new-activity-win fieldset.event-repeat-container label, 
+.new-activity-win p.input-group.event-repeat-weekly label, 
+.new-activity-win p.input-group.event-repeat-monthly label {
+	width: auto; 
+}
+
+.new-activity-win fieldset.input-field-rounded,
+.new-activity-win fieldset.search-field,
+.new-activity-win fieldset.block-add-attendee-permissions,
+.new-activity-win fieldset.block-attendee-list {
+	border:1px solid #CFCFCF;
+}
+
+.new-activity-win fieldset.block-attendee-list { width: 300px; max-height:180px; padding: 5px; float: left;}
+.new-activity-win fieldset.block-attendee-list ul {  height:160px; overflow: auto;}
 
 
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/css/style.css
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/css/style.css	(revision 6876)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/css/style.css	(revision 6881)
@@ -51,4 +51,12 @@
 .new-event-win fieldset#calendar_addevent_details5 .button-files-upload, .new-task-win fieldset#calendar_addevent_details5 .button-files-upload{margin: 15px 0 0 0}
 .new-event-win fieldset fieldset, .new-event-win fieldset.tab-level2 fieldset, .new-task-win fieldset fieldset, .new-event-win fieldset.tab-level2 fieldset { padding: 5px 0; }
+
+.new-activity-win fieldset { border: none; margin: 0; padding: 0; }
+.new-activity-win fieldset.tab-level2 { padding: 0px 5px; min-height: 310px; max-height: 310px; overflow: auto;}
+
+.new-activity-win .overflow_add_calender { overflow: auto; max-height: 320px; }
+.new-activity-win fieldset#calendar_addevent_details7 { overflow: hidden}
+.new-activity-win fieldset#calendar_addevent_details5 .button-files-upload{margin: 15px 0 0 0}
+.new-activity-win fieldset fieldset, .new-activity-win fieldset.tab-level2 fieldset { padding: 5px 0; }
 
 .hidden {
@@ -96,4 +104,7 @@
 .new-event-win form.form-addevent, .new-task-win form.form-addtask { padding: 9px; }
 
+.new-activity-win div.div-addevent { padding: 0; width: 700px; border: 0;}
+.new-activity-win form.form-addevent { padding: 9px; }
+
 .expresso-calendar-container input[type="text"] { height: 18px; }
 .expresso-calendar-container input[type="text"], 
@@ -124,4 +135,10 @@
 	height: 150%;
 }
+.new-activity-win input.h1 {
+  font-size: 150%;
+  font-weight: bold;
+  width: 64%;
+  height: 150%;
+}
 
 .expresso-calendar-container input.h1,
@@ -140,8 +157,16 @@
 }
 
+.new-activity-win textarea {
+  width:600px;
+  height: 210px;
+  border: 1px solid #CFCFCF;
+  padding: 0px;
+}
 span.input-group { display: block; }
 /*p.input-group label { vertical-align: top; }*/
 .new-event-win p.input-group label, .new-task-win p.input-group label { display: inline-block; width: 65px;}
 .new-event-win p.input-group label.input-group, .new-task-win p.input-group label.input-group { display: inline-block; width: 110px; font-weight: bold;}
+.new-activity-win p.input-group label { display: inline-block; width: 65px;}
+.new-activity-win p.input-group label.input-group { display: inline-block; width: 110px; font-weight: bold;}
 
 input.number {text-align: right}
@@ -169,4 +194,10 @@
 {
 	width: auto; 
+}
+
+.new-activity-win fieldset.event-repeat-container label, 
+.new-activity-win p.input-group.event-repeat-weekly label, 
+.new-activity-win p.input-group.event-repeat-monthly label {
+  width: auto; 
 }
 
@@ -185,4 +216,17 @@
 .new-event-win fieldset.block-attendee-list ul, .new-task-win fieldset.block-attendee-list ul {  height:160px; overflow: auto;}
 
+.new-activity-win fieldset.input-field-rounded,
+.new-activity-win fieldset.search-field,
+.new-activity-win fieldset.block-add-attendee-permissions,
+.new-activity-win fieldset.block-attendee-list {
+  border:1px solid #CFCFCF;
+}
+/*Duvida*/
+.new-event-win fieldset.block-attendee-list { width: 300px; max-height:180px; padding: 5px; float: left;}
+.new-event-win fieldset.block-attendee-list ul {  height:160px; overflow: auto;}
+
+.new-activity-win fieldset.block-attendee-list { width: 300px; max-height:180px; padding: 5px; float: left;}
+.new-activity-win fieldset.block-attendee-list ul {  height:160px; overflow: auto;}
+
 
 /* # add attendee */
@@ -503,5 +547,5 @@
 .div-addtask #calendar_addtask_details1 .end-time{ width: 40px; }
 .div-addtask #calendar_addtask_details1 .end-date{ width: 80px; }
-.div-addtask #calendar_addtask_details1 .previsao-termino { margin: 0 0 0 5px; }
+.div-addtask #calendar_addtask_details1 .previsao-termino { margin: 0 0 0 50px; }
 .div-addtask #calendar_addtask_details1 .subitem { margin: 5px; display: block;}
 .div-addtask #calendar_addtask_details1 .subitem .span_done{ margin: 0 30px;}
@@ -510,7 +554,7 @@
 
 
-.div-addtask  #calendar_addtask_details8 .parent {width: 725px; min-height: 278px; float: left;}
+.div-addtask  #calendar_addtask_details8 .parent {width: 715px; min-height: 208px; float: left;}
 .div-addtask  #calendar_addtask_details8 .parent .child-top {width: 745px; height: 30px; background: #E8F4FD; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;}
-.div-addtask  #calendar_addtask_details8 .parent .child-bottom {width: 745px; height: 278px; overflow: auto;  float: left; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;}
+.div-addtask  #calendar_addtask_details8 .parent .child-bottom {width: 745px; height: 208px; overflow: auto;  float: left; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;}
 .div-addtask  #calendar_addtask_details8 .parent .child-bottom .child-bottom-each { height: 30px; }
 .div-addtask  #calendar_addtask_details8 .parent .child-bottom .child-bottom-each:hover { background: #FFF2F2; cursor: pointer;}
@@ -527,2 +571,39 @@
 .div-addtask  #calendar_addtask_details8 .parent .child-top .organization { width: 70%; float: left; background: #E8F4FD; height: 30px; border-left: 1px solid #CCC; font-weight: bold; color: #2E6E9E; }
 .div-addtask  #calendar_addtask_details8 .parent .child-top .organization span{margin: 8px; float: left; }
+/*Atividades*/
+
+.div-addactivity #calendar_addactivity_details5 .button-files-upload { margin: 0 0 0 5px; }
+.div-addactivity #calendar_addactivity_details1 .h1{ width: 100%;}
+.div-addactivity #calendar_addactivity_details2 textarea { width: 635px; }
+.div-addactivity{ width: 734px;}
+.div-addactivity #calendar_addactivity_details1 .time-previsao { width: 40px; }
+.div-addactivity #calendar_addactivity_details1 .date-previsao{ width: 80px; }
+
+.div-addactivity #calendar_addactivity_details1 .start-time{ width: 40px; }
+.div-addactivity #calendar_addaActivity_details1 .start-date{ width: 80px; }
+.div-addactivity #calendar_addactivity_details1 .end-time{ width: 40px; }
+.div-addactivity #calendar_addactivity_details1 .end-date{ width: 80px; }
+.div-addactivity #calendar_addactivity_details1 .previsao-termino { margin: 0 0 0 50px; }
+.div-addactivity #calendar_addactivity_details1 .subitem { margin: 5px; display: block;}
+.div-addactivity #calendar_addactivity_details1 .subitem .span_done{ margin: 0 30px;}
+.div-addactivity #calendar_addactivity_details1 .calendar_addevent_details_lnk_timezone { margin: 0 0 0 20px;}
+.div-addactivity #calendar_addactivity_details1 .subitem .done { width: 45px;}
+
+
+.div-addactivity  #calendar_addactivity_details6 .parent {width: 680px; min-height: 268px; float: left;}
+.div-addactivity  #calendar_addactivity_details6 .parent .child-top {width: 690px; height: 30px; background: #E8F4FD; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;}
+.div-addactivity  #calendar_addactivity_details6 .parent .child-bottom {width: 690px; height: 220px; overflow: auto;  float: left; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;}
+.div-addactivity  #calendar_addactivity_details6 .parent .child-bottom .child-bottom-each { height: 30px; }
+.div-addactivity  #calendar_addactivity_details6 .parent .child-bottom .child-bottom-each:hover { background: #FFF2F2; cursor: pointer;}
+
+
+.div-addactivity  #calendar_addactivity_details6 .parent .child-bottom .child-bottom-each .date-hour { width: 30%; float: left; height: 30px}
+.div-addactivity  #calendar_addactivity_details6 .parent .child-bottom .child-bottom-each .date-hour span { margin: 8px; float: left; }
+.div-addactivity  #calendar_addactivity_details6 .parent .child-bottom .child-bottom-each .organization{ width: 69%; float: left;  height: 30px; border-left: 1px solid #CCC; }
+.div-addactivity  #calendar_addactivity_details6 .parent .child-bottom .child-bottom-each .organization span{ margin: 8px; float: left; }
+
+
+.div-addactivity  #calendar_addactivity_details6 .parent .child-top .date-hour { width: 29%; float: left; background: #E8F4FD; height: 30px; }
+.div-addactivity  #calendar_addactivity_details6 .parent .child-top .date-hour span{ margin: 8px; float: left; font-weight: bold; color: #2E6E9E; }
+.div-addactivity  #calendar_addactivity_details6 .parent .child-top .organization { width: 70%; float: left; background: #E8F4FD; height: 30px; border-left: 1px solid #CCC; font-weight: bold; color: #2E6E9E; }
+.div-addactivity  #calendar_addactivity_details6 .parent .child-top .organization span{margin: 8px; float: left; }
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/js/activity.helpers.js
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/js/activity.helpers.js	(revision 6881)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/js/activity.helpers.js	(revision 6881)
@@ -0,0 +1,816 @@
+function activityDetails( objEvent, decoded, path, isMail, repeat){
+
+
+    attendees = {};
+	
+    if(path == undefined)
+	path = "";
+		
+    if( !decoded )
+	objEvent = DataLayer.decode( "schedulable:calendar", objEvent );
+
+    if(!isMail)
+	objEvent = DataLayer.encode( "schedulable:preview", objEvent );
+	
+    if(typeof(objEvent.id) == 'undefined'){
+		objEvent.alarms = Calendar.signatureOf[User.preferences.defaultCalendar || Calendar.calendarIds[0]].defaultAlarms || false;
+		objEvent.useAlarmDefault = 1;
+		//Código provisório ... Mockup
+		objEvent.alarms.taskActivity = {};
+    }
+	
+    /**
+	 * canDiscardEventDialog deve ser true se não houver alterações no evento
+	 */
+    canDiscardEventDialog = true;
+    /**
+	 * zebraDiscardEventDialog é uma flag indicando que uma janela de confirmação (Zebra_Dialog)
+	 * já está aberta na tela, uma vez que não é possivel acessar o evento ESC utilizado para fechá-la
+	 */
+    zebraDiscardEventDialog = false;
+	
+    /**
+		ACLs do participant
+	*/
+    acl_names = {
+	'w': 'acl-white',
+	'i': 'acl-invite-guests',
+	'p': 'acl-participation-required'
+    };
+
+
+var callbackAttendee = function(){
+	//Cria qtip de permissões pelo click do checkbox
+	var checked = false;
+	blkAddAtendee.find("li.not-activity").addClass('hidden');
+	
+	blkAddAtendee.find("li .button").filter(".close.new").button({
+	    icons: {
+		primary: "ui-icon-close"
+	    },
+	    text: false
+	}).click(function () {
+	    DataLayer.remove('participant', $(this).parents('li').find('[type=checkbox]').val());
+	    if($(this).parent().find('.button.delegate').hasClass('activity-permissions-change-button')){
+		removeOthers();
+		blkAddAtendee.find('.request-update').addClass('hidden');
+		blkAddAtendee.find('.status option').toggleClass('hidden');
+				
+		blkAddAtendee.find('option[value=1]').attr('selected','selected').trigger('change');
+	    }
+			
+	    $(this).parents('li').remove();
+			
+	    if(blkAddAtendee.find(".activity-list li").length == 1)
+		blkAddAtendee.find("li.not-activity").removeClass('hidden');
+	})
+	.addClass('tiny disable ui-button-disabled ui-state-disabled')
+	.removeClass('new').end()
+	
+	.filter(".delegate.new").button({
+	    icons: {
+		primary: "ui-icon-transferthick-e-w"
+	    },
+	    text: false
+	}).click(function () {
+	    var me = $(this).parents('li');
+	    if($(this).hasClass('activity-permissions-change-button')){
+		$(this).removeClass('activity-permissions-change-button')   
+		    .find('.ui-icon-transferthick-e-w').removeClass('activity-permissions-change').end();               
+		
+		me.find('input[name="delegatedFrom[]"]').val('');
+		dependsDelegate(me, true);
+				
+		blkAddAtendee.find('.request-update').addClass('hidden');
+		blkAddAtendee.find('.status option').toggleClass('hidden');
+
+		blkAddAtendee.find('option[value=1]').attr('selected','selected').trigger('change');
+				
+	    }else{
+		removeOthers();
+			
+		$(this).addClass('activity-permissions-change-button')   
+		.find('.ui-icon-transferthick-e-w').addClass('activity-permissions-change').end();               
+		
+		me.find('input[name="delegatedFrom[]"]').val(blkAddAtendee.find('.me input[name="attendee[]"]').val());
+		
+		dependsDelegate(me, false);
+			
+		blkAddAtendee.find('.request-update').removeClass('hidden');
+		if(blkAddAtendee.find('.status option.hidden').length == 1)
+		    blkAddAtendee.find('.status option').toggleClass('hidden');
+			
+		blkAddAtendee.find('option[value=5]').attr('selected','selected').trigger('change');
+	    }
+	})
+	.addClass('tiny disable ui-button-disabled ui-state-disabled')
+	.removeClass('new').end()
+		
+	.filter(".edit.new").button({
+	    icons: {
+		primary: "ui-icon-notice"
+	    },
+	    text: false
+	}).click(function() {
+
+		console.log($(this).parents("li").position().top);
+
+		var positionY = $(this).parents("li").offset().top;
+
+	    if(!!!checked)
+		$(this).parents('li').find('[type=checkbox]').attr('checked', (!$(this).parent().find('[type=checkbox]').is(':checked'))).end();
+		
+		var name = $(this).parents('li').find("div").find(".name").text();
+		var email = $(this).parents('li').find("div").find(".mail").text()
+	    //var aclsParticipant =  $(this).parents('li')
+	    checked = false;
+			
+	    if( $('.qtip.qtip-blue.qtip-active').val() !== ''){
+		$(this).qtip({
+		    show: {
+		    ready: true, 
+	   		solo: true, 
+	    when: {
+		    event: 'click'
+		    }
+		},
+		hide: false,
+		content: {
+				text: $('<div></div>').html( DataLayer.render( path + 'templates/activity_information_task.ejs', {
+					'name' : name
+				} ) ), 
+				title: {
+					text:'Informações', 
+					button: '<a class="button close" href="#">close</a>'
+				}
+		},
+		style: {
+		name: 'blue', 
+		    tip: {
+				corner: 'leftMiddle'
+			}, 
+		    border: {
+				width: 4, 
+			    radius: 8
+			}, 
+		    width: {
+				min: 230, 
+			    max:230
+			}
+	    },
+	    position: {
+	    corner: {
+	    target: 'rightMiddle',
+	    tooltip: 'leftMiddle'
+	    },
+	    adjust: {
+		    x: 30, 
+		    y: 0
+	    }
+	    }
+	    })
+	.qtip("api").onShow = function(arg0) {
+	    $('.qtip-active .button.close').button({
+		icons: {
+		    primary: "ui-icon-close"
+		},
+		text: false
+	    })
+	    .click(function(){
+		blkAddAtendee.find('dd.task-activity-list').qtip('destroy');
+	    });
+					
+	    $('.qtip-active .button.save').button().click(function(){
+						
+		var acl = '';
+		$('.qtip-active').find('[type=checkbox]:checked').each(function(i, obj) {
+		    acl+= obj.value;
+		});
+
+		blkAddAtendee.find('dd.task-activity-list [type=checkbox]:checked').siblings('input[name="attendeeAcl[]"]').each(function(i, obj) { 
+		    obj.value = 'r'+acl;
+		}).parents('li').find('.button.edit').addClass('activity-permissions-change-button')   
+		.find('.ui-icon-key').addClass('activity-permissions-change');               
+						
+		blkAddAtendee.find('dd.task-activity-list [type=checkbox]').attr('checked', false);
+						
+		blkAddAtendee.find('dd.task-activity-list').qtip('destroy');
+					
+	    });
+	    $('.qtip-active .button.cancel').button().click(function(){
+		blkAddAtendee.find('dd.activity-list [type=checkbox]').attr('checked', false);
+		blkAddAtendee.find('dd.activity-list').qtip('destroy');
+	    });
+					
+	    if(aclsParticipant)
+		for(var i = 1; i < aclsParticipant.length; i++){
+		    $('.qtip-active').find('input[name="'+acl_names[aclsParticipant.charAt(i)]+'"]').attr('checked', true);
+		}
+							
+	    $('.qtip .button').button();
+					
+	};
+	}else{
+	    if(!$('.new-activity-win dd.task-activity-list').find('[type=checkbox]:checked').length){
+		blkAddAtendee.find('dd.attendee-list').qtip('destroy');
+	    }else{
+		$('.qtip-active .button.save .ui-button-text').html('Aplicar a todos')
+	    }
+			
+	};			
+    })
+.addClass('tiny disable ui-button-disabled ui-state-disabled')
+.removeClass('new').end()
+		
+.filter(".open-delegate.new").click(function(){
+    if($(this).hasClass('ui-icon-triangle-1-e')){
+	$(this).removeClass('ui-icon-triangle-1-e').addClass('ui-icon-triangle-1-s');
+	$(this).parents('li').find('.list-delegates').removeClass('hidden');
+    }else{
+	$(this).removeClass('ui-icon-triangle-1-s').addClass('ui-icon-triangle-1-e');
+	$(this).parents('li').find('.list-delegates').addClass('hidden');
+    }
+		
+}).removeClass('new');
+	
+	
+blkAddAtendee.find("li input[type=checkbox].new").click(function(){
+    if(!$('.new-activity-win dd.task-activity-list').find('[type=checkbox]:checked').length){
+	blkAddAtendee.find('dd.task-activity-list').qtip('destroy');
+    }else{
+	checked = true;
+	$(this).parents('li').find('.button.edit').click();
+    }
+}).removeClass('new');
+	
+UI.dialogs.addActivity.find('.task-activity-list li').hover(
+    function () {
+	$(this).addClass("hover-activity");
+	$(this).find('.button').removeClass('disable ui-button-disabled ui-state-disabled').end()
+	.find('.activity-options').addClass('hover-activity');
+    },
+    function () {
+	$(this).removeClass("hover-activity");
+	$(this).find('.button').addClass('disable ui-button-disabled ui-state-disabled').end()
+	.find('.activity-options').removeClass('hover-activity');;
+    }
+    );
+	
+}
+    var dependsDelegate = function(reference, inverse){
+	if(inverse){
+	    if(reference.find('input[name="attendee[]"]').val() == blkAddAtendee.find('li.organizer input[name="attendee_organizer"]').val())
+		blkAddAtendee.find('li.organizer input[name="attendee_organizer"]').val(blkAddAtendee.find('.me input[name="attendee[]"]').val());
+	}else{
+	    if(blkAddAtendee.find('.me input[name="attendee[]"]').val() == blkAddAtendee.find('li.organizer input[name="attendee_organizer"]').val())
+		blkAddAtendee.find('li.organizer input[name="attendee_organizer"]').val(reference.find('input[name="attendee[]"]').val());
+	}
+	
+    };
+    
+    var removeOthers = function(){
+	var other = blkAddAtendee.find('.delegate.attendee-permissions-change-button');
+	if(other.lenght){
+	    dependsDelegate(other.parents('li'), true);
+	}
+	blkAddAtendee.find('.delegate').removeClass('attendee-permissions-change-button');
+	blkAddAtendee.find('.ui-icon-transferthick-e-w').removeClass('attendee-permissions-change');
+	
+    };
+	
+	var html = DataLayer.render( path+'templates/activity_add.ejs', {
+	    event:objEvent
+	});	
+			
+	if (!UI.dialogs.addActivity) {
+
+	    UI.dialogs.addActivity = jQuery('#sandbox').append('<div title="Criar Atividade" class="new-activity-win active"> <div>').find('.new-activity-win.active').html(html).dialog({
+		resizable: false, 
+		modal:true, 
+		autoOpen: false,
+		width:734, 
+		position: 'center', 
+		close: function(event, ui) {
+			/**
+			 * Remove tooltip possivelmente existente
+			 */
+			if ($('.qtip.qtip-blue.qtip-active').length)
+				$('.qtip.qtip-blue.qtip-active').qtip('destroy');						
+			attendees  = {};
+		},
+		beforeClose: function(event, ui) {
+		
+		    if (!canDiscardEventDialog && !zebraDiscardEventDialog) {
+			zebraDiscardEventDialog = true;
+			window.setTimeout(function() {
+			    $.Zebra_Dialog('Suas alterações na atividade não foram salvas. Deseja descartar as alterações?', {
+				'type':     'question',
+				'overlay_opacity': '0.5',
+				'buttons':  ['Descartar alterações', 'Continuar editando'],
+				'onClose':  function(clicked) {
+				    if(clicked == 'Descartar alterações') {
+					canDiscardEventDialog = true;
+					/**
+					*Remoção dos anexos do eventos caso seja cancelado a edição
+					*/
+					DataLayer.rollback();
+
+					var ids = false;
+					$.each($('.attachment-list input'), function (i, input) {
+					    DataLayer.put('attachment', {id: ''+input.value});
+					    DataLayer.remove('attachment', ''+input.value);
+						ids = true;
+					});
+					if(ids)
+						DataLayer.commit();
+				
+					
+	                                                                                
+					UI.dialogs.addActivity.dialog('close');
+				    }else{
+					zebraDiscardEventDialog = false;
+				    }
+										
+				    /**
+				    * Uma vez aberta uma janela de confirmação (Zebra_Dialog), ao fechá-la
+				    * com ESC, para que o evento ESC não seja propagado para fechamento da
+				    * janela de edição de eventos, deve ser setada uma flag indicando que
+				    * já existe uma janela de confirmação aberta.
+				    */
+				    if (!clicked) {
+					window.setTimeout(function() {
+					    zebraDiscardEventDialog = false;
+					}, 200);
+				    }
+				}
+			    });
+								
+			}, 300);
+
+		    }
+		    //DataLayer.rollback();
+		    return canDiscardEventDialog;
+		},
+		dragStart: function(event, ui) {
+			if ($('.qtip.qtip-blue.qtip-active').length)
+				$('.qtip.qtip-blue.qtip-active').qtip('destroy');
+		}
+	    });
+				
+	} else {
+	    UI.dialogs.addActivity.html(html);
+	}
+		
+var tabs = UI.dialogs.addActivity.children('.content').tabs({
+	select: function(event, ui) { 
+		if ($('.qtip.qtip-blue.qtip-active').length)
+			$('.qtip.qtip-blue.qtip-active').qtip('destroy');
+	}	
+	});
+var calendar = DataLayer.get('calendar', objEvent.calendar);
+				
+if (calendar.timezone != objEvent.timezone){
+    UI.dialogs.addActivity.find('.calendar_addactivity_details_lnk_timezone').find('option[value="'+objEvent.timezone+'"]').attr('selected','selected').trigger('change');
+    UI.dialogs.addActivity.find('.calendar_addactivity_details_lnk_timezone').addClass('hidden');
+    $('.calendar-addevent-details-txt-timezone').removeClass('hidden');
+			
+}
+
+UI.dialogs.addActivity.find('.calendar_addactivity_details_lnk_timezone').click(function(e){
+    $(this).addClass('hidden');
+    $('.calendar-addactivity-details-txt-timezone').removeClass('hidden');
+    e.preventDefault();
+});
+
+/*Seleciona a agenda padrão para visualização/edição de um evento*/
+if(objEvent.id)
+    UI.dialogs.addActivity.find('option[value="'+objEvent.calendar+'"]').attr('selected','selected').trigger('change');
+
+/* Checkbox allday */
+
+UI.dialogs.addActivity.find('input[name="allDay"]').click(function(){
+    $(this).attr("checked") ? 
+    UI.dialogs.addActivity.find('.start-time, .end-time').addClass('hidden') :
+    UI.dialogs.addActivity.find('.start-time, .end-time').removeClass('hidden'); 
+    updateMap(true);
+});
+
+UI.dialogs.addActivity.find('.button').button();
+UI.dialogs.addActivity.find('.button.add').button({
+    icons: {
+	secondary: "ui-icon-plus"
+    }
+});
+
+// ==== validation events ====
+UI.dialogs.addActivity.find(".input-group .h1").Watermark("Atividade sem título");
+if(User.preferences.hourFormat.length == 5) {
+    UI.dialogs.addActivity.find(".end-time, .start-time").mask("99:99", {
+	completed: function(){
+	    updateMap();
+	}
+    });
+} else {
+    $.mask.definitions['{']='[ap]';
+    $.mask.definitions['}']='[m]';
+    UI.dialogs.addActivity.find(".end-time, .start-time").mask("99:99 {}", {
+	completed:function(){
+	    $(this).val(date.Calendar.defaultToAmPm($(this).val()));
+	    $(this).timepicker("refresh");
+	    $(this).val($(this).val().replace(/[\.]/gi, ""));
+	    updateMap();
+	}
+    });
+}
+UI.dialogs.addActivity.find(".number").numeric();
+User.preferences.dateFormat.indexOf('-') > 0 ? 
+UI.dialogs.addActivity.find(".date").mask("99-99-9999", {
+    completed:function(){
+	updateMap();
+    }
+}) : 
+UI.dialogs.addActivity.find(".date").mask("99/99/9999", {
+    completed:function(){
+	updateMap();
+    }
+});
+
+UI.dialogs.addActivity.find(".menu-addActivity")
+.children(".delete").click(function(){
+    $.Zebra_Dialog('Tem certeza que deseja excluir a atividade?', {
+	'type':     'question',
+	'overlay_opacity': '0.5',
+	'buttons':  ['Sim', 'Não'],
+	'onClose':  function(clicked) {
+	    if(clicked == 'Sim'){
+		canDiscardEventDialog = true;
+		/* Remove por filtro */
+		DataLayer.removeFilter('schedulable', {filter: ['AND', ['=', 'id', objEvent.id], ['=', 'calendar', objEvent.calendar], ['=','user',(objEvent.me.user ? objEvent.me.user.id : objEvent.me.id)]]});
+		Calendar.rerenderView(true);
+		/********************/
+		UI.dialogs.addActivity.dialog("close");
+	    }
+	}
+    });
+}).end()
+	    
+.children(".cancel").click(function(){
+    UI.dialogs.addActivity.dialog("close");
+}).end()
+	    
+.children(".save").click(function(){
+    /* Validação */
+    var msg = false;			
+    if(msg = validDateEvent()){
+	$(".new-activity-win.active").find('.messages-validation').removeClass('hidden').find('.message label').html(msg); 
+	return false;
+    }
+			
+    canDiscardEventDialog = true;
+			
+    var exit = function(event){
+	if(event)
+	    DataLayer.remove('schedulable', event, false); 
+
+	UI.dialogs.addActivity.children().find('form.form-addevent').submit();
+	UI.dialogs.addActivity.dialog("close");    }
+                        
+    if(repeat){
+	DataLayer.remove('repeat', false);
+	DataLayer.put('repeat', repeat);
+	DataLayer.commit('repeat', false, exit(repeat.schedulable));
+    }else
+	exit();
+}).end()
+		
+.children(".export").click(function(){
+    UI.dialogs.addActivity.children().find(".form-export").submit();
+});
+
+var task_activityHtml = DataLayer.render( path+'templates/task_activity_add.ejs', {
+	event:objEvent
+});
+
+
+var blkAddAtendee = UI.dialogs.addActivity.find('#calendar_addactivity_details8').append(task_activityHtml);
+
+var dates = UI.dialogs.addActivity.find('input.date').datepicker({
+    dateFormat: User.preferences.dateFormat.replace(/M/g, 'm').replace(/yyyy/g, 'yy'),
+    onSelect : function( selectedDate ){
+	updateMap();
+    }
+});
+
+UI.dialogs.addActivity.find('input.time').timepicker({ 
+    closeText: 'Ok',
+    hourGrid: 4,
+    minuteGrid: 10,
+    ampm : ((User.preferences.hourFormat.length > 5) ? true: false),
+    timeFormat: "hh:mm tt",
+    onSelect: function (selectedDateTime){
+	if(!(User.preferences.hourFormat.length == 5))
+	    $(this).val(selectedDateTime.replace(/[\.]/gi, ""));								
+	updateMap();
+    },
+    onClose : function (selectedDateTime){
+	if(!(User.preferences.hourFormat.length == 5))
+	    $(this).val(selectedDateTime.replace(/[\.]/gi, ""));
+    }
+	
+
+});
+
+blkAddAtendee.find('.add-activity-search .ui-icon-search').click(function(event) {
+    blkAddAtendee.find('.add-activity-search input').keydown();
+});
+			
+			
+blkAddAtendee.find('.add-activity-search input').keydown(function(event) {
+
+    if(event.keyCode == '13' || typeof(event.keyCode) == 'undefined') {	
+    // Fazer get das tarefas	
+	var result = [ {'name': 'Tarefa 01'} , {'name': 'Tarefa 02'} , {'name' : 'Tarefa 03'} ];
+	//DataLayer.get('user', ["*", "name", $(this).val()], true);
+
+
+	/**
+        * TODO: trocar por template
+        */
+	blkAddAtendee.find('ul.search-result-list').empty().css('overflow', 'hidden');
+	if (!result) {
+	    blkAddAtendee.find('ul.search-result-list').append('<li><label class="empty">Nenhum resultado encontrado.</label></li>');
+	}
+
+	for(i=0; i<result.length; i++)
+	    result[i].enabled = (blkAddAtendee.find('dd.task-helpers-list ul.task-helpers-list label.mail[title="' +  result[i].mail + '"]').length) ? false : true;
+											
+	blkAddAtendee.find('ul.search-result-list').append(DataLayer.render( path+'templates/task_search_itemlist.ejs', result));
+
+
+	blkAddAtendee.find('ul.search-result-list li').click(function(event, ui){
+	    if ($(event.target).is('input')) {
+		old_item = $(event.target).parents('li');
+		newAttendeeId = DataLayer.put('participant', {
+		    user: old_item.find('.id').html(), 
+		    isExternal: old_item.find('.isExternal').html()
+		});
+							
+		attendees[old_item.find('.id').html()] = old_item.find('.name').html();
+							
+		blkAddAtendee.find('dd.task-activity-list ul.task-activity-list')
+		.append(DataLayer.render(path+'templates/task_add_itemlist.ejs', [{
+		    id: newAttendeeId, 
+		    name: old_item.find('.name').html(), 
+		    mail: old_item.find('.mail').html(), 
+		    isExternal: old_item.find('.isExternal').html(), 
+		    acl: objEvent.acl,
+		    isDirty: !!!objEvent.id
+		 }]))
+		.scrollTo('max');
+		/**
+							* Delegação de participação de um participante com permissão apenas de leitura
+							*
+							*/
+			if(!objEvent.acl.organization && !objEvent.acl.write && !objEvent.acl.inviteGuests && objEvent.acl.read ){
+									
+			    blkAddAtendee.find('.block-add-attendee.search').addClass('hidden');
+			    blkAddAtendee.find('.block-add-attendee.search dt').html('Adicionar outros contatos');
+									
+			    blkAddAtendee.find('.status option').toggleClass('hidden');
+			    blkAddAtendee.find('option[value=5]').attr('selected','selected').trigger('change');
+			    blkAddAtendee.find('.request-update').removeClass('hidden');
+
+			    blkAddAtendee.find('dd.attendee-list ul.attendee-list li .button.close').parents('li').find('input[name="delegatedFrom[]"]').val(blkAddAtendee.find('.me input[name="attendee[]"]').val());
+									
+			    blkAddAtendee.find('.me .participant-delegate').addClass('disable ui-button-disabled ui-state-disabled');
+			    blkAddAtendee.find(".button.close").button({
+				icons: {
+				    primary: "ui-icon-close"
+				},
+				text: false
+			    }).click(function () {
+										
+				$(this).parents('li').find('input[name="delegatedFrom[]"]').val('');
+				blkAddAtendee.find('.request-update').addClass('hidden');
+				blkAddAtendee.find('.status option').toggleClass('hidden');
+				blkAddAtendee.find('option[value=1]').attr('selected','selected').trigger('change');			
+				blkAddAtendee.find('.me .participant-delegate').removeClass('disable ui-button-disabled ui-state-disabled attendee-permissions-change-button')
+				.find('.ui-icon-person').removeClass('attendee-permissions-change').end();               	
+										
+				DataLayer.remove('participant', $(this).parents('li').find('[type=checkbox]').val());
+				$(this).parents('li').remove();
+			    })
+			    .addClass('tiny');
+			}else{
+			    callbackAttendee();
+			    old_item.remove();
+			}
+	    }
+	});
+
+
+	event.preventDefault();
+    }
+});
+
+UI.dialogs.addActivity.find('.row.fileupload-buttonbar .button').filter('.delete').button({
+    icons: {
+	primary: "ui-icon-close"
+    },
+    text: 'Excluir'
+}).click(function () {
+    $.Zebra_Dialog('Tem certeza que deseja excluir todos anexos?', {
+	'type':     'question',
+	'overlay_opacity': '0.5',
+	'buttons':  ['Sim', 'Não'],
+	'onClose':  function(clicked) {
+	    if(clicked == 'Sim'){
+		
+                var ids = [];
+                $.each($('.attachment-list input'), function (i, input) {
+                     DataLayer.remove('schedulableToAttachment', {
+                        filter: ['=', 'id', ''+input.value]
+                        });
+                });
+                $('.attachment-list input').remove();
+                $('.row.fileupload-buttonbar .attachments-list p').remove();
+            }
+        }});
+}).end()
+.filter('.close').button({
+    icons: {
+	primary: "ui-icon-close"
+    },
+    text: false
+}).click(function () {
+    DataLayer.remove('schedulableToAttachment', $(this).parents('p').find('input[name="fileId[]"]').val());
+    $(this).parents('p').remove();
+}).end()
+.filter('.downlaod-archive').button({
+    icons: {
+	primary: "ui-icon-arrowthickstop-1-s"
+    },
+    text: false
+});
+var maxSizeFile = 2000000;
+$('#fileupload').fileupload({
+    sequentialUploads: true,
+    add: function (e, data) {
+	if(data.files[0].size < maxSizeFile)
+	    data.submit();
+    },
+    change: function (e, data) {
+	$.each(data.files, function (index, file) {
+	    var attach = {};
+	    attach.fileName = file.name;
+	    var ext = file.name.split('.');
+	    if(file.name.length > 10)
+		attach.fileName = ext.length == 1 ? file.name.substr(0, 10) :  file.name.substr(0, 6) + '.' + ext[ext.length -1];
+	    attach.fileSize = formatBytes(file.size);
+	    if(file.size > maxSizeFile)
+		attach.error = 'Tamanho de arquivo nao permitido!!'
+				
+	    $('.attachments-list').append(DataLayer.render(path+'templates/attachment_add_itemlist.ejs', {
+		file : attach
+	    }));
+				
+	    if(file.size < maxSizeFile){
+		$('.fileinput-button.new').append(data.fileInput[0]).removeClass('new');
+		$('.attachments-list').find('[type=file]').addClass('hidden');
+					
+	    }else
+		$('.fileinput-button.new').removeClass('new');
+				
+				
+	    $('.attachments-list').find('.button.close').button({
+		icons: {
+		    primary: "ui-icon-close"
+		},
+		text: false
+	    }).click(function(){
+		var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
+		$('.attachment-list').find('input[value="'+idAttach+'"]')
+		$(this).parent().remove();
+	    });	
+				
+	})
+	},
+    done: function(e, data){
+	var currentUpload = $('.progress.after-upload:first').removeClass('after-upload').addClass('on-complete').hide();
+
+	if(!!data.result && data.result != "[]"){
+	    var newAttach = (attch = jQuery.parseJSON(data.result)) ? attch : jQuery.parseJSON(data.result[0].activeElement.childNodes[0].data);
+	    $('.attachment-list').append('<input tyepe="hidden" name="attachment[]" value="'+newAttach['attachment'][0][0].id+'"/>');
+	    currentUpload.removeClass('on-complete').parents('p')
+	    .append('<input type="hidden" name="fileId[]" value="'+newAttach['attachment'][0][0].id+'"/>')
+	    .find('.status-upload').addClass('ui-icon ui-icon-check');
+	}else
+	    currentUpload.removeClass('on-complete').parents('p').find('.status-upload').addClass('ui-icon ui-icon-cancel');
+    }
+});
+$('.attachments-list .button').button();
+
+if(!!window.FormData)			
+$('#fileupload').bind('fileuploadstart', function () {
+    var widget = $(this),
+    progressElement = $('#fileupload-progress').fadeIn(),
+    interval = 500,
+    total = 0,
+    loaded = 0,
+    loadedBefore = 0,
+    progressTimer,
+    progressHandler = function (e, data) {
+	loaded = data.loaded;
+	total = data.total;
+    },
+    stopHandler = function () {
+	widget
+	.unbind('fileuploadprogressall', progressHandler)
+	.unbind('fileuploadstop', stopHandler);
+	window.clearInterval(progressTimer);
+	progressElement.fadeOut(function () {
+	    progressElement.html('');
+	});
+    },
+    formatTime = function (seconds) {
+	var date = new Date(seconds * 1000);
+	return ('0' + date.getUTCHours()).slice(-2) + ':' +
+	('0' + date.getUTCMinutes()).slice(-2) + ':' +
+	('0' + date.getUTCSeconds()).slice(-2);
+    },
+    /* formatBytes = function (bytes) {
+            if (bytes >= 1000000000) {
+                return (bytes / 1000000000).toFixed(2) + ' GB';
+            }
+            if (bytes >= 1000000) {
+                return (bytes / 1000000).toFixed(2) + ' MB';
+            }
+            if (bytes >= 1000) {
+                return (bytes / 1000).toFixed(2) + ' KB';
+            }
+            return bytes + ' B';
+        },*/
+    formatPercentage = function (floatValue) {
+	return (floatValue * 100).toFixed(2) + ' %';
+    },
+    updateProgressElement = function (loaded, total, bps) {
+	progressElement.html(
+	    formatBytes(bps) + 'ps | ' +
+	    formatTime((total - loaded) / bps) + ' | ' +
+	    formatPercentage(loaded / total) + ' | ' +
+	    formatBytes(loaded) + ' / ' + formatBytes(total)
+	    );
+    },
+    intervalHandler = function () {
+	var diff = loaded - loadedBefore;
+	if (!diff) {
+	    return;
+	}
+	loadedBefore = loaded;
+	updateProgressElement(
+	    loaded,
+	    total,
+	    diff * (1000 / interval)
+	    );
+    };
+    widget
+    .bind('fileuploadprogressall', progressHandler)
+    .bind('fileuploadstop', stopHandler);
+    progressTimer = window.setInterval(intervalHandler, interval);
+});
+	
+if(objEvent.isShared){
+		
+    var acls = Calendar.signatureOf[objEvent.calendar].permission.acl;
+		
+    if(!acls.write){
+	UI.dialogs.addActivity.find(':input').attr('disabled', 'disabled');
+	UI.dialogs.addActivity.find('.button').hide();
+    }
+		
+    if(acls.remove)
+	UI.dialogs.addActivity.find('.button.remove').show();
+    
+    UI.dialogs.addActivity.find('.button.cancel').show();	
+}
+
+disponibily(objEvent, path, attendees);
+
+UI.dialogs.addActivity.find('.button-add-alarms').click(function(){
+    var li_attach = DataLayer.render(path+'templates/alarms_add_itemlist.ejs', {type: 1});
+
+    jQuery('.activity-alarms-list').append(li_attach).find('.button.remove').button({
+	text:false, 
+	icons:{
+	    primary:'ui-icon-close'
+	}
+    }).click(function(el) {
+		$(this).parent().remove().find('li').is(':empty')
+	});
+// valicacao de campos numericos
+$('.number').numeric();
+});
+
+
+UI.dialogs.addActivity.dialog('open');
+}
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/js/helpers.js
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/js/helpers.js	(revision 6880)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/js/helpers.js	(revision 6881)
@@ -939,6 +939,5 @@
 // load template of attendees
 var blkAddAtendee = UI.dialogs.addEvent.find('#calendar_addevent_details6').append(attendeeHtml);
-if(objEvent.attendee.length)
-    callbackAttendee();
+
 /**
 Opções de delegação do participante/organizer
@@ -981,5 +980,4 @@
 			
 blkAddAtendee.find('.attendee-list-add .add-attendee-input input').keydown(function(event) {
-				
     if (event.keyCode == '13' && $(this).val() != '' || (event.keyCode == undefined && $(this).val() != '')) {
 	Encoder.EncodeType = "entity";
@@ -1195,5 +1193,5 @@
     $(this).val('');
 
-} else if (!skipAddNewLine) {		
+} else if (!skipAddNewLine) {
     /**
      * a) salva como novo usuario externo no banco (apenas com email) e...
@@ -1377,4 +1375,5 @@
     }
 });
+
 //$('.block-add-attendee .search-result-list').selectable();
 
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/js/init.js
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/js/init.js	(revision 6876)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/js/init.js	(revision 6881)
@@ -166,5 +166,5 @@
     				hide: false,
     				content: {
-    					text: $('<div></div>').html( DataLayer.render( 'templates/task_quick_add.ejs', {} ) ),
+    					text: $('<div></div>').html( DataLayer.render( 'templates/task_quick_add.ejs', {"componente" : componente} ) ),
     					title: {
     						text:'Nova tarefa', 
@@ -250,5 +250,5 @@
     			    	var startEvent = new Date();
     					var configData = (startEvent.toString('mm') < 30)  ? {minutes: (30 - parseInt(startEvent.toString('mm')))} : {hours: 1, minutes: '-'+startEvent.toString('mm')};
-    					startEvent.add(configData); 
+    					startEvent.add(configData);
     			
 						var componente = $(this);
@@ -276,4 +276,17 @@
 	}
 		});
+
+	$(".button.add.add-activity").click(function(event){
+			var startEvent = new Date();
+			var configData = (startEvent.toString('mm') < 30)  ? {minutes: (30 - parseInt(startEvent.toString('mm')))} : {hours: 1, minutes: '-'+startEvent.toString('mm')};
+			startEvent.add(configData); 
+			
+			activityDetails({ 
+				startTime: startEvent.getTime(),
+				endTime: dateCalendar.decodeRange(startEvent, (!!User.preferences.defaultCalendar ? (	!!Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration ?  
+						(Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration) : (User.preferences.defaultDuration)) : (User.preferences.defaultDuration)))
+			}, true );
+
+	});
 
 	var calendar = $('#calendar').fullCalendar(DataLayer.merge({ 
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/task_search_itemlist.ejs
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/task_search_itemlist.ejs	(revision 6881)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/task_search_itemlist.ejs	(revision 6881)
@@ -0,0 +1,11 @@
+<% for (var i=0; i < data.length; i++) { %>
+<li class="ui-widget-content" title="<%=data[i]['name']%>" style="border: 0;">
+	<input type="checkbox" name="opcao" />
+	<input type="hidden" value="<%=data[i]['id']%>" />
+	<input class="id hidden" value="<%=data[i]['id']%>"/>
+    <input class="isExternal hidden" value="<%=data[i]['isExternal']%>"/>
+
+    <label class="name"><%=data[i]['name']%></label>
+	<label class="mail hidden"><%=data[i]['mail']%></label>
+</li>
+<% } %>
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/activity_add.ejs
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/activity_add.ejs	(revision 6881)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/activity_add.ejs	(revision 6881)
@@ -0,0 +1,269 @@
+<div title="Criar Tarefa" class="div-addactivity content">
+    <form method="POST" action="<%=(data.event.acl.organization || data.event.acl.write) ?  "schedulable:detail" : "schedulable:preview"%>" class="form-addevent content">
+
+	<fieldset id="calendar_addactivity_details1">
+		<legend class="hidden">Detalhes da tarefa</legend>
+		<p class="input-group">
+			<input type="text" class="h1" name="summary" <%=(data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> value="<%= (data.event.summary) ? data.event.summary : '' %>"/>
+			<% if( data.event.id ){ %>
+				<input type="hidden" class="id-event" name="idEvent" value="<%= data.event.id %>"/>
+			<% } %>
+                        <% if( data.event.id && data.event.calendar ){ %>
+				<input type="hidden" class="last-calendar" name="lastCalendar" value="<%= data.event.calendar %>"/>
+			<% } %>
+		</p>
+		<p class="input-group date-info">
+			<input type="text" class="date start-date" value="<%= (data.event.startDate) ? data.event.startDate : '' %>" <%=(data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> name="startDate" />
+			<input type="text" class="time start-time<%= (data.event.allDay) ? ' hidden' : '' %>" value="<%= (data.event.startHour) ? data.event.startHour : '' %>" <%= (data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> name="startHour" /> 
+			<span>até</span>
+			<input type="text" class="date end-date" value="<%= (data.event.endDate) ? data.event.endDate : '' %>" <%= (data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> name="endDate" />
+			<input type="text" class="time end-time<%= (data.event.allDay) ? ' hidden' : '' %>" value="<%= (data.event.endHour) ? data.event.endHour : '' %>" <%=(data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> name="endHour" />
+
+				<span class="previsao-termino">Previsão término:</span>
+				<input type="text" class="date date-previsao">
+				<input type="text" class="time time-previsao">
+
+				<a href="#" class="calendar_addactivity_details_lnk_timezone <%=((!data.event.acl.organization || !data.event.acl.write) && (data.event.id)) ? "hidden" : '' %>">Fuso horário</a>
+			
+			
+<!--			<input type="text" name="timezone" style="display: none;" />-->
+			<select name="timezone" class="hidden calendar-addactivity-details-txt-timezone">
+				<option value="">- None selected -</option>
+				<% for( var tzId in data.event.timezones ){ %>
+				  <option value="<%= tzId %>" <%= data.timezone === tzId ? 'selected="selected"' : '' %>><%= tzId + ' (' + data.event.timezones[ tzId ] + ')' %></option>
+				<% } %>
+			</select>
+			
+			<a class="button suggestion-hours small <%=(data.event.acl.organization || data.event.acl.write || !data.event.isAttendee) ? "hidden" : '' %>" href="#">Sugerir horário</a>
+			
+		</p>
+				
+		<div class="ui-widget messages-validation hidden">
+			<div style="padding: 0.2em 0.7em;" class="ui-state-error ui-corner-all"> 
+				<p class="message">
+					<span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span> 
+					<label></label>
+				</p>
+			</div>
+		</div>
+		
+		<p class="input-group activity-type">
+			<input type="checkbox" name="allDay" value="true" <%= (data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> <%= (data.event.allDay) ? 'checked="checked"' : '' %>/>
+			<label for="allDay">Dia inteiro</label>
+		</p>
+		<div class="subitem">
+				% Conclusão: <input type="number" class="done" value="1"> 
+				<span class="span_done"><input type="checkbox" class="button-repeat" /> Completo<span>
+				<select style="margin: 0 0 0 20px;">
+					<option>Desenvolvimento</option>
+				</select>
+				<span style="margin:0 0 0 20px;">Prioridade<span> 
+				<select>
+					<option>Alta</option>
+					<option selected="selected">Média</option>
+					<option>Baixa</option>
+				</select>
+		</div>
+	</fieldset>
+	<ul style="width: 710px">
+		<li><a href="#calendar_addactivity_details2">Detalhes da tarefa</a></li>
+		<li><a href="#calendar_addactivity_details8">Tarefas</a></li>
+		<li><a href="#calendar_addactivity_details4">Lembretes</a></li>
+		<li><a href="#calendar_addactivity_details5">Anexos</a></li>
+		<li><a href="#calendar_addactivity_details6">Histórico</a></li>
+	</ul>
+	<fieldset id="calendar_addactivity_details2" class="tab-level2">
+		<legend class="hidden">Detalhes do evento</legend>
+
+		<p class="input-group">
+			<label for="calendar_addactivity_details_txtarea_description" class="for-textarea" >Descrição</label>
+			<textarea name="description" <%= (data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> ><%=(data.event) ? data.event.description : '' %></textarea>
+		</p>
+
+		<p class="input-group">
+			<label for="calendar_addactivity_details_slt_cal">Grupo</label>
+				<select>
+					<% 
+					  for (var i=0; i< data.event.calendars.length; i++) {
+					    if(data.event.calendars[i].id != data.event.calendar && Calendar.signatureOf[data.event.calendars[i].id].isOwner != '1' && (!Calendar.signatureOf[data.event.calendars[i].id].permission.acl.write) )
+						continue;
+					%>
+					      <option value="<%= data.event.calendars[i].id %>" <%= data.event.calendars[i].id == data.event.calendar ? 'selected="selected"':'' %>>
+					      <%= data.event.calendars[i].name %>
+					      </option>
+					<% } %>
+				</select>
+			<!--<select name="calendar" >
+			<% 
+			  for (var i=0; i< data.event.calendars.length; i++) {
+			    if(data.event.calendars[i].id != data.event.calendar && Calendar.signatureOf[data.event.calendars[i].id].isOwner != '1' && !Calendar.signatureOf[data.event.calendars[i].id].permission.acl.write)
+				continue;
+			%>
+			      <option value="<%= data.event.calendars[i].id %>" <%= data.event.calendars[i].id == data.event.calendar ? 'selected="selected"':'' %>>
+			      <%= data.event.calendars[i].name %>
+			      </option>
+			<% } %>
+			</select>
+		-->
+		</p>
+		
+		<fieldset class="hidden">
+			<legend class="hidden">Publicidade</legend>
+			<!--
+			<p class="input-group">
+				<label class="input-group">Mostrar-me como</label>
+				<input type="radio" checked="checked"/>
+				<label for="calendar_addevent_details_rdo_status1">Dispon?vel</label>
+				<input type="radio"/>
+				<label for="calendar_addevent_details_rdo_status2">Ocupado</label>
+			</p>
+			-->
+			<p class="input-group">
+				<label class="input-group">Privacidade</label>
+				<input type="radio" name="class" value="1" checked="checked"/>
+				<label for="calendar_addactivity_details_rdo_class1">Padrão</label>
+				<input type="radio" name="class" value="2" />
+				<label for="calendar_addactivity_details_rdo_class2">Público</label>
+				<input type="radio" name="class" value="3" />
+				<label for="calendar_addactivity_details_rdo_class3">Privado</label>
+			</p>
+			
+		</fieldset>
+		
+	</fieldset>
+	
+	<div class="overflow_add_calender">
+	<fieldset id="calendar_addactivity_details4" class="tab-level2">
+		<legend class="hidden">Lembretes</legend>
+		
+		<p class="default-alarm-event <%= (!data.event.id && data.event.alarms) ? '' : 'hidden'%>">
+			<input type="checkbox" name="defaultAlarm" value="true" checked="checked"/>
+			<label class="input-default-alarm" for="defautAlarm">Usar alarmes padrões</label>
+		</p>
+	
+		<ul class="activity-alarms-list">
+			<% if (data.event && data.event.alarms) {
+				for (var i=0; i< data.event.alarms.length; i++) {
+			%>
+			<li class="input-group">
+				<label>Avisar-me por </label>
+				<select name="alarmType[]">
+                                    <option value="alert" <%= data.event.alarms[i].type=='alert' ? 'selected="selected"':'' %>>Alerta</option>
+                                    <option value="mail" <%= data.event.alarms[i].type=='mail' ? 'selected="selected"':'' %>>E-mail</option>
+                                    <!--<option value="sms" <%= data.event.alarms[i].type=='sms' ? 'selected="selected"':'' %>>SMS</option>-->
+				</select>
+				<input type="text" name="alarmTime[]" class="number input-small" value="<%= data.event.alarms[i].time %>"/>
+				<select name="alarmUnit[]">
+					<option value="m" <%= data.event.alarms[i].unit=='m' ? 'selected="selected"':'' %>>Minutos</option>
+					<option value="h" <%= data.event.alarms[i].unit=='h' ? 'selected="selected"':'' %>>Horas</option>
+					<option value="d" <%= data.event.alarms[i].unit=='d' ? 'selected="selected"':'' %>>Dias</option>
+				</select>
+				<input type="hidden" name="alarmId[]" value="<%=data.event.useAlarmDefault ? '' : data.event.alarms[i].id%>" />
+				<input type="hidden" name="isDefaultAlarm[]" value="<%=data.event.useAlarmDefault ? 1 : 0%>" />
+				<label> antes de cada evento.</label>
+				<a class="button remove tiny"></a>
+			</li>
+			<%	}
+			   }
+			%>
+		</ul>
+		<span class="button add button-add-alarms">Adicionar lembrete</span>
+	
+	</fieldset>
+	</div>
+	
+	<fieldset id="calendar_addactivity_details6" class="tab-level2" title="Participantes">
+		<div class="parent"  >
+			
+			<div class="child-top">
+				<div class="date-hour"><span>Data -Hora</span></div>
+				<div class="organization"><span>Participante/Organizador</span></div>
+			</div>
+
+			<div class="child-bottom">
+				<% for(var i=0; i<15; i++){ %>
+					<div class="child-bottom-each">
+						<div class="date-hour"><span>17/05 - 23:43</span></div>
+						<div class="organization"><span>thiago da silva sauro</span></div>
+					</div>
+				<% } %>
+			</div>
+
+		</div>
+	</fieldset>	
+	
+	<fieldset id="calendar_addactivity_details8" class="tab-level2" title="Tarefas">
+		
+	</fieldset>
+
+	<fieldset class="attachment-list hidden">
+             <%if(data.event && data.event.attachments){
+                for (var i=0; i< data.event.attachments.length; i++) {%>
+                    <input type="hidden" name="fileId[]" value="<%=data.event.attachments[i].id%>"/>
+                <%}
+            }%>
+	</fieldset>
+    </form>
+    
+<div class="overflow_add_calender">
+	<fieldset id="calendar_addactivity_details5" class="tab-level2">
+        <form id="fileupload" action="attachment:detail" method="POST">
+        <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
+        <div class="row fileupload-buttonbar-activity">
+            <div class="button-files-upload">
+                <!-- The fileinput-button span is used to style the file input field as button -->
+                <%if(data.event.acl.organization || data.event.acl.write){%>
+		    <span class="button btn-success fileinput-button">
+                    <span><i class="icon-plus icon-white"></i> Adicionar</span>
+                    <input type="file" name="files[]" multiple>
+                </span>
+				<%}%>
+				<%if(data.event.acl.organization || data.event.acl.write){%>
+					<button type="button" class="button btn-danger delete">
+						<i class="icon-trash icon-white"></i> Remover Todos
+					</button>
+				<%}%>
+            </div>
+            <div id="fileupload-progress"></div>
+            <div class="files-list">
+               <ul class="attachments-list">
+			   <%if(data.event && data.event.attachments){
+					for (var i=0; i< data.event.attachments.length; i++) {
+					%>
+						<p class="input-group arquive-info">
+							<label class="lbl-archive-nome">Nome:</label>
+							<span class="archive-nome"><%=data.event.attachments[i].name%></span>
+							
+							<label class="lbl-archive-size">Tamanho:</label>
+							<span class="archive-size"><%=data.event.attachments[i].size%></span>
+							<a href="../prototype/getArchive.php?attachment=<%=data.event.attachments[i].id%>" class="button tiny upload downlaod-archive">Download</a>
+							<%if(data.event.acl.organization || data.event.acl.write){%>
+								<span class="button close tiny upload edit delete-upload" title="Deletar">Deletar</span>
+							<%}%>
+							<input type="hidden" name="fileId[]" value="<%=data.event.attachments[i].id%>"/>
+						</p>
+					<%}
+				}%>
+			   
+			   
+			   </ul>
+            </div>
+        </div>
+        <br>
+        
+    </form>
+	</fieldset>
+</div>
+	<form action="../prototype/modules/calendar/export.php" method="GET" class="form-export content">
+		<input type="hidden" class="id-activity" name="activity" value="<%= data.event.id %>"/>
+	</form>
+
+    <div title="" class="menu-container footer-container menu-addactivity">
+	    <% if (data.event.id) { %>
+			<a title="Exportar" class="button export" href="#">Exportar</a>
+			<a title="Excluir" class="button delete" href="#">Excluir</a>
+	    <% } %>
+		<a title="Cancelar" class="button cancel" href="#">Cancelar</a>
+	    <a title="Salvar" class="button save" href="#">Salvar</a>
+    </div>
+</div>
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/index.ejs
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/index.ejs	(revision 6857)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/index.ejs	(revision 6881)
@@ -88,4 +88,5 @@
 <script type='text/javascript' src='<?= MODULESURL ?>/js/map.disponibility.js'></script>
 
+<script type='text/javascript' src='<?= MODULESURL ?>/js/activity.helpers.js'></script>
 <script type='text/javascript' src='<?= MODULESURL ?>/js/task.helpers.js'></script>
 <script type='text/javascript' src='<?= MODULESURL ?>/js/helpers.js'></script>
@@ -127,4 +128,5 @@
 			<a class="button add add-event" href="#">Adicionar evento</a>
 			<a class="button add add-task" href="#">Adicionar tarefa</a>
+			<a class="button add add-activity" href="#">Adicionar atividade</a>
 			<!--<a class="button add" href="#" onclick="add_events_list();">Lista de Eventos</a>-->
 			<div class="mini-calendar"></div>
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/activity_information_task.ejs
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/activity_information_task.ejs	(revision 6881)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/activity_information_task.ejs	(revision 6881)
@@ -0,0 +1,3 @@
+<% if(data){ %>
+	Nome: <%= data.name %><br>
+<% } %>
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/task_add_itemlist.ejs
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/task_add_itemlist.ejs	(revision 6881)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/task_add_itemlist.ejs	(revision 6881)
@@ -0,0 +1,15 @@
+<li class="attendee"> 
+	<div style="overflow:hidden; width:100%; display:table;">	
+		<div class="activity-options" style="float: right; margin: 0 10px 0 0;">
+			<a class="button edit activity-options-button-edit new ui-icon-notice">InformaÃ§Ãµes</a>
+			<a class="button close new">Remover</a>
+		</div>	
+		<input class="new" type="checkbox" value="<%= data[0].id %>">
+		<input type="hidden" name="attendee[]" value="<%= data[0].id %>">
+		<input type="hidden" name="attendeeType[]" value="<%=data[0].isExternal%>">
+		<input type="hidden" name="attendeeAcl[]" value="r">
+		<input type="hidden" name="delegatedFrom[]" value="0">
+		<label title="<%= data[0].name ? data[0].name : '' %>" class="name"><%= data[0].name ? data[0].name : '' %></label>
+		<label title="<%= data[0].mail ? data[0].mail : '' %>" class="mail <%= data[0].name ? 'hidden' : ''%>"><%= data[0].mail ? data[0].mail : '' %></label>
+	</div>
+</li>
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/task_activity_add.ejs
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/task_activity_add.ejs	(revision 6881)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/task_activity_add.ejs	(revision 6881)
@@ -0,0 +1,29 @@
+	<dl class="block-activity-list activitys-list">
+		<dt class="activity-list">Tarefas</dt>
+		<dd class="task-activity-list">
+			<ul class="task-activity-list">
+
+	<% if(data.event.me.id == data.event.organizer.id && !(data.event.attendee.length > 0) ) { %>
+			<li class="not-activity">Não há outros participantes.</li>
+	<% } %>
+		
+			</ul>
+		</dd>
+	</dl>
+
+<dl class="block-add-activity search" style="">
+	<dt class="add-activity search">Adicionar tarefa</dt>
+	<dd class="add-activity">
+		<fieldset class="block-add-activity" title="Participantes">
+			<fieldset class="add-activity-search search-field ui-corner-all">
+				<input class="search" type="text" />
+				<span class="ui-icon ui-icon-search"></span>
+			</fieldset>
+			<ul class="search-result-list ui-corner-all">
+
+			</ul>
+
+		</fieldset>
+	</dd>
+</dl>
+
