Changeset 5879 for trunk/prototype/modules/calendar

Timestamp:

04/04/12 14:55:28 (12 years ago)

Author:

acoutinho

Message:

Ticket #2592 - Desformatacao da tela ao editar um evento / Falha na atualizacao de status de participante

Location:

trunk/prototype/modules/calendar

Files:

• constants.php (modified) (1 diff)
• css/layout.css (modified) (2 diffs)
• templates/calendar_list.ejs (modified) (2 diffs)
• templates/event_list.ejs (modified) (2 diffs)

trunk/prototype/modules/calendar/constants.php

@@ -29 +29 @@
 define('ICAL_ACTION_SUGGESTION', 6);
 define('ICAL_ACTION_IMPORT_REQUIRED', 7);
+define('ICAL_ACTION_ORGANIZER_UPDATE', 8);
+define('ICAL_ACTION_ORGANIZER_NONE', 9);
 
 define('ATTENDEE_ACL_ORGANIZATION', 'o');

trunk/prototype/modules/calendar/css/layout.css

@@ -407 +407 @@
 }
 
-.my-calendars .list-calendars-item{
+.my-calendars .list-calendars-item, .signed-calendars .list-calendars-item{
         position: relative; 
         overflow: hidden;
 }
-.my-calendars .list-calendars-item div{
+.my-calendars .list-calendars-item div, .signed-calendars .list-calendars-item div{
         overflow:hidden; 
         width:6000px; 
@@ -417 +417 @@
 }
 
-.my-calendars .cal-list-options-btn{
+.my-calendars .cal-list-options-btn, .signed-calendars .cal-list-options-btn {
         position: absolute;
         top: 2px;

trunk/prototype/modules/calendar/templates/calendar_list.ejs

@@ -10 +10 @@
             if(signature[i].isOwner == 1){
             %>
-            <li class="list-calendars-item list-calendars-item-<%= signature[i].calendar.id %>">
+            <li class="list-calendars-item list-calendars-item-<%= signature[i].calendar.id %>" title="<%= signature[i].calendar.name %>">
 
                 <div>
@@ -52 +52 @@
             if(signature[i].isOwner == 0){
             %>
-            <li class="list-calendars-item list-calendars-item-<%= signature[i].calendar.id %>">
-                <input class="calendar-view" type="checkbox" name="" value="<%= signature[i].calendar.id %>" checked="checked"/>
-                <label><%= signature[i].calendar.name %></label>
-
+            <li class="list-calendars-item list-calendars-item-<%= signature[i].calendar.id %>" title="<%= signature[i].calendar.name %>">
+                 <div>
+                    <input class="calendar-view" type="checkbox" name="" value="<%= signature[i].calendar.id %>" checked="checked"/>
+                    <label><%= signature[i].calendar.name %></label>
+                 </div>
                 <a class="cal-list-options-btn my-cal-list-options-btn-<%= signature[i].calendar.id %>" style="background-color:#<%=signature[i].backgroundColor%>; border-color:#<%= signature[i].borderColor%>;">
                     <img src="../prototype/modules/calendar/img/arrow_down.png" width="10" height="10" class="cal-list-img"/></a>

trunk/prototype/modules/calendar/templates/event_list.ejs

@@ -91 +91 @@
                                                                         <p class="input-group date-info">
                                                                                 <label>Duração</label>
-                                                                                <span class="date start-date">Dia inteiro</span>
+                                                                                <span class="">Dia inteiro</span>
                                                                         </p>
                                                                 <%}else{%>
@@ -97 +97 @@
                                                                         <p class="input-group date-info">
                                                                                 <label>Início:</label>
-                                                                                <span class="date start-date"><%= _event.startDate %> às </span>
-                                                                                <span class="time start-time"><%= _event.startHour %></span> 
+                                                                                <span class=""><%= _event.startDate %> às </span>
+                                                                                <span class=""><%= _event.startHour %></span> 
                                                                                 
                                                                         </p>
                                                                         <p class="input-group">
                                                                                 <label>Término:</label>
-                                                                                <span class="date end-date"><%= _event.endDate %> às </span>
-                                                                                <span class="time end-time"><%= _event.endHour %></span>
+                                                                                <span class=""><%= _event.endDate %> às </span>
+                                                                                <span class=""><%= _event.endHour %></span>
                                                                                 <span><%= _event.timeZone %></span>
                                                                         </p>