From 520491b6339b323263cb3439324ba4c140051cbc Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Thu, 27 May 2004 05:45:30 +0000
Subject: [PATCH] FIxed line feeds

---
 calendar/event_edit.html |  73 +++++++++++++++++++++++++++-
 calendar/event_new.html  | 100 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 171 insertions(+), 2 deletions(-)

diff --git a/calendar/event_edit.html b/calendar/event_edit.html
index 6c2ba0413b..18c036b6ba 100644
--- a/calendar/event_edit.html
+++ b/calendar/event_edit.html
@@ -1 +1,72 @@
-<form method="post" action="event.php" name="edit">
<table cellpadding=5>
  <tr>
    <td style="vertical-align: top; text-align: right;">
      <?php print_string('eventname', 'calendar'); ?>:
    </td>
    <td>
      <input type="text" name="name" size="67" value="<?php p($form->name); ?>" />
      <?php if (isset($err['name'])) formerr($err['name']); ?>
    </td>
  </tr>
  <tr>
    <td style="vertical-align: top; text-align: right;">
      <?php print_string('eventdescription', 'calendar'); ?>:
    </td>
    <td>
      <?php
          print_textarea($usehtmleditor, 10, 65, 630, 400, "description", $form->description);
          if (isset($err['description'])) formerr($err['description']);
      ?>
    </td>
  </tr>
  <tr>
    <td style="vertical-align: top; text-align: right;"><?php print_string('eventdate', 'calendar'); ?>:</td>
    <td>
      <?php print_date_selector('startday', 'startmon', 'startyr', $form->timestart);?>
      <?php print_string('eventtime', 'calendar');?>
      <?php print_time_selector('starthr', 'startmin', $form->timestart) ?>
      <?php if (isset($err['timestart'])) formerr($err['timestart']); ?>
    </td>
  </tr>
  <tr>
    <td style="vertical-align: top; text-align: right;">
      <?php print_string('eventduration', 'calendar'); ?>:
    </td>
    <td>
      <div>
        <input type="radio" name="duration" value="0" id="duration_none" <?php if($form->duration == 0) echo 'checked="checked"'; ?>/>
        <label for="duration_none">
          <?php print_string('durationnone', 'calendar'); ?>
        </label>
      </div>
      <div>
        <input type="radio" name="duration" value="1" id="duration_yes" <?php if($form->duration == 1) echo 'checked="checked"'; ?>/>
        <label for="duration_yes">
          <?php print_string('durationuntil', 'calendar'); ?>
        </label>
        <?php print_date_selector('endday', 'endmon', 'endyr', $form->timestart + $form->timeduration);?>
        <?php print_string('eventtime', 'calendar');?>
        <?php print_time_selector('endhr', 'endmin', $form->timestart + $form->timeduration) ?>
        <?php if (isset($err['timeduration'])) formerr($err['timeduration']); ?>
      </div>
      <div>
        <input type="radio" name="duration" value="2" id="duration_minutes" <?php if($form->duration == 2) echo 'checked="checked"'; ?>/>
        <label for="duration_minutes"><?php print_string('durationminutes', 'calendar'); ?>:</label>
        <input type="text" name="minutes" size="3" value="<?php p($form->minutes); ?>" />
        <?php if (isset($err['minutes'])) formerr($err['minutes']); ?>
      </div>
    </td>
  </tr>
  <tr>
    <td align="center" colspan="2"><p><input type="submit" value="<?php print_string('savechanges') ?>"></p></td>
  </tr>
