Changeset 7287 for branches/2.4

Timestamp:

09/24/12 16:42:28 (12 years ago)

Author:

eduardow

Message:

Ticket #3122 - Inconsistências ao Manter Atividade e configurações de grupos.

Location:

branches/2.4/prototype/modules/calendar

Files:

• js/activity.helpers.js (modified) (2 diffs)
• templates/activity_add.ejs (modified) (1 diff)
• templates/alarms_add_itemlist.ejs (modified) (1 diff)

branches/2.4/prototype/modules/calendar/js/activity.helpers.js

@@ -138 +138 @@
 
 UI.dialogs.addActivity.find('.button-add-alarms').click(function(){
-            DataLayer.render( 'templates/alarms_add_itemlist.ejs', {type: 0}, function( template ){                     
+            DataLayer.render( 'templates/alarms_add_itemlist.ejs', {type: 2}, function( template ){                     
             jQuery('.activity-alarms-list').append(template)
-            .find('li:last label:eq(0)').remove().end()
             .find('.number').numeric().end()
             .find('.button.remove').button({
@@ -149 +148 @@
             }).click(function(el) {
                 $(this).parent().remove();
-            });    
+            });
             });
         });

branches/2.4/prototype/modules/calendar/templates/activity_add.ejs

@@ -144 +144 @@
                                             <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>
+                                            <label> antes de cada atividade.</label>
                                             <a class="button remove tiny"></a>
                                         </li>

branches/2.4/prototype/modules/calendar/templates/alarms_add_itemlist.ejs

@@ -39 +39 @@
                 </select>
                 <input type="hidden" name="alarmId[]" value="" />
-                <%if(!!!parseInt(data.type)){%>
+                <%if(parseInt(data.type) == 0){%>
                         <label>antes de cada evento.</label>
+                        <%}else if (parseInt(data.type) == 1){%> 
+                        <label>antes de cada tarefa.</label>
                 <%}else{%>
-                        <label>antes de cada tarefa.</label>
-                <%}%>
+                        <label>antes de cada atividade.</label> 
+            <%}%> 
                 <a class="button remove tiny"></a>
         </li>