Changeset 181

Timestamp:

02/22/06 14:26:32

Author:

johnsa

Message:

event class had a comment for the three event status values; filled them in.

added status field to event pages in admin

Files:

• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwEvent.java (modified) (1 diff)
• trunk/calendar3/deployment/webadmin/webapp/resources/resources/calendarDescriptions.css (modified) (1 diff)
• trunk/calendar3/webadmin/war/docs/event/delEventList.jsp (modified) (1 diff)
• trunk/calendar3/webadmin/war/docs/event/displayEventCommon.jsp (modified) (1 diff)
• trunk/calendar3/webadmin/war/docs/event/emitEvent.jsp (modified) (1 diff)

trunk/calendar3/calFacade/src/org/bedework/calfacade/BwEvent.java

@@ -483 +483 @@
-
-  /** Set the event's status - must be one of
-
+  CONFIRMED, TENTATIVE, or CANCELLED
-   *
-   *  @param val     status

trunk/calendar3/deployment/webadmin/webapp/resources/resources/calendarDescriptions.css

@@ -2 +2 @@
-  display: none;
-}
+
+/*#calendarTree {
+  height: 300px;
+  overflow : auto;
+}*/
+

trunk/calendar3/webadmin/war/docs/event/delEventList.jsp

@@ -5 +5 @@
-
-<page>deleteEventList</page>
-
-<%--
-  This is wrong
-<events>
-  <logic:iterate id="fevent" name="peForm" property="formattedEvents" >
-    <%@include file="/docs/event/emitEvent.jsp"%>
-  </logic:iterate>
-</events>
---%>
-
-<formElements>

trunk/calendar3/webadmin/war/docs/event/displayEventCommon.jsp

@@ -47 +47 @@
-  <desc><bean:write name="peForm" property="event.description"/></desc>
-
+  <status><bean:write name="peForm" property="event.status"/></status>
-  <link><bean:write name="peForm" property="event.link"/></link>
-  <cost><bean:write name="peForm" property="event.cost"/></cost>

trunk/calendar3/webadmin/war/docs/event/emitEvent.jsp

@@ -20 +20 @@
-  </calendar>
-  <desc><bean:write name="formattedEvent" property="event.description" /></desc>
+  <status><bean:write name="formattedEvent" property="event.status" /></status>
-  <link><bean:write name="formattedEvent" property="event.link" /></link>
-  <cost><bean:write name="formattedEvent" property="event.cost" /></cost>