Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/interceptors/DBMapping.php
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/interceptors/DBMapping.php	(revision 6968)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/interceptors/DBMapping.php	(revision 6974)
@@ -12,7 +12,4 @@
     static function encodeCreateSchedulable(&$uri, &$params, &$criteria, $original) 
     {
-
-    	if(isset($params['summary']) && $params['summary'] == '')
-	    $params['summary'] = 'Evento sem título';
 
     	if (!is_numeric($params['startTime']))
@@ -566,21 +563,23 @@
     static function createParticipantHistoric(&$uri, &$params, &$criteria, $original){
 
-        if(!isset($criteria['event'])){
-            $event = Controller::read(array('concept' => 'schedulable', 'id' => $original['properties']['schedulable']));
-            $criteria['event'] = $event;
-        }else
-            $event = $criteria['event'];
-
-        if($event['type'] == '2'){
-             Controller::create(array('concept' => 'calendarHistoric'), 
-                array('schedulable' => $original['properties']['schedulable'], 
-                    'user' => Config::me('uidNumber'),
-                    'time' => time() . '000',
-                    'attribute' => 'participant',
-                    'beforeValue' => '',
-                    'afterValue' => $original['properties']['user']
-                    )
-                );
-        }
+	if(isset($original['properties']) && $original['properties']['isOrganizer'] != '1'){
+	    if(!isset($criteria['event'])){
+		$event = Controller::read(array('concept' => 'schedulable', 'id' => $original['properties']['schedulable']));
+		$criteria['event'] = $event;
+	    }else
+		$event = $criteria['event'];
+
+	    if($event['type'] == '2'){
+		Controller::create(array('concept' => 'calendarHistoric'), 
+		    array('schedulable' => $original['properties']['schedulable'], 
+			'user' => Config::me('uidNumber'),
+			'time' => time() . '000',
+			'attribute' => 'participant',
+			'beforeValue' => '',
+			'afterValue' => $original['properties']['user']
+			)
+		    );
+	    }
+	}
     }
 
@@ -840,4 +839,8 @@
 	    } 
 	    
+       }
+       
+       if(isset($result['id']) && $result['type'] == '2'){
+	   $result['historic'] =  Controller::find( array( 'concept' => 'calendarHistoric' ), false, array( 'filter' => array( '=', 'schedulable', $result['id'] ) ) );
        }
    } 
@@ -1039,5 +1042,5 @@
         if(isset($criteria['filter']) && $criteria['filter'] && isset($criteria['filter'][1][2])){
             $idSchedulable = $criteria['filter'][1][2];
-			$idCalendar = $criteria['filter'][2][2];
+	    $idCalendar = $criteria['filter'][2][2];
             $owner = $criteria['filter'][3][2];
 
@@ -1076,4 +1079,8 @@
 
             $uri['id'] = $idSchedulable;
+	    
+	    if(isset($criteria['filter']) && isset($criteria['filter'][4]) && isset($criteria['filter'][4][2])){
+		Controller::deleteALL(array('concept' => 'taskToActivity'), null, array('filter' => array('=', 'activity', $idSchedulable)));
+	    }
         }
         
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/css/style.css
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/css/style.css	(revision 6968)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/css/style.css	(revision 6974)
@@ -631,4 +631,42 @@
 .div-addactivity #group_addactivity_details5 .button-files-upload { margin: 0 0 0 5px; }
 
