We cannot have mutliple occurrence fields because it just doens't work well with recursion and occurrence being 0
We cannot have mutliple occurrence fields because it just doens't work well with recursion and occurrence being 0
diff --git a/templates/editevent_recur.tpl b/templates/editevent_recur.tpl
index da14cd8..183fae6 100644
--- a/templates/editevent_recur.tpl
+++ b/templates/editevent_recur.tpl
@@ -28,14 +28,16 @@ $errorbox
Recursion:
+<div>Occurrence: <input name="occurrence" type="text" value="{$event->values['occurrence']}" size="3" maxlength="3" /></div>
+
<fieldset>
<legend><input name="recur" type="radio" value="$recur[day]"<if condition="$event->values['pattern'] & RECUR_DAY"> checked="checked"</if> /> Daily Recurrence</legend>
- Recur every <input name="occurrence" type="text" value="{$event->values['occurrence']}" size="3" maxlength="3" /> days.
+ Recur every specified number of days.
</fieldset>
<fieldset>
<legend><input name="recur" type="radio" value="$recur[week]"<if condition="$event->values['pattern'] & RECUR_WEEK"> checked="checked"</if> /> Weekly Recurrence</legend>
- Recur every <input name="occurrence" type="text" value="{$event->values['occurrence']}" size="3" maxlength="3" /> weeks on:
+ Recur every specified number of weeks weeks on:
<input name="days[]" type="checkbox" value="$days[monday]"<if condition="$event->values['pattern'] & DAY_MONDAY"> checked="checked"</if> /> Monday
<input name="days[]" type="checkbox" value="$days[tuesday]"<if condition="$event->values['pattern'] & DAY_TUESDAY"> checked="checked"</if> /> Tuesday
<input name="days[]" type="checkbox" value="$days[wednesday]"<if condition="$event->values['pattern'] & DAY_WEDNESDAY"> checked="checked"</if> /> Wednesday
@@ -47,12 +49,12 @@ Recursion:
<fieldset>
<legend><input name="recur" type="radio" value="$recur[month]"<if condition="$event->values['pattern'] & RECUR_MONTH"> checked="checked"</if> /> Montly Recurrence</legend>
- Recur every <input name="occurrence" type="text" value="{$event->values['occurrence']}" size="3" maxlength="3" /> months.
+ Recur every specified number of months.
</fieldset>
<fieldset>
<legend><input name="recur" type="radio" value="$recur[year]"<if condition="$event->values['pattern'] & RECUR_YEAR"> checked="checked"</if> /> Yearly Recurrence</legend>
- Recur every <input name="occurrence" type="text" value="{$event->values['occurrence']}" size="3" maxlength="3" /> years.
+ Recur every specified number of years.
</fieldset>
<div>
diff --git a/templates/newevent_recur.tpl b/templates/newevent_recur.tpl
index 5877b07..dd7b3c0 100644
--- a/templates/newevent_recur.tpl
+++ b/templates/newevent_recur.tpl
@@ -26,14 +26,16 @@ $errorbox
Recursion:
+<div>Occurrence: <input name="occurrence" type="text" value="{$event->values['occurrence']}" size="3" maxlength="3" /></div>
+
<fieldset>
<legend><input name="recur" type="radio" value="$recur[day]" /> Daily Recurrence</legend>
- Recur every <input name="occurrence" type="text" value="{$event->values['occurrence']}" size="3" maxlength="3" /> days.
+ Recur every specified number of days.
</fieldset>
<fieldset>
<legend><input name="recur" type="radio" value="$recur[week]" /> Weekly Recurrence</legend>
- Recur every <input name="occurrence" type="text" value="{$event->values['occurrence']}" size="3" maxlength="3" /> weeks on:
+ Recur every specified number of weeks weeks on:
<input name="days[]" type="checkbox" value="$days[monday]" /> Monday
<input name="days[]" type="checkbox" value="$days[tuesday]" /> Tuesday
<input name="days[]" type="checkbox" value="$days[wednesday]" /> Wednesday
@@ -45,12 +47,12 @@ Recursion:
<fieldset>
<legend><input name="recur" type="radio" value="$recur[month]" /> Montly Recurrence</legend>
- Recur every <input name="occurrence" type="text" value="{$event->values['occurrence']}" size="3" maxlength="3" /> months.
+ Recur every specified number of months.
</fieldset>
<fieldset>
<legend><input name="recur" type="radio" value="$recur[year]" /> Yearly Recurrence</legend>
- Recur every <input name="occurrence" type="text" value="{$event->values['occurrence']}" size="3" maxlength="3" /> years.
+ Recur every specified number of years.
</fieldset>
<div>