Changeset 7273 for sandbox/2.4.3-expresso-rest/prototype
- Timestamp:
- 09/21/12 16:02:43 (12 years ago)
- Location:
- sandbox/2.4.3-expresso-rest
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.4.3-expresso-rest
- Property svn:mergeinfo changed
/trunk (added) merged: 7253,7257-7259,7264,7267-7269,7271-7272
- Property svn:mergeinfo changed
-
sandbox/2.4.3-expresso-rest/prototype/modules/calendar/js/activity.helpers.js
r7075 r7273 138 138 139 139 UI.dialogs.addActivity.find('.button-add-alarms').click(function(){ 140 DataLayer.render( 'templates/alarms_add_itemlist.ejs', {type: 0}, function( template ){140 DataLayer.render( 'templates/alarms_add_itemlist.ejs', {type: 2}, function( template ){ 141 141 jQuery('.activity-alarms-list').append(template) 142 .find('li:last label:eq(0)').remove().end()143 142 .find('.number').numeric().end() 144 143 .find('.button.remove').button({ -
sandbox/2.4.3-expresso-rest/prototype/modules/calendar/js/helpers.js
r7106 r7273 1813 1813 DataLayer.render( 'templates/configure_calendars.ejs', { 1814 1814 user:User, 1815 type: 0,1815 type: type, 1816 1816 calendars:calendars, 1817 1817 signatures:signatures -
sandbox/2.4.3-expresso-rest/prototype/modules/calendar/templates/activity_add.ejs
r7068 r7273 144 144 <input type="hidden" name="alarmId[]" value="<%=data.activity.useAlarmDefault ? '' : alarms[i].id%>" /> 145 145 <input type="hidden" name="isDefaultAlarm[]" value="<%=data.activity.useAlarmDefault ? 1 : 0%>" /> 146 <label> antes de cada a ctivityo.</label>146 <label> antes de cada atividade.</label> 147 147 <a class="button remove tiny"></a> 148 148 </li> -
sandbox/2.4.3-expresso-rest/prototype/modules/calendar/templates/alarms_add_itemlist.ejs
r6996 r7273 39 39 </select> 40 40 <input type="hidden" name="alarmId[]" value="" /> 41 <%if( !!!parseInt(data.type)){%>41 <%if(parseInt(data.type) == 0){%> 42 42 <label>antes de cada evento.</label> 43 <%}else if (parseInt(data.type) == 1){%> 44 <label>antes de cada tarefa.</label> 43 45 <%}else{%> 44 <label>antes de cada tarefa.</label>45 46 <label>antes de cada atividade.</label> 47 <%}%> 46 48 <a class="button remove tiny"></a> 47 49 </li>
Note: See TracChangeset
for help on using the changeset viewer.