</table>
<p>
<input type="hidden" name="id" value="<?php echo $form->id; ?>" />
<input type="hidden" name="courseid" value="<?php echo $form->courseid; ?>" />
<input type="hidden" name="format" value="<?php echo $form->format; ?>" />
<input type="hidden" name="action" value="edit" />
</p>
</form>
\ No newline at end of file
+<form method="post" action="event.php" name="edit">
+<table cellpadding=5>
+  <tr>
+    <td style="vertical-align: top; text-align: right;">
+      <?php print_string('eventname', 'calendar'); ?>:
+    </td>
+    <td>
+      <input type="text" name="name" size="67" value="<?php p($form->name); ?>" />
+      <?php if (isset($err['name'])) formerr($err['name']); ?>
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top; text-align: right;">
+      <?php print_string('eventdescription', 'calendar'); ?>:
+    </td>
+    <td>
+      <?php
+          print_textarea($usehtmleditor, 10, 65, 630, 400, "description", $form->description);
+          if (isset($err['description'])) formerr($err['description']);
+      ?>
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top; text-align: right;"><?php print_string('eventdate', 'calendar'); ?>:</td>
+    <td>
+      <?php print_date_selector('startday', 'startmon', 'startyr', $form->timestart);?>
+      <?php print_string('eventtime', 'calendar');?>
+      <?php print_time_selector('starthr', 'startmin', $form->timestart) ?>
+      <?php if (isset($err['timestart'])) formerr($err['timestart']); ?>
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top; text-align: right;">
+      <?php print_string('eventduration', 'calendar'); ?>:
+    </td>
+    <td>
+      <div>
+        <input type="radio" name="duration" value="0" id="duration_none" <?php if($form->duration == 0) echo 'checked="checked"'; ?>/>
+        <label for="duration_none">
+          <?php print_string('durationnone', 'calendar'); ?>
+        </label>
+      </div>
+      <div>
+        <input type="radio" name="duration" value="1" id="duration_yes" <?php if($form->duration == 1) echo 'checked="checked"'; ?>/>
+        <label for="duration_yes">
+          <?php print_string('durationuntil', 'calendar'); ?>
+        </label>
+        <?php print_date_selector('endday', 'endmon', 'endyr', $form->timestart + $form->timeduration);?>
+        <?php print_string('eventtime', 'calendar');?>
+        <?php print_time_selector('endhr', 'endmin', $form->timestart + $form->timeduration) ?>
+        <?php if (isset($err['timeduration'])) formerr($err['timeduration']); ?>
+      </div>
+      <div>
+        <input type="radio" name="duration" value="2" id="duration_minutes" <?php if($form->duration == 2) echo 'checked="checked"'; ?>/>
+        <label for="duration_minutes"><?php print_string('durationminutes', 'calendar'); ?>:</label>
+        <input type="text" name="minutes" size="3" value="<?php p($form->minutes); ?>" />
+        <?php if (isset($err['minutes'])) formerr($err['minutes']); ?>
+      </div>
+    </td>
+  </tr>
+  <tr>
+    <td align="center" colspan="2"><p><input type="submit" value="<?php print_string('savechanges') ?>"></p></td>
+  </tr>
+</table>
+<p>
+<input type="hidden" name="id" value="<?php echo $form->id; ?>" />
+<input type="hidden" name="courseid" value="<?php echo $form->courseid; ?>" />
+<input type="hidden" name="format" value="<?php echo $form->format; ?>" />
+<input type="hidden" name="action" value="edit" />
+</p>
+</form>
+
diff --git a/calendar/event_new.html b/calendar/event_new.html
index a4072ec8ae..7fec77dcda 100644
--- a/calendar/event_new.html
+++ b/calendar/event_new.html
@@ -1 +1,99 @@
-<form method="post" action="event.php" name="new">
<table cellpadding=5>
  <tr>
    <td style="vertical-align: top; text-align: right;">
      <?php print_string('eventname', 'calendar'); ?>:
    </td>
    <td>
      <input type="text" name="name" size="67" value="<?php p($form->name); ?>" /> 
      <?php if (isset($err['name'])) formerr($err['name']); ?>
    </td>
  </tr>
  <tr>
    <td style="vertical-align: top; text-align: right;">
      <?php print_string('eventdescription', 'calendar'); ?>:
    </td>
    <td>
    <?php 
        print_textarea($usehtmleditor, 10, 65, 630, 200, "description", $form->description);
        if (isset($err['description'])) formerr($err['description']); 
    ?>
    </td>
  </tr>
  <tr>
    <td style="vertical-align: top; text-align: right;">
      <?php print_string('eventdate', 'calendar'); ?>:
    </td>
    <td>
      <?php print_date_selector('startday', 'startmon', 'startyr', $form->timestart);?> 
      <?php print_string('eventtime', 'calendar');?> 
      <?php print_time_selector('starthr', 'startmin', $form->timestart) ?>  
      <?php if (isset($err['timestart'])) formerr($err['timestart']); ?>
    </td>
  </tr>
  <tr>
    <td style="vertical-align: top; text-align: right;">
      <?php print_string('eventduration', 'calendar'); ?>:
    </td>
    <td>
      <div>
        <input type="radio" name="duration" value="0" id="duration_none" <?php if($form->duration == 0) echo 'checked="checked"'; ?>/>
        <label for="duration_none"><?php print_string('durationnone', 'calendar'); ?></label>
      </div>
      <div>
        <input type="radio" name="duration" value="1" id="duration_yes" <?php if($form->duration == 1) echo 'checked="checked"'; ?>/>
        <label for="duration_yes"><?php print_string('durationuntil', 'calendar'); ?></label>
        <?php print_date_selector('endday', 'endmon', 'endyr', $form->timestart + $form->timeduration);?> 
        <?php print_string('eventtime', 'calendar');?> 
        <?php print_time_selector('endhr', 'endmin', $form->timestart + $form->timeduration) ?>  
        <?php if (isset($err['timeduration'])) formerr($err['timeduration']); ?>
      </div>
      <div>
        <input type="radio" name="duration" value="2" id="duration_minutes" <?php if($form->duration == 2) echo 'checked="checked"'; ?>/>
        <label for="duration_minutes"><?php print_string('durationminutes', 'calendar'); ?></label>
        <input type="text" name="minutes" size="3" value="<?php p($form->minutes); ?>" /> 
        <?php if (isset($err['minutes'])) formerr($err['minutes']); ?>
      </div>
    </td>
  </tr>

  <tr>
    <td style="vertical-align: top; text-align: right;">
      <?php print_string('eventrepeat', 'calendar'); ?>:
    </td>
    <td>
      <div>
        <input type="radio" name="repeat" value="0" id="repeat_none" <?php if($form->repeat == 0) echo 'checked="checked"'; ?>/>
        <label for="repeat_none">
          <?php print_string('repeatnone', 'calendar'); ?>
        </label>
      </div>
      <div>
        <input type="radio" name="repeat" value="1" id="repeat_yes" <?php if($form->repeat == 1) echo 'checked="checked"'; ?>/>
        <label for="repeat_yes">
          <?php print_string('repeatweeksl', 'calendar'); ?>
        </label>
        <input type="text" name="repeats" size="2" value="<?php p($form->repeats); ?>" /> 
        <?php print_string('repeatweeksr', 'calendar'); ?>
        <?php if (isset($err['repeats'])) formerr($err['repeats']); ?>
      </div>
    </td>
  </tr>

  <tr>
    <td align="center" colspan="2"><p><input type="submit" value="<?php print_string('savechanges') ?>"></p></td>
  </tr>
