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 6974)
+++ sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/attendees_task.ejs	(revision 6988)
@@ -15,12 +15,12 @@
                 <%}%>
             </select>
-				<% if (data.task.id && (data.task.me.id != data.task.organizer.id) && !data.task.delegatedFrom[data.task.me.id]) { %>
-					<fieldset class="add-attendee-options-read">
-						<a href="#" class="button participant-delegate add-attendee-options-button">Delegar participaÃ§Ã£o a um novo participante</a>
-					</fieldset>
-				<%}%>
+	    <% if (data.task.id && !data.task.delegatedFrom[data.task.me.id]) { %>
+		    <fieldset class="add-attendee-options-read">
+			    <a href="#" class="button participant-delegate add-attendee-options-button">Delegar participação a um novo participante</a>
+		    </fieldset>
+	    <%}%>
             <p class="input-group request-update <%=data.task.delegatedFrom[data.task.me.id] ? '' : "hidden"%>">
                 <input type="checkbox" name="receiveNotification" value="true" <%=data.task.me.receiveNotification =='1' ? 'checked="checked"' : ''%>/>
-                <label for="request-update">Receber atualizaÃ§Ãµes</label>
+                <label for="request-update">Receber atualizações</label>
             </p>
             
@@ -35,5 +35,5 @@
                 <label for="attendee" title="<%=  data.task.me.user ? data.task.me.user.mail : data.task.me.mail %>" class="mail hidden"></label>
                 
-                <li class="organizer <%= data.task.me.id == data.task.organizer.id ? "hidden" : "" %>"> 
+                <li class="organizer <%= data.task.isOrganizer ? "hidden" : "" %>"> 
                     <div style="overflow:hidden; width:100%; display:table;">
                         <span class="space-status ui-icon <%=iconStatus[data.task.organizer.status]%>" title="<%=legendStatus[data.task.organizer.status]%>"></span>
@@ -74,5 +74,5 @@
                             <span class="space-special ui-icon <%= !!data.task.delegatedFrom[data.task.attendee[i].id] ? iconStatus[5] : iconStatus[6]%>" title="<%=!!data.task.delegatedFrom[data.task.attendee[i].id] ? legendStatus[5] : legendStatus[6]%>"></span>
 
-                            <input type="checkbox" class="new" value="<%= data.task.attendee[i].id %>">
+                            <input type="checkbox" class="new" <%= data.task.isOrganizer ? '' : 'disabled="disabled"'%> value="<%= data.task.attendee[i].id %>">
 
                             <input type="hidden" name="attendee[]" value="<%=data.task.attendee[i].id%>">
@@ -83,9 +83,10 @@
                             <label title="<%= data.task.attendee[i].mail ? data.task.attendee[i].mail : ''%>" class="mail <%= !!data.task.delegatedFrom[data.task.attendee[i].id] ? "name-special-delegated" : "name-special"%>"><%= data.task.attendee[i].mail ? data.task.attendee[i].mail : '' %></label>
                             <span class="ui-icon ui-icon-close ui-corner-all ui-icon-float-right"></span>
-                        </div> 
-                        <div class="attendee-options">
-                            <a class="button close new">Remover</a>
                         </div>
-
+			<%if(data.isOrganizer){%>
+			    <div class="attendee-options">
+				<a class="button close new">Remover</a>
+			    </div>
+			<%}%>
 
                         <%if(!!data.task.delegatedFrom[data.task.attendee[i].id]){%>
@@ -117,8 +118,8 @@
             </ul>
         </dd>
-        <dd class="attendee-list-add">
+        <dd class="attendee-list-add" <%= data.isOrganizer ? '' : 'disabled="disabled"'%>>
             <fieldset class="add-attendee-input input-field-rounded ui-corner-all">
-                <span class="ui-icon ui-icon-plus"></span>
-                <input class="plus" type="text" />
+                <span class="ui-icon ui-icon-plus" <%= data.isOrganizer ? '' : 'disabled="disabled"'%>></span>
+                <input class="plus" <%= data.isOrganizer ? '' : 'disabled="disabled"'%> type="text" />
             </fieldset>
         </dd>
@@ -137,5 +138,5 @@
           <ul class="attendees-count">
             <li><label>Sim:</label><%=data.task.statusParticipants.accepted%></li>
-            <li><label>NÃ£o:</label><%=data.task.statusParticipants.cancelled%></li>
+            <li><label>Não:</label><%=data.task.statusParticipants.cancelled%></li>
             <li><label>Talvez:</label><%=data.task.statusParticipants.tentative%></li>
             <li><label>Aguardando:</label><%=data.task.statusParticipants.unanswered%></li>
@@ -151,5 +152,5 @@
     </dl>
 
-<dl class="block-add-attendee search">
+    <dl class="block-add-attendee search <%= data.isOrganizer ? '' : 'hidden'%>">
     <dt class="add-attendee search">Adicionar outros convidados</dt>
     <dd class="add-attendee">
