Set and save event status.

diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
index c7c4e2f..0be1323 100644 (file)
--- a/kronolith/js/kronolith.js
+++ b/kronolith/js/kronolith.js
@@ -3497,6 +3497,7 @@ KronolithCore = {
         $('kronolithEventStartTime').setValue(ev.st);
         $('kronolithEventEndDate').setValue(ev.ed);
         $('kronolithEventEndTime').setValue(ev.et);
+        $('kronolithEventStatus').setValue(ev.x);
         $('kronolithEventDescription').setValue(ev.d);
         $('kronolithEventLinkExport').up().show();
         $('kronolithEventExport').href = Kronolith.conf.URI_EVENT_EXPORT.interpolate({ id: ev.id, calendar: ev.c, type: ev.ty });

diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 4888973..19241e9 100644 (file)
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -1300,8 +1300,9 @@ class Kronolith
      *
      * @return string  The HTML <select> widget.
      */
-    public static function buildStatusWidget($name, $current = self::STATUS_CONFIRMED,
-                               $any = false)
+    public static function buildStatusWidget($name,
+                                             $current = self::STATUS_CONFIRMED,
+                                             $any = false)
     {
         $html = "<select id=\"$name\" name=\"$name\">";
 

diff --git a/kronolith/templates/index/edit.inc b/kronolith/templates/index/edit.inc
index 88411b6..938ae6e 100644 (file)
--- a/kronolith/templates/index/edit.inc
+++ b/kronolith/templates/index/edit.inc
@@ -40,11 +40,11 @@
 
 <div id="kronolithEventBasics">
   <label><?php echo _("Status") ?>:
-    <select name="eventfreebusy" id="kronolithEventFreeBusy">
-      <option value="Free"><?php echo _("Free") ?></option>
-      <option value="Tentative"><?php echo _("Tentative") ?></option>
-      <option value="Busy" selected="selected"><?php echo _("Busy") ?></option>
-      <option value="Cancelled"><?php echo _("Cancelled") ?></option>
+    <select name="status" id="kronolithEventStatus">
+      <option value="<?php echo Kronolith::STATUS_FREE ?>"><?php echo _("Free") ?></option>
+      <option value="<?php echo Kronolith::STATUS_TENTATIVE ?>"><?php echo _("Tentative") ?></option>
+      <option value="<?php echo Kronolith::STATUS_CONFIRMED ?>" selected="selected"><?php echo _("Confirmed") ?></option>
+      <option value="<?php echo Kronolith::STATUS_CANCELLED ?>"><?php echo _("Cancelled") ?></option>
     </select>
   </label>
   <span class="kronolithSeparator">|</span>