</table>
<p>
<input type="hidden" name="courseid" value="<?php echo $form->courseid?>" />
<input type="hidden" name="groupid" value="<?php echo $form->groupid?>" />
<input type="hidden" name="userid" value="<?php echo $form->userid?>" />
<input type="hidden" name="modulename" value="<?php echo $form->modulename?>" />
<input type="hidden" name="eventtype" value="<?php echo $form->eventtype?>" />
<input type="hidden" name="instance" value="<?php echo $form->instance?>" />
<input type="hidden" name="format" value="<?php echo $form->format; ?>" />
<input type="hidden" name="action" value="new" />
<input type="hidden" name="type" value="defined" />
</p>
</form>
\ No newline at end of file
+<form method="post" action="event.php" name="new">
+<table cellpadding=5>
+  <tr>
+    <td style="vertical-align: top; text-align: right;">
+      <?php print_string('eventname', 'calendar'); ?>:
+    </td>
+    <td>
+      <input type="text" name="name" size="67" value="<?php p($form->name); ?>" /> 
+      <?php if (isset($err['name'])) formerr($err['name']); ?>
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top; text-align: right;">
+      <?php print_string('eventdescription', 'calendar'); ?>:
+    </td>
+    <td>
+    <?php 
+        print_textarea($usehtmleditor, 10, 65, 630, 200, "description", $form->description);
+        if (isset($err['description'])) formerr($err['description']); 
+    ?>
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top; text-align: right;">
+      <?php print_string('eventdate', 'calendar'); ?>:
+    </td>
+    <td>
+      <?php print_date_selector('startday', 'startmon', 'startyr', $form->timestart);?> 
+      <?php print_string('eventtime', 'calendar');?> 
+      <?php print_time_selector('starthr', 'startmin', $form->timestart) ?>  
+      <?php if (isset($err['timestart'])) formerr($err['timestart']); ?>
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top; text-align: right;">
+      <?php print_string('eventduration', 'calendar'); ?>:
+    </td>
+    <td>
+      <div>
+        <input type="radio" name="duration" value="0" id="duration_none" <?php if($form->duration == 0) echo 'checked="checked"'; ?>/>
+        <label for="duration_none"><?php print_string('durationnone', 'calendar'); ?></label>
+      </div>
+      <div>
+        <input type="radio" name="duration" value="1" id="duration_yes" <?php if($form->duration == 1) echo 'checked="checked"'; ?>/>
+        <label for="duration_yes"><?php print_string('durationuntil', 'calendar'); ?></label>
+        <?php print_date_selector('endday', 'endmon', 'endyr', $form->timestart + $form->timeduration);?> 
+        <?php print_string('eventtime', 'calendar');?> 
+        <?php print_time_selector('endhr', 'endmin', $form->timestart + $form->timeduration) ?>  
+        <?php if (isset($err['timeduration'])) formerr($err['timeduration']); ?>
+      </div>
+      <div>
+        <input type="radio" name="duration" value="2" id="duration_minutes" <?php if($form->duration == 2) echo 'checked="checked"'; ?>/>
+        <label for="duration_minutes"><?php print_string('durationminutes', 'calendar'); ?></label>
+        <input type="text" name="minutes" size="3" value="<?php p($form->minutes); ?>" /> 
+        <?php if (isset($err['minutes'])) formerr($err['minutes']); ?>
+      </div>
+    </td>
+  </tr>
+
+  <tr>
+    <td style="vertical-align: top; text-align: right;">
+      <?php print_string('eventrepeat', 'calendar'); ?>:
+    </td>
+    <td>
+      <div>
+        <input type="radio" name="repeat" value="0" id="repeat_none" <?php if($form->repeat == 0) echo 'checked="checked"'; ?>/>
+        <label for="repeat_none">
+          <?php print_string('repeatnone', 'calendar'); ?>
+        </label>
+      </div>
+      <div>
+        <input type="radio" name="repeat" value="1" id="repeat_yes" <?php if($form->repeat == 1) echo 'checked="checked"'; ?>/>
+        <label for="repeat_yes">
+          <?php print_string('repeatweeksl', 'calendar'); ?>
+        </label>
+        <input type="text" name="repeats" size="2" value="<?php p($form->repeats); ?>" /> 
+        <?php print_string('repeatweeksr', 'calendar'); ?>
+        <?php if (isset($err['repeats'])) formerr($err['repeats']); ?>
+      </div>
+    </td>
+  </tr>
+
+  <tr>
+    <td align="center" colspan="2"><p><input type="submit" value="<?php print_string('savechanges') ?>"></p></td>
+  </tr>
+</table>
+<p>
+<input type="hidden" name="courseid" value="<?php echo $form->courseid?>" />
+<input type="hidden" name="groupid" value="<?php echo $form->groupid?>" />
+<input type="hidden" name="userid" value="<?php echo $form->userid?>" />
+<input type="hidden" name="modulename" value="<?php echo $form->modulename?>" />
+<input type="hidden" name="eventtype" value="<?php echo $form->eventtype?>" />
+<input type="hidden" name="instance" value="<?php echo $form->instance?>" />
+<input type="hidden" name="format" value="<?php echo $form->format; ?>" />
+<input type="hidden" name="action" value="new" />
+<input type="hidden" name="type" value="defined" />
+</p>
+</form>
+
-- 
2.39.5