Restores the delete button for events

Signed-off-by: Jon Stovell <[email protected]>

Languages/en_US/Calendar.php

@@ -77,9 +77,9 @@
 $txt['calendar_repeat_adjustment_label'] = 'Apply changes to';
 $txt['calendar_repeat_adjustment_this_only'] = 'Only this occurrence';
 $txt['calendar_repeat_adjustment_this_and_future'] = 'This and future occurrences';
-$txt['calendar_repeat_adjustment_confirm'] = 'Are you sure you want to apply these changes to all future occurrences?-n--n-WARNING: if you select both "Delete" and "This and future occurrences", you will delete this and all future occurrences.';
+$txt['calendar_repeat_adjustment_confirm'] = 'Are you sure you want to apply these changes to all future occurrences?-n--n-WARNING: if you select "This and future occurrences" and the click the "Delete" button, you will delete this and all future occurrences.';
 $txt['calendar_repeat_delete_label'] = 'Delete';
-$txt['calendar_confirm_occurrence_delete'] = 'Are you sure you want to delete this occurrence of the event?-n--n-WARNING: if you select both "Delete" and "This and future occurrences", you will delete this and all future occurrences.';
+$txt['calendar_confirm_occurrence_delete'] = 'Are you sure you want to delete this occurrence of the event?-n--n-WARNING: if you selected "This and future occurrences" above, you will delete this and all future occurrences.';
 $txt['calendar_repeat_adjustment_edit_first'] = 'Edit original event';
 
 // Used to show a human-readable explanation of the recurrence rule for a repeating event.

Themes/default/Calendar.template.php

@@ -880,7 +880,19 @@ function template_event_post()
 
 	echo '
 					<div class="buttonlist">
-						<input type="submit" value="', empty(Utils::$context['event']->new) ? Lang::$txt['save'] : Lang::$txt['post'], '" class="button floatright">
+						<input type="submit" value="', empty(Utils::$context['event']->new) ? Lang::$txt['save'] : Lang::$txt['post'], '" class="button floatright">';
+
+	if (!Utils::$context['event']->new) {
+		echo '
+						<input type="submit" name="deleteevent" value="', Lang::$txt['calendar_repeat_delete_label'], '" class="button floatright you_sure" data-confirm="', Utils::$context['event']->selected_occurrence->is_first ? Lang::$txt['calendar_confirm_delete'] : Lang::$txt['calendar_confirm_occurrence_delete'], '">';
+
+		if (!Utils::$context['event']->selected_occurrence->is_first) {
+			echo '
+						<a href="', Utils::$context['event']->modify_href, '" class="button floatright">', Lang::$txt['calendar_repeat_adjustment_edit_first'], '</a>';
+		}
+	}
+
+	echo '
 					</div>
 					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
 				</div><!-- .roundframe -->

Themes/default/EventEditor.template.php

@@ -298,13 +298,6 @@ function template_occurrence_options()
 	if (Utils::$context['event']->selected_occurrence->can_affect_future) {
 		echo '
 						<dl id="occurrence_options">
-							<dt class="clear">
-								<label for="deleteevent">', Lang::$txt['calendar_repeat_delete_label'], '</label>
-							</dt>
-							<dd>
-									<input type="checkbox" name="deleteevent" id="deleteevent" class="you_sure" data-confirm="' . Lang::$txt['calendar_confirm_occurrence_delete'] . '">
-							</dd>
-
 							<dt class="clear">
 								', Lang::$txt['calendar_repeat_adjustment_label'], '
 							</dt>
@@ -321,14 +314,6 @@ function template_occurrence_options()
 							</dd>
 						</dl>';
 	}
-
-	echo '
-						<dl>
-							<dt class="clear"></dt>
-							<dd>
-								<a href="', Utils::$context['event']->modify_href, '" class="smalltext bbc_link">', Lang::$txt['calendar_repeat_adjustment_edit_first'], '</a>
-							</dd>
-						</dl>';
 }
 
 /**