[Bedework-commit] webapps r718 - releases/bedework-3.4.1.1/webadmin/war/docs/event

[svnadmin at bedework.org]

Author: douglm
Date: 2008-04-11 02:14:49 -0400 (Fri, 11 Apr 2008)
New Revision: 718

Modified:
   releases/bedework-3.4.1.1/webadmin/war/docs/event/emitEventDetail.jsp
   releases/bedework-3.4.1.1/webadmin/war/docs/event/eventForm.jsp
Log:
Emit x-properties in a form closer to the possible new x-cal standard

Modified: releases/bedework-3.4.1.1/webadmin/war/docs/event/emitEventDetail.jsp
===================================================================
--- releases/bedework-3.4.1.1/webadmin/war/docs/event/emitEventDetail.jsp	2008-04-10 19:18:11 UTC (rev 717)
+++ releases/bedework-3.4.1.1/webadmin/war/docs/event/emitEventDetail.jsp	2008-04-11 06:14:49 UTC (rev 718)
@@ -75,17 +75,27 @@
       </contact>
     </logic:present>
 
-    <logic:present name="event" property="xproperties">
-      <xproperties>
-        <logic:iterate id="xprop" name="event" property="xproperties">
-          <bean:define id="xpropName" name="xprop" property="name"/>
-          <xproperty name="<%=(String)xpropName%>">
-            <bw:emitText name="xprop" property="pars"/>
-            <value><bean:write name="xprop" property="value" filter="false"/></value>
-          </xproperty>
-        </logic:iterate>
-      </xproperties>
-    </logic:present>
-
-
-
+    <logic:present name="event" property="xproperties">
+      <xproperties>
+        <logic:iterate id="xprop" name="event" property="xproperties">
+          <bean:define id="xpropName" name="xprop" property="name"/>
+          <% String xpropStart = "<" + (String)xpropName + ">";
+             String xpropEnd = "</" + (String)xpropName + ">";%>
+          <%=xpropStart%>
+            <logic:present name="xprop" property="parameters">
+              <parameters>
+              <logic:iterate id="xpar" name="xprop" property="parameters">
+                <bean:define id="xparName" name="xpar" property="name"/>
+                <% String xparStart = "<" + (String)xparName + ">";
+                   String xparEnd = "</" + (String)xparName + ">";%>
+                <%=xparStart%><bean:write name="xpar" property="value" /><%=xparEnd%>
+              </logic:iterate>
+              </parameters>
+            </logic:present>
+            <values>
+              <text><bean:write name="xprop" property="value" filter="false"/></text>
+            </values>
+          <%=xpropEnd%>
+        </logic:iterate>
+      </xproperties>
+    </logic:present>

Modified: releases/bedework-3.4.1.1/webadmin/war/docs/event/eventForm.jsp
===================================================================
--- releases/bedework-3.4.1.1/webadmin/war/docs/event/eventForm.jsp	2008-04-10 19:18:11 UTC (rev 717)
+++ releases/bedework-3.4.1.1/webadmin/war/docs/event/eventForm.jsp	2008-04-11 06:14:49 UTC (rev 718)
@@ -246,17 +246,30 @@
       </comments>
     </logic:present>
 
-    <logic:present name="calForm" property="event.xproperties">
-      <xproperties>
-        <logic:iterate id="xprop" name="calForm" property="event.xproperties">
-          <bean:define id="xpropName" name="xprop" property="name"/>
-          <xproperty name="<%=(String)xpropName%>">
-            <bw:emitText name="xprop" property="pars"/>
-            <value><bean:write name="xprop" property="value" filter="false"/></value>
-          </xproperty>
-        </logic:iterate>
-      </xproperties>
-    </logic:present>
+    <logic:present name="calForm" property="event.xproperties">
+      <xproperties>
+        <logic:iterate id="xprop" name="calForm" property="event.xproperties">
+          <bean:define id="xpropName" name="xprop" property="name"/>
+          <% String xpropStart = "<" + (String)xpropName + ">";
+             String xpropEnd = "</" + (String)xpropName + ">";%>
+          <%=xpropStart%>
+            <logic:present name="xprop" property="parameters">
+              <parameters>
+              <logic:iterate id="xpar" name="xprop" property="parameters">
+                <bean:define id="xparName" name="xpar" property="name"/>
+                <% String xparStart = "<" + (String)xparName + ">";
+                   String xparEnd = "</" + (String)xparName + ">";%>
+                <%=xparStart%><bean:write name="xpar" property="value" /><%=xparEnd%>
+              </logic:iterate>
+              </parameters>
+            </logic:present>
+            <values>
+              <text><bean:write name="xprop" property="value" filter="false"/></text>
+            </values>
+          <%=xpropEnd%>
+        </logic:iterate>
+      </xproperties>
+    </logic:present>
 
     <!-- these are the values that may be submitted to the update action -->
     <submitButtons>