From: Coleman Watts Date: Sun, 1 Mar 2015 17:08:15 +0000 (-0500) Subject: CRM-15932 - Remove broken, redundant summary text X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0e113270adc3c612c235a2f85e41cd1c006d7e03;p=civicrm-core.git CRM-15932 - Remove broken, redundant summary text --- diff --git a/templates/CRM/Core/Form/RecurringEntity.tpl b/templates/CRM/Core/Form/RecurringEntity.tpl index c87dd6889c..2e7823d390 100644 --- a/templates/CRM/Core/Form/RecurringEntity.tpl +++ b/templates/CRM/Core/Form/RecurringEntity.tpl @@ -77,10 +77,6 @@ {$form.exclude_date_list.label} {help id="id-exclude-date" entityType=$entityType file="CRM/Core/Form/RecurringEntity.hlp"} {$form.exclude_date_list.html} - - {ts}Summary:{/ts} - -
{include file="CRM/common/formButtons.tpl" location="bottom"} @@ -302,81 +298,7 @@ } }); - //Build Summary - var finalSummary = ''; - var numberText = ''; - var interval = $('#repetition_frequency_interval').val() + ' '; - if ($('#repetition_frequency_interval').val() == 1) { - interval = ''; - } else { - numberText = 's'; - } - finalSummary = "Every " + interval + $('#repetition_frequency_unit option:selected').val() + numberText; - - //Case Week - var dayOfWeek = []; - if ($('#repetition_frequency_unit option:selected').val() == "week") { - $("input[name^='start_action_condition']:checked").each(function() { - var tempArray = []; - var thisID = $(this).attr('id'); - tempArray = thisID.split('_'); - dayOfWeek.push(tempArray[3].substr(0, 1).toUpperCase() + tempArray[3].substr(1).toLowerCase()); - }); - finalSummary += ' on ' + dayOfWeek.join(); - } - - //Case Monthly - if ($('#repetition_frequency_unit option:selected').val() == "month") { - if ($('input:radio[name=repeats_by]:checked').val() == 1) { - finalSummary += ' on day ' + $('#limit_to').val(); - } - if ($('input:radio[name=repeats_by]:checked').val() == 2) { - finalSummary += ' on ' + $('#entity_status_1').val().substr(0, 1).toUpperCase() + $('#entity_status_1').val().substr(1).toLowerCase() + ' ' + $('#entity_status_2').val().substr(0, 1).toUpperCase() + $('#entity_status_2').val().substr(1).toLowerCase(); - } - } - - //Case Ends - if ($('input:radio[name=ends]:checked').val() == 1) { - var timeText = '' - if ($('#start_action_offset').val() != 1) { - timeText = $('#start_action_offset').val() + ' times'; - } else { - timeText = ' once'; - } - finalSummary += ', ' + timeText; - } - if ($('input:radio[name=ends]:checked').val() == 2) { - var monthNames = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; - var date = new Date($('#repeat_absolute_date_display').val()); - function addOrdinal(d) { - if (d>3 && d<21) return 'th'; - switch (d % 10) { - case 1: return "st"; - case 2: return "nd"; - case 3: return "rd"; - default: return "th"; - } - } - var newDate = monthNames[(date.getMonth())] + ' ' + date.getDate()+ addOrdinal() + ' ' + date.getFullYear(); - finalSummary += ', untill '+ newDate; - } - - //Build/Attach final Summary - $('#rec-summary').html(finalSummary); - }); {/literal} -{*Hide Summary*} -{if empty($scheduleReminderId)} -{literal} - -{/literal} -{/if}