+/**********************************************************************************************************/
+.div-addactivity  #group_addactivity_details6  .parent {width: 695px; min-height: 208px; float: left;}
+/*.div-addactivity  #group_addactivity_details6  .parent .child-top {width: 745px; height: 20px; background: #E8F4FD; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;}*/
+.div-addactivity  #group_addactivity_details6  .parent .child-top {width: 695px; height: 25px; background: #E8F4FD; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC; border-top: 1px solid #CCC;}
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom {width: 695px; height: 208px; overflow: auto;  float: left; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;}
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom .child-bottom-each { height: 20px; }
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom .child-bottom-each:hover { background: #FFF2F2; cursor: pointer;}
+
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom .task { height: 25px; text-align: center; background: #FEFEAD; border-bottom: 1px solid #CCC;}
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom .task.left {border-top: 1px solid #CCC;}
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom .task span{ position: absolute; margin-top: 6px;}
+
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom .child-bottom-each .date-hour { width: 140px; float: left; height: 20px}
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom .child-bottom-each .date-hour span { margin: 8px; float: left; }
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom .child-bottom-each .user{ width: 145px; float: left;  height: 20px; border-left: 1px solid #CCC; }
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom .child-bottom-each .user span{ margin: 8px; float: left; }
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom .child-bottom-each .attribute{ width: 130px; float: left;  height: 20px; border-left: 1px solid #CCC; }
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom .child-bottom-each .attribute span{ margin: 8px; float: left; }
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom .child-bottom-each .beforeValue{ width: 130px; float: left;  height: 20px; border-left: 1px solid #CCC; }
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom .child-bottom-each .beforeValue span{ margin: 8px; float: left; }
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom .child-bottom-each .afterValue{ width: 145px; float: left;  height: 20px; border-left: 1px solid #CCC; }
+.div-addactivity  #group_addactivity_details6  .parent .child-bottom .child-bottom-each .afterValue span{ margin: 8px; float: left; }
+
+.div-addactivity  #group_addactivity_details6  .parent .child-top .date-hour { width: 140px; float: left; background: #E8F4FD; height: 20px; text-align: center; }
+.div-addactivity  #group_addactivity_details6  .parent .child-top .date-hour span{ margin: 6px 0; position: absolute; font-weight: bold; color: #2E6E9E; }
+.div-addactivity  #group_addactivity_details6  .parent .child-top .user { width: 145px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E; text-align: center;}
+.div-addactivity  #group_addactivity_details6  .parent .child-top .user span{margin: 6px 0; position: absolute; }
+.div-addactivity  #group_addactivity_details6  .parent .child-top .attribute { width: 130px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E;  text-align: center;}
+.div-addactivity  #group_addactivity_details6  .parent .child-top .attribute span{margin: 6px 0; position: absolute; }
+.div-addactivity  #group_addactivity_details6  .parent .child-top .beforeValue { width: 130px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E;  text-align: center;}
+.div-addactivity  #group_addactivity_details6  .parent .child-top .beforeValue span{margin: 6px 0; position: absolute; }
+.div-addactivity  #group_addactivity_details6  .parent .child-top .afterValue { width: 145px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E;  text-align: center;}
+.div-addactivity  #group_addactivity_details6  .parent .child-top .afterValue span{margin: 6px 0; position: absolute; }
+
+
+/**********************************************************************************************************/
+
+/*
 .div-addactivity  #group_addactivity_details6 .parent {width: 680px; min-height: 268px; float: left;}
 .div-addactivity  #group_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;}
@@ -646,2 +684,3 @@
 .div-addactivity  #group_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  #group_addactivity_details6 .parent .child-top .organization span{margin: 8px; float: left; }
+*/
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.codecs.js
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.codecs.js	(revision 6968)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.codecs.js	(revision 6974)
@@ -626,5 +626,5 @@
         priority: form.priority,
         category: form.category,
-        summary: form.summary,
+        summary: form.summary == '' ? 'Tarefa sem título' : form.summary,
         description: form.description,
         timezone: tzId,
@@ -827,5 +827,5 @@
             case 'due':
                 return {
-                    user : historic.user,
+                    user :$.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
                     attribute : attributeDecoded[historic.attribute],
                     beforeValue : decodeDate(historic.beforeValue),
@@ -836,5 +836,5 @@
             case 'participant':
                 return{
-                    user : historic.user,
+                    user :$.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
                     attribute : historic.beforeValue == '' ? ('Novo participante') : ('Rem. participante'),
                     beforeValue : historic.beforeValue == '' ? '' : historic.beforeValue.mail,
@@ -845,5 +845,5 @@
             case 'attachment':
                 return{
-                    user : historic.user,
+                    user : $.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
                     attribute : historic.beforeValue == '' ? ('Novo anexo') : ('Rem. anexo'),
                     beforeValue : historic.beforeValue,
@@ -853,5 +853,5 @@
             case 'percentage':
                     return{
-                    user : historic.user,
+                    user :$.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
                     attribute :attributeDecoded[historic.attribute],
                     beforeValue : historic.beforeValue+' %',
@@ -862,5 +862,5 @@
             default:
                 return {
-                    user : historic.user,
+                    user : $.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
                     attribute : attributeDecoded[historic.attribute],
                     beforeValue : historic.beforeValue,
@@ -929,5 +929,4 @@
     
         var tzId =  form.timezone || Calendar.signatureOf[form.group].calendar.timezone || User.preferences.timezone,
-
         formatString = pref.dateFormat + " " + pref.hourFormat;
 
@@ -969,5 +968,5 @@
         priority: form.priority,
         category: form.category,
-        summary: form.summary,
+        summary: form.summary == '' ? 'Atividade sem título' : form.summary,
         description: form.description,
         timezone: tzId,
@@ -1003,4 +1002,6 @@
         if(!(typeof(objEvent) == 'object'))
             return (null);
+	
+	var historic = [];
 
         var decodeTasks = function(obj){
@@ -1025,10 +1026,11 @@
                     endDate: new Date( parseInt(task.endTime) - (!!parseInt(task.allDay) ? 86400000 : 0)  ).setTimezoneOffset( Timezone.timezone( task.timezone ) ).toString( User.preferences.dateFormat ),
                     endHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date(parseInt(task.endTime)),  task.timezone, obj.calendar, obj.DayLigth, 'endTime'), User.preferences.hourFormat),
-					status: task.status,
-					percentage: task.percentage
+		    status: task.status,
+		    percentage: task.percentage
                 }
 
                 tasks[task.id].description = tasks[task.id].startDate + ' - ' + (!!task.summary ? task.summary : task.description);
 
+		historic.push({'task': (!!task.summary ? task.summary : task.description) , 'historic': decodeHistotic(task)});
             }
 
@@ -1060,5 +1062,5 @@
         dueTime: (!objEvent.due || objEvent.due == '' || objEvent.due == '0') ? '' : dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(objEvent.due)), objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'startTime'), User.preferences.hourFormat),
         allDay: !!parseInt( objEvent.allDay ),
-        historic: [],
+        historic: historic,
         tasks: objEvent.taskToActivity ? decodeTasks(objEvent) : {},
         attachments: $.map(objEvent.attachments || [], function( attachment, i ){
@@ -1226,5 +1228,5 @@
 		type: 1,
 		category: form.category,
-		summary: form.summary,
+		summary: form.summary == '' ? 'Evento sem título' : form.summary,
 		description: form.description,
 		timezone: tzId,
@@ -1435,4 +1437,6 @@
                 if(!dates[index] || !$.isArray(dates[index].events))
                     dates[index] = {events:  []};                    
+
+		res2['isOneDay'] = duration <= 86400000 ? true : false;
 
                 dates[index].events.push(res2);
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 6959)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/js/activity.helpers.js	(revision 6974)
@@ -233,6 +233,6 @@
     canDiscardActivityDialog = true;
     /**
-	 * zebraDiscardActivityDialog Ã© 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
+	 * zebraDiscardActivityDialog é 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
 	 */
     zebraDiscardActivityDialog = false;
@@ -310,6 +310,6 @@
     	},
     	dragStart: function(event, ui) {
-    		if ($('.qtip.qtip-blue.qtip-active').length)
-    			$('.qtip.qtip-blue.qtip-active').qtip('destroy');
+	    if ($('.qtip.qtip-blue.qtip-active').length)
+		$('.qtip.qtip-blue.qtip-active').qtip('destroy');
        }
     });
@@ -419,5 +419,5 @@
 		canDiscardActivityDialog = true;
 		/* Remove por filtro */
-		DataLayer.removeFilter('schedulable', {filter: ['AND', ['=', 'id', objActivity.id], ['=', 'group', objActivity.group], ['=','user',(objActivity.me.user ? objActivity.me.user.id : objActivity.me.id)]]});
+		DataLayer.removeFilter('schedulable', {filter: ['AND', ['=', 'id', objActivity.id], ['=', 'calendar', objActivity.group], ['=','user',(objActivity.me.user ? objActivity.me.user.id : objActivity.me.id)], ['=', 'type', '2']]});
 		Calendar.rerenderView(true);
 		/********************/
@@ -578,5 +578,5 @@
                 });
                 $('.attachment-list input').remove();
-                $('.row.fileupload-buttonbar .attachments-list p').remove();
+                $('.row.fileupload-buttonbar-activity .attachments-list p').remove();
             }
         }});
