Changeset 5835 for trunk/prototype/modules/calendar

Timestamp:

03/27/12 16:43:45 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Correcoes e melhorias no expressoCalendar

Location:

trunk/prototype/modules/calendar

Files:

• css/layout.css (modified) (1 diff)
• js/calendar.codecs.js (modified) (3 diffs)
• js/helpers.js (modified) (2 diffs)
• templates/event_list.ejs (modified) (1 diff)

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

@@ -623 +623 @@
 
 .events-list-win.empty {
-        line-height: 270px;
-    text-align: center;
     width: 100%;
+}
+
+.events-list-win.empty table.header-paginator{
+    margin-bottom: 80px;
+}
+
+.events-list-win.empty label.empty-result{
+    margin: 0 0 0 290px;
 }
 

trunk/prototype/modules/calendar/js/calendar.codecs.js

@@ -745 +745 @@
         if( !repeat )
             return( false );
+        if(typeof(repeat) == "object")
+            return repeat;
 
         return DataLayer.get( 'repeat', repeat );
@@ -837 +839 @@
                 if( !notArray ){
                         var dates = {};
+                        var typeRepeat = {'none': false, 
+                                        'daily': 'Repetição diária',
+                                        'weekly': 'Repetição semanal',
+                                        'monthly': 'Repetição mensal',
+                                        'yearly': 'repetição anual'}
 
                         for (var i=0; i < res.length; i++) {
@@ -858 +865 @@
                                     
                                     var res2 = $.extend( {}, res[i], {'startDate': currentDate.toString( User.preferences.dateFormat ), 'endDate': new Date( occurrences[ii] + duration ).toString( User.preferences.dateFormat ) } );
+                                  
+                                  
+                                  
+                                  
+                                    res2.repeat = typeRepeat[res[i].repeat.frequency];
                                   
                                     while (counter.compareTo( currentDate ) == 0) {

trunk/prototype/modules/calendar/js/helpers.js

@@ -370 +370 @@
                 }
 
-            DataLayer.render( 'templates/event_repeat.ejs', {event:objEvent}, function( repeatHtml ){
+            DataLayer.render( path+'templates/event_repeat.ejs', {event:objEvent}, function( repeatHtml ){
 
                         UI.dialogs.addEvent.find('#calendar_addevent_details3').html(repeatHtml);
@@ -2130 +2130 @@
                                 '<input type="hidden" name="page_index" value="'+page_index+'"></inpunt>'+
                                 '<input type="hidden" name="keyword" value="'+keyword+'"></inpunt>'+
-                                '<label>Não foram encontrados eventos neste intervalo.</label>' +
+                                '<label class="empty-result">Não foram encontrados eventos neste intervalo.</label>' +
                                 '</div>'
                         );

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

@@ -108 +108 @@
                                                                         </p>
                                                                 <%}%>
-                                                                <p class="input-group">
-                                                                        <label>Repete em</label>
+                                                                <%if(_event.repeat ){%>
+                                                                    <p class="input-group">
+                                                                        <label>Repetição</label>
                                                                         <span><%= _event.repeat %></span>
-                                                                </p>
+                                                                    </p>
+                                                                <%}%>
                                                                 <p class="input-group">
                                                                         <label>Lembretes</label>