FIxed line feeds

diff --git a/calendar/event_edit.html b/calendar/event_edit.html
index 6c2ba0413b56d85c313dca24e663a537de784703..18c036b6ba94e376c5d09812e2ba600161773dd3 100644 (file)
--- a/calendar/event_edit.html
+++ b/calendar/event_edit.html
@@ -1 +1,72 @@
-<form method="post" action="event.php" name="edit">\r<table cellpadding=5>\r  <tr>\r    <td style="vertical-align: top; text-align: right;">\r      <?php print_string('eventname', 'calendar'); ?>:\r    </td>\r    <td>\r      <input type="text" name="name" size="67" value="<?php p($form->name); ?>" />\r      <?php if (isset($err['name'])) formerr($err['name']); ?>\r    </td>\r  </tr>\r  <tr>\r    <td style="vertical-align: top; text-align: right;">\r      <?php print_string('eventdescription', 'calendar'); ?>:\r    </td>\r    <td>\r      <?php\r          print_textarea($usehtmleditor, 10, 65, 630, 400, "description", $form->description);\r          if (isset($err['description'])) formerr($err['description']);\r      ?>\r    </td>\r  </tr>\r  <tr>\r    <td style="vertical-align: top; text-align: right;"><?php print_string('eventdate', 'calendar'); ?>:</td>\r    <td>\r      <?php print_date_selector('startday', 'startmon', 'startyr', $form->timestart);?>\r      <?php print_string('eventtime', 'calendar');?>\r      <?php print_time_selector('starthr', 'startmin', $form->timestart) ?>\r      <?php if (isset($err['timestart'])) formerr($err['timestart']); ?>\r    </td>\r  </tr>\r  <tr>\r    <td style="vertical-align: top; text-align: right;">\r      <?php print_string('eventduration', 'calendar'); ?>:\r    </td>\r    <td>\r      <div>\r        <input type="radio" name="duration" value="0" id="duration_none" <?php if($form->duration == 0) echo 'checked="checked"'; ?>/>\r        <label for="duration_none">\r          <?php print_string('durationnone', 'calendar'); ?>\r        </label>\r      </div>\r      <div>\r        <input type="radio" name="duration" value="1" id="duration_yes" <?php if($form->duration == 1) echo 'checked="checked"'; ?>/>\r        <label for="duration_yes">\r          <?php print_string('durationuntil', 'calendar'); ?>\r        </label>\r        <?php print_date_selector('endday', 'endmon', 'endyr', $form->timestart + $form->timeduration);?>\r        <?php print_string('eventtime', 'calendar');?>\r        <?php print_time_selector('endhr', 'endmin', $form->timestart + $form->timeduration) ?>\r        <?php if (isset($err['timeduration'])) formerr($err['timeduration']); ?>\r      </div>\r      <div>\r        <input type="radio" name="duration" value="2" id="duration_minutes" <?php if($form->duration == 2) echo 'checked="checked"'; ?>/>\r        <label for="duration_minutes"><?php print_string('durationminutes', 'calendar'); ?>:</label>\r        <input type="text" name="minutes" size="3" value="<?php p($form->minutes); ?>" />\r        <?php if (isset($err['minutes'])) formerr($err['minutes']); ?>\r      </div>\r    </td>\r  </tr>\r  <tr>\r    <td align="center" colspan="2"><p><input type="submit" value="<?php print_string('savechanges') ?>"></p></td>\r  </tr>\r</table>\r<p>\r<input type="hidden" name="id" value="<?php echo $form->id; ?>" />\r<input type="hidden" name="courseid" value="<?php echo $form->courseid; ?>" />\r<input type="hidden" name="format" value="<?php echo $form->format; ?>" />\r<input type="hidden" name="action" value="edit" />\r</p>\r</form>\r
\ 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 a4072ec8aecf04d0d579afad429fd06df3b3c7ea..7fec77dcdac8025d4c1da18a74bc3e79d760fd79 100644 (file)
--- a/calendar/event_new.html
+++ b/calendar/event_new.html
@@ -1 +1,99 @@
-<form method="post" action="event.php" name="new">\r<table cellpadding=5>\r  <tr>\r    <td style="vertical-align: top; text-align: right;">\r      <?php print_string('eventname', 'calendar'); ?>:\r    </td>\r    <td>\r      <input type="text" name="name" size="67" value="<?php p($form->name); ?>" /> \r      <?php if (isset($err['name'])) formerr($err['name']); ?>\r    </td>\r  </tr>\r  <tr>\r    <td style="vertical-align: top; text-align: right;">\r      <?php print_string('eventdescription', 'calendar'); ?>:\r    </td>\r    <td>\r    <?php \r        print_textarea($usehtmleditor, 10, 65, 630, 200, "description", $form->description);\r        if (isset($err['description'])) formerr($err['description']); \r    ?>\r    </td>\r  </tr>\r  <tr>\r    <td style="vertical-align: top; text-align: right;">\r      <?php print_string('eventdate', 'calendar'); ?>:\r    </td>\r    <td>\r      <?php print_date_selector('startday', 'startmon', 'startyr', $form->timestart);?> \r      <?php print_string('eventtime', 'calendar');?> \r      <?php print_time_selector('starthr', 'startmin', $form->timestart) ?>  \r      <?php if (isset($err['timestart'])) formerr($err['timestart']); ?>\r    </td>\r  </tr>\r  <tr>\r    <td style="vertical-align: top; text-align: right;">\r      <?php print_string('eventduration', 'calendar'); ?>:\r    </td>\r    <td>\r      <div>\r        <input type="radio" name="duration" value="0" id="duration_none" <?php if($form->duration == 0) echo 'checked="checked"'; ?>/>\r        <label for="duration_none"><?php print_string('durationnone', 'calendar'); ?></label>\r      </div>\r      <div>\r        <input type="radio" name="duration" value="1" id="duration_yes" <?php if($form->duration == 1) echo 'checked="checked"'; ?>/>\r        <label for="duration_yes"><?php print_string('durationuntil', 'calendar'); ?></label>\r        <?php print_date_selector('endday', 'endmon', 'endyr', $form->timestart + $form->timeduration);?> \r        <?php print_string('eventtime', 'calendar');?> \r        <?php print_time_selector('endhr', 'endmin', $form->timestart + $form->timeduration) ?>  \r        <?php if (isset($err['timeduration'])) formerr($err['timeduration']); ?>\r      </div>\r      <div>\r        <input type="radio" name="duration" value="2" id="duration_minutes" <?php if($form->duration == 2) echo 'checked="checked"'; ?>/>\r        <label for="duration_minutes"><?php print_string('durationminutes', 'calendar'); ?></label>\r        <input type="text" name="minutes" size="3" value="<?php p($form->minutes); ?>" /> \r        <?php if (isset($err['minutes'])) formerr($err['minutes']); ?>\r      </div>\r    </td>\r  </tr>\r\r  <tr>\r    <td style="vertical-align: top; text-align: right;">\r      <?php print_string('eventrepeat', 'calendar'); ?>:\r    </td>\r    <td>\r      <div>\r        <input type="radio" name="repeat" value="0" id="repeat_none" <?php if($form->repeat == 0) echo 'checked="checked"'; ?>/>\r        <label for="repeat_none">\r          <?php print_string('repeatnone', 'calendar'); ?>\r        </label>\r      </div>\r      <div>\r        <input type="radio" name="repeat" value="1" id="repeat_yes" <?php if($form->repeat == 1) echo 'checked="checked"'; ?>/>\r        <label for="repeat_yes">\r          <?php print_string('repeatweeksl', 'calendar'); ?>\r        </label>\r        <input type="text" name="repeats" size="2" value="<?php p($form->repeats); ?>" /> \r        <?php print_string('repeatweeksr', 'calendar'); ?>\r        <?php if (isset($err['repeats'])) formerr($err['repeats']); ?>\r      </div>\r    </td>\r  </tr>\r\r  <tr>\r    <td align="center" colspan="2"><p><input type="submit" value="<?php print_string('savechanges') ?>"></p></td>\r  </tr>\r</table>\r<p>\r<input type="hidden" name="courseid" value="<?php echo $form->courseid?>" />\r<input type="hidden" name="groupid" value="<?php echo $form->groupid?>" />\r<input type="hidden" name="userid" value="<?php echo $form->userid?>" />\r<input type="hidden" name="modulename" value="<?php echo $form->modulename?>" />\r<input type="hidden" name="eventtype" value="<?php echo $form->eventtype?>" />\r<input type="hidden" name="instance" value="<?php echo $form->instance?>" />\r<input type="hidden" name="format" value="<?php echo $form->format; ?>" />\r<input type="hidden" name="action" value="new" />\r<input type="hidden" name="type" value="defined" />\r</p>\r</form>\r
\ 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>
+