@@ -598,5 +598,5 @@
 });
 var maxSizeFile = 2000000;
-$('#fileupload').fileupload({
+$('#fileuploadactivity').fileupload({
     sequentialUploads: true,
     add: function (e, data) {
@@ -615,17 +615,17 @@
 		attach.error = 'Tamanho de arquivo nao permitido!!'
 				
-	    $('.attachments-list').append(DataLayer.render(path+'templates/attachment_add_itemlist.ejs', {
+	    $('div.new-activity-win .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');
+		$('div.new-activity-win .fileinput-button.new').append(data.fileInput[0]).removeClass('new');
+		$('div.new-activity-win .attachments-list').find('[type=file]').addClass('hidden');
 					
 	    }else
-		$('.fileinput-button.new').removeClass('new');
+		$('div.new-activity-win .fileinput-button.new').removeClass('new');
 				
 				
-	    $('.attachments-list').find('.button.close').button({
+	    $('div.new-activity-win .attachments-list').find('.button.close').button({
 		icons: {
 		    primary: "ui-icon-close"
@@ -641,9 +641,9 @@
 	},
     done: function(e, data){
-    	var currentUpload = $('.progress.after-upload:first').removeClass('after-upload').addClass('on-complete').hide();
+    	var currentUpload = $('div.new-activity-win .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+'"/>');
+    	    $('div.new-activity-win .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+'"/>')
@@ -656,7 +656,7 @@
 
 if(!!window.FormData)			
-$('#fileupload').bind('fileuploadstart', function () {
+$('#fileuploadactivity').bind('fileuploadstart', function () {
     var widget = $(this),
-    progressElement = $('#fileupload-progress').fadeIn(),
+    progressElement = $('#fileupload-progress-activity').fadeIn(),
     interval = 500,
     total = 0,
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/js/helpers.js
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/js/helpers.js	(revision 6959)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/js/helpers.js	(revision 6974)
@@ -1467,5 +1467,5 @@
 });
 var maxSizeFile = 2000000;
-$('#fileupload').fileupload({
+$('#fileuploadevent').fileupload({
     sequentialUploads: true,
     add: function (e, data) {
@@ -1484,17 +1484,17 @@
 		attach.error = 'Tamanho de arquivo nao permitido!!'
 				
-	    $('.attachments-list').append(DataLayer.render(path+'templates/attachment_add_itemlist.ejs', {
+	    $('div.new-event-win .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');
+		$('div.new-event-win .fileinput-button.new').append(data.fileInput[0]).removeClass('new');
+		$('div.new-event-win .attachments-list').find('[type=file]').addClass('hidden');
 					
 	    }else
-		$('.fileinput-button.new').removeClass('new');
+		$('div.new-event-win .fileinput-button.new').removeClass('new');
 				
 				
-	    $('.attachments-list').find('.button.close').button({
+	    $('div.new-event-win .attachments-list').find('.button.close').button({
 		icons: {
 		    primary: "ui-icon-close"
@@ -1503,5 +1503,5 @@
 	    }).click(function(){
 		var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
-		$('.attachment-list').find('input[value="'+idAttach+'"]')
+		$('div.new-event-win .attachment-list').find('input[value="'+idAttach+'"]')
 		$(this).parent().remove();
 	    });	
@@ -1510,9 +1510,9 @@
 	},
     done: function(e, data){
-	var currentUpload = $('.progress.after-upload:first').removeClass('after-upload').addClass('on-complete').hide();
+	var currentUpload = $('div.new-event-win .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+'"/>');
+	    $('div.new-event-win .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+'"/>')
@@ -1525,7 +1525,7 @@
 
 if(!!window.FormData)			
-$('#fileupload').bind('fileuploadstart', function () {
+$('#fileuploadevent').bind('fileuploadstart', function () {
     var widget = $(this),
-    progressElement = $('#fileupload-progress').fadeIn(),
+    progressElement = $('#fileupload-progress-event').fadeIn(),
     interval = 500,
     total = 0,
@@ -2240,5 +2240,5 @@
         	    })
         	    .click(function(){
-        		  meu_container.find('.button.'+typeCalendar.type).qtip('destroy');
+        		      $('.qtip.qtip-blue').remove();
         	    });
         	    
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/js/task.helpers.js
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/js/task.helpers.js	(revision 6959)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/js/task.helpers.js	(revision 6974)
@@ -431,5 +431,5 @@
     UI.dialogs.addTask.find(".input-group .h1").Watermark("Tarefa sem título");
     if (User.preferences.hourFormat.length == 5) {
-        UI.dialogs.addTask.find(".end-time, .start-time").mask("99:99", {
+        UI.dialogs.addTask.find(".end-time, .start-time, .time-previsao").mask("99:99", {
             completed: function () {
                 updateMap();
@@ -653,5 +653,5 @@
             'type': 'question',
             'overlay_opacity': '0.5',
-            'buttons': ['Sim', 'NÃ£o'],
+            'buttons': ['Sim', 'Não'],
             'onClose': function (clicked) {
                 if (clicked == 'Sim') {
@@ -683,5 +683,5 @@
     });
     var maxSizeFile = 2000000;
-    $('#fileupload').fileupload({
+    $('#fileuploadtask').fileupload({
         sequentialUploads: true,
         add: function (e, data) {
@@ -697,16 +697,16 @@
                 if (file.size > maxSizeFile) attach.error = 'Tamanho de arquivo nao permitido!!'
 
-                $('.attachments-list').append(DataLayer.render(path + 'templates/attachment_add_itemlist.ejs', {
+                $('div.new-task-win .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({
+                    $('div.new-task-win .fileinput-button.new').append(data.fileInput[0]).removeClass('new');
+                    $('div.new-task-win .attachments-list').find('[type=file]').addClass('hidden');
+
+                } else $('div.new-task-win .fileinput-button.new').removeClass('new');
+
+
+                $('div.new-task-win .attachments-list').find('.button.close').button({
                     icons: {
                         primary: "ui-icon-close"
@@ -715,5 +715,5 @@
                 }).click(function () {
                     var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
-                    $('.attachment-list').find('input[value="' + idAttach + '"]')
+                    $('div.new-task-win .attachment-list').find('input[value="' + idAttach + '"]')
                     $(this).parent().remove();
                 });
@@ -722,18 +722,18 @@
         },
         done: function (e, data) {
-            var currentUpload = $('.progress.after-upload:first').removeClass('after-upload').addClass('on-complete').hide();
+            var currentUpload = $('div.new-task-win .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 + '"/>');
+                $('div.new-task-win .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 () {
+    $('div.new-task-win .attachments-list .button').button();
+
+    if ( !! window.FormData) $('#fileuploadtask').bind('fileuploadstart', function () {
         var widget = $(this),
-            progressElement = $('#fileupload-progress').fadeIn(),
+            progressElement = $('#fileupload-progress-task').fadeIn(),
             interval = 500,
             total = 0,
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 6959)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/activity_add.ejs	(revision 6974)
@@ -1,254 +1,265 @@
-<div title="Criar Tarefa" class="div-addactivity content">
+<div title="Criar Atividade" class="div-addactivity content">
     <form method="POST" action="schedulable:activity" class="form-addactivity content">
 
 	<fieldset id="group_addactivity_details1">
-		<legend class="hidden">Detalhes da atividade</legend>
-		<p class="input-group">
-			<input type="text" class="h1" name="summary" value="<%= (data.activity.summary) ? data.activity.summary : '' %>"/>
-			<% if( data.activity.id ){ %>
+	    <legend class="hidden">Detalhes da atividade</legend>
+	    <p class="input-group">
+		<input type="text" class="h1" name="summary" value="<%= (data.activity.summary) ? data.activity.summary : '' %>"/>
+		<% if( data.activity.id ){ %>
                 <input type="hidden" class="id-activity" name="idActivity" value="<%= data.activity.id %>"/>
-			<% } %>
-            <% if( data.activity.id && data.activity.group ){ %>
-				<input type="hidden" class="last-group" name="lastCalendar" value="<%= data.activity.group %>"/>
-			<% } %>
-            <input type="hidden" class="id-attendee" name="idAttendee" value="<%= data.activity.attendee[0] ? data.activity.attendee[0].id : '0'%>"/>
-		</p>
-		<p class="input-group date-info">
-			<input type="text" class="start-date" readonly="readonly" value="<%= (data.activity.startDate) ? data.activity.startDate : '' %>" name="startDate" />
-			<input type="text" class="time start-time<%= (data.activity.allDay) ? ' hidden' : '' %>" readonly="readonly" value="<%= (data.activity.startHour) ? data.activity.startHour : '' %>" name="startHour" /> 
-			<span>até</span>
-			<input type="text" class="end-date" readonly="readonly" value="<%= (data.activity.endDate) ? data.activity.endDate : '' %>" name="endDate" />
-			<input type="text" class="time end-time<%= (data.activity.allDay) ? ' hidden' : '' %>" readonly="readonly" value="<%= (data.activity.endHour) ? data.activity.endHour : '' %>" name="endHour" />
-
-				<span class="previsao-termino">Previsão término:</span>
-				<input type="text" class="date-due" name="dueDate" readonly="readonly">
-				<input type="text" class="time time-due" name="dueHour" readonly="readonly">
-
-				<a href="#" class="group_addactivity_details_lnk_timezone">Fuso horário</a>
-			
-			<select name="timezone" class="hidden group-addactivity-details-txt-timezone">
-				<option value="">- None selected -</option>
-				<% for( var tzId in data.activity.timezones ){ %>
-				  <option value="<%= tzId %>" <%= data.timezone === tzId ? 'selected="selected"' : '' %>><%= tzId + ' (' + data.activity.timezones[ tzId ] + ')' %></option>
-				<% } %>
-			</select>
-			
-		</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>
+		<% } %>
+		<% if( data.activity.id && data.activity.group ){ %>
+		<input type="hidden" class="last-group" name="lastCalendar" value="<%= data.activity.group %>"/>
+		<% } %>
+		<input type="hidden" class="id-attendee" name="idAttendee" value="<%= data.activity.attendee[0] ? data.activity.attendee[0].id : '0'%>"/>
+	    </p>
+	    <p class="input-group date-info">
+		<input type="text" class="start-date" readonly="readonly" value="<%= (data.activity.startDate) ? data.activity.startDate : '' %>" name="startDate" />
+		<input type="text" class="time start-time<%= (data.activity.allDay) ? ' hidden' : '' %>" readonly="readonly" value="<%= (data.activity.startHour) ? data.activity.startHour : '' %>" name="startHour" /> 
+		<span>até</span>
+		<input type="text" class="end-date" readonly="readonly" value="<%= (data.activity.endDate) ? data.activity.endDate : '' %>" name="endDate" />
+		<input type="text" class="time end-time<%= (data.activity.allDay) ? ' hidden' : '' %>" readonly="readonly" value="<%= (data.activity.endHour) ? data.activity.endHour : '' %>" name="endHour" />
+
+		<span class="previsao-termino">Previsão término:</span>
+		<input type="text" class="date-due" name="dueDate" readonly="readonly">
+		<input type="text" class="time time-due" name="dueHour" readonly="readonly">
+
+		<a href="#" class="group_addactivity_details_lnk_timezone">Fuso horário</a>
+
+		<select name="timezone" class="hidden group-addactivity-details-txt-timezone">
+		    <option value="">- None selected -</option>
+		    <% for( var tzId in data.activity.timezones ){ %>
+		    <option value="<%= tzId %>" <%= data.timezone === tzId ? 'selected="selected"' : '' %>><%= tzId + ' (' + data.activity.timezones[ tzId ] + ')' %></option>
+		    <% } %>
+		</select>
+
+	    </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>
-		
-		<p class="input-group activity-type">
-			<input type="checkbox" name="allDay" value="true" <%= (data.activity.allDay) ? 'checked="checked"' : '' %>/>
-			<label for="allDay">Dia inteiro</label>
-		</p>
-		<div class="subitem">
+	    </div>
+
+	    <p class="input-group activity-type">
+		<input type="checkbox" name="allDay" value="true" <%= (data.activity.allDay) ? 'checked="checked"' : '' %>/>
+		       <label for="allDay">Dia inteiro</label>
+	    </p>
+	    <div class="subitem">
                 % Conclusão: <input type="text" name="percentage" class="done" readonly="readonly" value="<%= data.activity.percentage %>"> 
                 <span style="margin:0 0 0 5px;">Status:<span> 
-                <select name="activityStatus" >
-                    <option <%= (data.activity.activityStatus == '1') ? 'selected="selected"' : '' %> value="1">Sem ações</option>
-                    <option <%= (data.activity.activityStatus == '2') ? 'selected="selected"' : '' %> value="2">Em Processo</option>
-                    <option <%= (data.activity.activityStatus == '3') ? 'selected="selected"' : '' %> value="3">Finalizada</option>
-                    <option <%= (data.activity.activityStatus == '4') ? 'selected="selected"' : '' %> value="4">Cancelada</option>
-                </select>
-                <span style="margin:0 0 0 5px;">Prioridade:<span> 
-                <select name="priority">
-                    <option <%= (data.activity.priority == '1') ? 'selected="selected"' : '' %> value="1">Alta</option>
-                    <option <%= (data.activity.priority == '2') ? 'selected="selected"' : '' %> value="2">Normal</option>
-                    <option <%= (data.activity.priority == '3') ? 'selected="selected"' : '' %> value="3">Baixa</option>
-                </select>
-                <span class="span_done"><label>Completo</label></span>
-        </div>
-	</fieldset>
-	<ul style="width: 710px">
-		<li><a href="#group_addactivity_details2">Detalhes da atividade</a></li>
-		<li><a href="#group_addactivity_details8">Tarefas</a></li>
-		<li><a href="#group_addactivity_details4">Lembretes</a></li>
-		<li><a href="#group_addactivity_details5">Anexos</a></li>
-		<li><a href="#group_addactivity_details6">Histórico</a></li>
-	</ul>
-	<fieldset id="group_addactivity_details2" class="tab-level2">
-		<legend class="hidden">Detalhes da atividade</legend>
-
-		<p class="input-group">
-			<label for="group_addactivity_details_txtarea_description" class="for-textarea" >Descrição</label>
-			<textarea name="description"><%=(data.activity) ? data.activity.description : '' %></textarea>
-		</p>
-
-		<p class="input-group">
-			<label for="group_addactivity_details_slt_cal">Grupo</label>
-			<select name="group">
-				<% for (var i=0; i< data.activity.groups.length; i++) {	%>
-                    <option value="<%= data.activity.groups[i].id %>" <%= data.activity.groups[i].id == data.activity.group ? 'selected="selected"':'' %>>
-				       <%= data.activity.groups[i].name %>
-			        </option>
-				<% } %>
+			<select name="activityStatus" >
+			    <option <%= (data.activity.activityStatus == '1') ? 'selected="selected"' : '' %> value="1">Sem ações</option>
+			    <option <%= (data.activity.activityStatus == '2') ? 'selected="selected"' : '' %> value="2">Em Processo</option>
+			    <option <%= (data.activity.activityStatus == '3') ? 'selected="selected"' : '' %> value="3">Finalizada</option>
+			    <option <%= (data.activity.activityStatus == '4') ? 'selected="selected"' : '' %> value="4">Cancelada</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="group_addactivity_details_rdo_status1">Dispon?vel</label>
-				<input type="radio"/>
-				<label for="group_addactivity_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="group_addactivity_details_rdo_class1">Padrão</label>
-				<input type="radio" name="class" value="2" />
-				<label for="group_addactivity_details_rdo_class2">Público</label>
-				<input type="radio" name="class" value="3" />
-				<label for="group_addactivity_details_rdo_class3">Privado</label>
-			</p>
-			
-		</fieldset>
-		
-	</fieldset>
-	
-	<div class="overflow_add_calender">
-	<fieldset id="group_addactivity_details4" class="tab-level2">
-		<legend class="hidden">Lembretes</legend>
-		
-		<p class="default-alarm-activity <%= (!data.activity.id && data.activity.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.activity && data.activity.attendee && !!data.activity.attendee.length && data.activity.attendee[0].alarms) {
-				var alarms = data.activity.attendee[0].alarms;
-				for (var i=0; i< alarms.length; i++) {
-			%>
-			<li class="input-group">
-			    <label>Avisar-me por </label>
-			    <select name="alarmType[]">
-				<option value="alert" <%= alarms[i].type=='alert' ? 'selected="selected"':'' %>>Alerta</option>
-				<option value="mail" <%= alarms[i].type=='mail' ? 'selected="selected"':'' %>>E-mail</option>
-				<!--<option value="sms" <%= alarms[i].type=='sms' ? 'selected="selected"':'' %>>SMS</option>-->
-			    </select>
-			    <input type="text" name="alarmTime[]" class="number input-small" value="<%= alarms[i].time %>"/>
-			    <select name="alarmUnit[]">
-				<option value="m" <%= alarms[i].unit=='m' ? 'selected="selected"':'' %>>Minutos</option>
-				<option value="h" <%= alarms[i].unit=='h' ? 'selected="selected"':'' %>>Horas</option>
-				<option value="d" <%= alarms[i].unit=='d' ? 'selected="selected"':'' %>>Dias</option>
-			    </select>
-				<input type="hidden" name="alarmId[]" value="<%=data.activity.useAlarmDefault ? '' : alarms[i].id%>" />
-				<input type="hidden" name="isDefaultAlarm[]" value="<%=data.activity.useAlarmDefault ? 1 : 0%>" />
-				<label> antes de cada activityo.</label>
-				<a class="button remove tiny"></a>
-			</li>
-			<%}
-			   }
-			%>
-		</ul>
-		<span class="button add button-add-alarms">Adicionar lembrete</span>
-	
-	</fieldset>
-	</div>
-	
-	<fieldset id="group_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="group_addactivity_details8" class="tab-level2" title="Tarefas">
-		
-	</fieldset>
-
-	<fieldset class="attachment-list hidden">
-             <%if(data.activity && data.activity.attachments){
-                for (var i=0; i< data.activity.attachments.length; i++) {%>
-                    <input type="hidden" name="fileId[]" value="<%=data.activity.attachments[i].id%>"/>
-                <%}
-            }%>
-	</fieldset>
-    </form>
-    
-<div class="overflow_add_calender">
-	<fieldset id="group_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 -->
-                
-                <span class="button btn-success fileinput-button">
-                    <span><i class="icon-plus icon-white"></i> Adicionar</span>
-                    <input type="file" name="files[]" multiple>
-                </span>
-
-				<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.activity && data.activity.attachments){
-					for (var i=0; i< data.activity.attachments.length; i++) {
+			<span style="margin:0 0 0 5px;">Prioridade:<span> 
+				<select name="priority">
+				    <option <%= (data.activity.priority == '1') ? 'selected="selected"' : '' %> value="1">Alta</option>
+				    <option <%= (data.activity.priority == '2') ? 'selected="selected"' : '' %> value="2">Normal</option>
+				    <option <%= (data.activity.priority == '3') ? 'selected="selected"' : '' %> value="3">Baixa</option>
+				</select>
+				<span class="span_done"><label>Completo</label></span>
+				</div>
+				</fieldset>
+				<ul style="width: 710px">
+				    <li><a href="#group_addactivity_details2">Detalhes da atividade</a></li>
+				    <li><a href="#group_addactivity_details8">Tarefas</a></li>
+				    <li><a href="#group_addactivity_details4">Lembretes</a></li>
+				    <li><a href="#group_addactivity_details5">Anexos</a></li>
+				    <li><a href="#group_addactivity_details6">Histórico</a></li>
+				</ul>
+				<fieldset id="group_addactivity_details2" class="tab-level2">
+				    <legend class="hidden">Detalhes da atividade</legend>
+
+				    <p class="input-group">
+					<label for="group_addactivity_details_txtarea_description" class="for-textarea" >Descrição</label>
+					<textarea name="description"><%=(data.activity) ? data.activity.description : '' %></textarea>
+				    </p>
+
+				    <p class="input-group">
+					<label for="group_addactivity_details_slt_cal">Grupo</label>
+					<select name="group">
+					    <% for (var i=0; i< data.activity.groups.length; i++) {	%>
+					    <option value="<%= data.activity.groups[i].id %>" <%= data.activity.groups[i].id == data.activity.group ? 'selected="selected"':'' %>>
+						    <%= data.activity.groups[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="group_addactivity_details_rdo_status1">Dispon?vel</label>
+					    <input type="radio"/>
+					    <label for="group_addactivity_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="group_addactivity_details_rdo_class1">Padrão</label>
+					<input type="radio" name="class" value="2" />
+					<label for="group_addactivity_details_rdo_class2">Público</label>
+					<input type="radio" name="class" value="3" />
+					<label for="group_addactivity_details_rdo_class3">Privado</label>
+				    </p>
+
+				</fieldset>
+
+			    </fieldset>
+
+			    <div class="overflow_add_calender">
+				<fieldset id="group_addactivity_details4" class="tab-level2">
+				    <legend class="hidden">Lembretes</legend>
+
+				    <p class="default-alarm-activity <%= (!data.activity.id && data.activity.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.activity && data.activity.attendee && !!data.activity.attendee.length && data.activity.attendee[0].alarms) {
+					var alarms = data.activity.attendee[0].alarms;
+					for (var i=0; i< alarms.length; i++) {
 					%>
-						<p class="input-group arquive-info">
+					<li class="input-group">
+					    <label>Avisar-me por </label>
+					    <select name="alarmType[]">
+						<option value="alert" <%= alarms[i].type=='alert' ? 'selected="selected"':'' %>>Alerta</option>
+						<option value="mail" <%= alarms[i].type=='mail' ? 'selected="selected"':'' %>>E-mail</option>
+						<!--<option value="sms" <%= alarms[i].type=='sms' ? 'selected="selected"':'' %>>SMS</option>-->
+					    </select>
+					    <input type="text" name="alarmTime[]" class="number input-small" value="<%= alarms[i].time %>"/>
+					    <select name="alarmUnit[]">
+						<option value="m" <%= alarms[i].unit=='m' ? 'selected="selected"':'' %>>Minutos</option>
+						<option value="h" <%= alarms[i].unit=='h' ? 'selected="selected"':'' %>>Horas</option>
+						<option value="d" <%= alarms[i].unit=='d' ? 'selected="selected"':'' %>>Dias</option>
+					    </select>
+					    <input type="hidden" name="alarmId[]" value="<%=data.activity.useAlarmDefault ? '' : alarms[i].id%>" />
+					    <input type="hidden" name="isDefaultAlarm[]" value="<%=data.activity.useAlarmDefault ? 1 : 0%>" />
+					    <label> antes de cada activityo.</label>
+					    <a class="button remove tiny"></a>
+					</li>
+					<%}
+					}
+					%>
+				    </ul>
+				    <span class="button add button-add-alarms">Adicionar lembrete</span>
+
+				</fieldset>
+			    </div>
+
+			    <fieldset id="group_addactivity_details6" class="tab-level2" title="Histórico">
+				<div class="parent">
+				    <div class="child-top">
+					<div class="date-hour"><span>Data-Hora</span></div>
+					<div class="user"><span>Participante</span></div>
+					<div class="attribute"><span>Alterou</span></div>
+					<div class="beforeValue"><span>De</span></div>
+					<div class="afterValue"><span>Para</span></div>
+				    </div>
+
+				    <div class="child-bottom">
+					<% if(data.activity.historic.length){
+					    for(var i=0; i< data.activity.historic.length; i++){ %>
+					    <div class="task <%= i != 0 ? 'left' : ''%>"><span><%= data.activity.historic[i].task %></span></div>
+					    <%for(var j=0; j< data.activity.historic[i].historic.length; j++){ 
+						var historic = data.activity.historic[i].historic[j];%>
+						<div class="child-bottom-each">
+						    <div class="date-hour"><span><%= historic.time %></span></div>
+						    <div class="user"><span><%= historic.user.name %></span></div>
+						    <div class="attribute"><span><%= historic.attribute %></span></div>
+						    <div class="beforeValue"><span><%= historic.beforeValue %></span></div>
+						    <div class="afterValue"><span><%= historic.afterValue %></span></div>
+						</div>
+						
+					    <%}
+					    }	
+					}%>
+				    </div>
+			      </div>
+			    </fieldset>	
+
+			    <fieldset id="group_addactivity_details8" class="tab-level2" title="Tarefas">
+
+			    </fieldset>
+
+			    <fieldset class="attachment-list hidden">
+				<%if(data.activity && data.activity.attachments){
+				for (var i=0; i< data.activity.attachments.length; i++) {%>
+				<input type="hidden" name="fileId[]" value="<%=data.activity.attachments[i].id%>"/>
+				<%}
+				}%>
+			    </fieldset>
+			    </form>
+
+			    <div class="overflow_add_calender">
+				<fieldset id="group_addactivity_details5" class="tab-level2">
+				    <form id="fileuploadactivity" 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 -->
+
+						<span class="button btn-success fileinput-button">
+						    <span><i class="icon-plus icon-white"></i> Adicionar</span>
+						    <input type="file" name="files[]" multiple>
+						</span>
+
+						<button type="button" class="button btn-danger delete">
+						    <i class="icon-trash icon-white"></i> Remover Todos
+						</button>
+
+					    </div>
+					    <div id="fileupload-progress-activity"></div>
+					    <div class="files-list">
+						<ul class="attachments-list">
+						    <%if(data.activity && data.activity.attachments){
+						    for (var i=0; i< data.activity.attachments.length; i++) {
+						    %>
+						    <p class="input-group arquive-info">
 							<label class="lbl-archive-nome">Nome:</label>
 							<span class="archive-nome"><%=data.activity.attachments[i].name%></span>
-							
+
 							<label class="lbl-archive-size">Tamanho:</label>
 							<span class="archive-size"><%=data.activity.attachments[i].size%></span>
 							<a href="../prototype/getArchive.php?attachment=<%=data.activity.attachments[i].id%>" class="button tiny upload downlaod-archive">Download</a>
-							
+
 							<span class="button close tiny upload edit delete-upload" title="Deletar">Deletar</span>
-						
+
 							<input type="hidden" name="fileId[]" value="<%=data.activity.attachments[i].id%>"/>
-						</p>
-					<%}
-				}%>
-			   
-			   
-			   </ul>
-            </div>
-        </div>
-        <br>
-        
-    </form>
-	</fieldset>
-</div>
-	<form action="../prototype/modules/group/export.php" method="GET" class="form-export content">
-		<input type="hidden" class="id-activity" name="activity" value="<%= data.activity.id %>"/>
-	</form>
-
-    <div title="" class="menu-container footer-container menu-addactivity">
-	    <% if (data.activity.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>
+						    </p>
+						    <%}
+						    }%>
+
+
+						</ul>
+					    </div>
+					</div>
+					<br>
+
+				    </form>
+				</fieldset>
+			    </div>
+			    <form action="../prototype/modules/group/export.php" method="GET" class="form-export content">
+				<input type="hidden" class="id-activity" name="activity" value="<%= data.activity.id %>"/>
+			    </form>
+
+			    <div title="" class="menu-container footer-container menu-addactivity">
+				<% if (data.activity.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/task_add.ejs
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/task_add.ejs	(revision 6968)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/task_add.ejs	(revision 6974)
@@ -147,5 +147,5 @@
 				<input type="hidden" name="alarmId[]" value="<%=data.task.useAlarmDefault ? '' : data.task.alarms[i].id%>" />
 				<input type="hidden" name="isDefaultAlarm[]" value="<%=data.task.useAlarmDefault ? 1 : 0%>" />
-				<label> antes de cada tasko.</label>
+				<label> antes de cada tarefa.</label>
 				<a class="button remove tiny"></a>
 			</li>
@@ -166,30 +166,28 @@
 	
 	<fieldset id="calendar_addtask_details8" class="tab-level2" title="Histórico">
-		<div class="parent"  >
-			
-			<div class="child-top">
-				<div class="date-hour"><span>Data-Hora</span></div>
-                <div class="user"><span>Participante</span></div>
-                <div class="attribute"><span>Alterou</span></div>
-                <div class="beforeValue"><span>De</span></div>
-				<div class="afterValue"><span>Para</span></div>
-			</div>
-
-			<div class="child-bottom">
-			    <% if(data.task.historic){
-					for(var i=0; i< data.task.historic.length; i++){ %>
-        				<div class="child-bottom-each">
-        				    <div class="date-hour"><span><%= data.task.historic[i].time %></span></div>
-                            <div class="user"><span><%= data.task.historic[i].user.name %></span></div>
-                            <div class="attribute"><span><%= data.task.historic[i].attribute %></span></div>
-                            <div class="beforeValue"><span><%= data.task.historic[i].beforeValue %></span></div>
-        				    <div class="afterValue"><span><%= data.task.historic[i].afterValue %></span></div>
-        				</div>
-			    <% 	}	
-				}				
-				%>
-			</div>
-
-		</div>
+	    <div class="parent">
+		<div class="child-top">
+		    <div class="date-hour"><span>Data-Hora</span></div>
+		    <div class="user"><span>Participante</span></div>
+		    <div class="attribute"><span>Alterou</span></div>
+		    <div class="beforeValue"><span>De</span></div>
+		    <div class="afterValue"><span>Para</span></div>
+		</div>
+
+		<div class="child-bottom">
+		    <% if(data.task.historic){
+			for(var i=0; i< data.task.historic.length; i++){ %>
+			    <div class="child-bottom-each">
+				<div class="date-hour"><span><%= data.task.historic[i].time %></span></div>
+				<div class="user"><span><%= data.task.historic[i].user.name %></span></div>
+				<div class="attribute"><span><%= data.task.historic[i].attribute %></span></div>
+				<div class="beforeValue"><span><%= data.task.historic[i].beforeValue %></span></div>
+				<div class="afterValue"><span><%= data.task.historic[i].afterValue %></span></div>
+			    </div>
+		    <% 	}	
+		    }%>
+		</div>
+
+	    </div>
 	</fieldset>
 
@@ -205,5 +203,5 @@
 <div class="overflow_add_calender">
 	<fieldset id="calendar_addtask_details5" class="tab-level2">
-        <form id="fileupload" action="attachment:detail" method="POST">
+        <form id="fileuploadtask" action="attachment:detail" method="POST">
         <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
         <div class="row fileupload-buttonbar-task">
@@ -218,5 +216,5 @@
 				</button>
             </div>
-            <div id="fileupload-progress"></div>
+            <div id="fileupload-progress-task"></div>
             <div class="files-list">
                <ul class="attachments-list">
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 6951)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/task_add_itemlist.ejs	(revision 6974)
@@ -2,5 +2,5 @@
     <div style="overflow:hidden; width:100%; display:table;">	
 	<div class="activity-options" style="float: right; margin: 0 10px 0 0;">
-	    <a class="button info activity-options-button-edit new ui-icon-notice">Informaçõess</a>
+	    <a class="button info activity-options-button-edit new ui-icon-notice">Informações</a>
 	    <a class="button close new">Remover</a>
 	</div>	
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/event_add.ejs
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/event_add.ejs	(revision 6525)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/event_add.ejs	(revision 6974)
@@ -171,5 +171,5 @@
 <div class="overflow_add_calender">
 	<fieldset id="calendar_addevent_details5" class="tab-level2">
-        <form id="fileupload" action="attachment:detail" method="POST">
+        <form id="fileuploadevent" action="attachment:detail" method="POST">
         <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
         <div class="row fileupload-buttonbar">
@@ -188,5 +188,5 @@
 				<%}%>
             </div>
-            <div id="fileupload-progress"></div>
+            <div id="fileupload-progress-event"></div>
             <div class="files-list">
                <ul class="attachments-list">
Index: sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/attendees_task.ejs
===================================================================
--- sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/attendees_task.ejs	(revision 6946)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/attendees_task.ejs	(revision 6974)
@@ -8,5 +8,5 @@
                 <%if(!data.task.delegatedFrom[data.task.me.id]){%>
                     <option value="1" <%= data.task.status=='1' ? 'selected="selected"':'' %>>Eu vou</option>
-                        <option value="3" <%= data.task.status=='3' ? 'selected="selected"':'' %>>Eu nÃ£o vou</option>
+                        <option value="3" <%= data.task.status=='3' ? 'selected="selected"':'' %>>Eu não vou</option>
                         <option value="2" <%= data.task.status=='2' ? 'selected="selected"':'' %>>Talvez</option>
                         <option class="hidden" value="5">Delegado</option>
@@ -113,5 +113,5 @@
                 <%} 
             } else if(data.task.me.id == data.task.organizer.id && !(data.task.attendee.length > 0) ) { %>
-                <li class="not-attendee">NÃ£o hÃ¡ outros participantes.</li>
+                <li class="not-attendee">Não há outros participantes.</li>
             <% } %>
             </ul>
