[Bedework-commit] bedework r1819 - in releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources: default/default resources

[svnadmin at bedework.org]

Author: johnsa
Date: 2008-04-11 17:11:15 -0400 (Fri, 11 Apr 2008)
New Revision: 1819

Modified:
   releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl
   releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js
Log:
admin client: support for basic image URL x-property in UI

Modified: releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl	2008-04-11 21:10:57 UTC (rev 1818)
+++ releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl	2008-04-11 21:11:15 UTC (rev 1819)
@@ -1060,8 +1060,8 @@
         </xsl:otherwise>
       </xsl:choose>
 
-      <xsl:for-each select="form/xproperties/xproperty">
-        <xsl:variable name="xprop"><xsl:value-of select="@name"/><xsl:value-of select="pars"/>:<xsl:value-of select="value"/></xsl:variable>
+      <xsl:for-each select="form/xproperties/node()">
+        <xsl:variable name="xprop"><xsl:value-of select="name()"/><xsl:for-each select="parameters/node()">;<xsl:value-of select="name()"/>=<xsl:value-of select="node()"/></xsl:for-each>:<xsl:value-of select="values/text"/></xsl:variable>
         <input type="hidden" name="xproperty" value="{$xprop}"/>
       </xsl:for-each>
 
@@ -2060,7 +2060,7 @@
         <!-- Url -->
         <tr>
           <td class="optional">
-            URL:
+            Event URL:
           </td>
           <td>
             <xsl:copy-of select="form/link/*"/>
@@ -2076,8 +2076,8 @@
           <td>
             <input type="hidden" name="xproperty" id="X-BEDEWORK-IMAGE"/>
             <input type="text" name="xBwImageHolder" value="" class="edit" size="30">
-              <xsl:if test="form/xproperties/xproperty[@name='X-BEDEWORK-IMAGE']">
-                <xsl:attribute name="value"><xsl:value-of select="form/xproperties/xproperty[@name='X-BEDEWORK-IMAGE']/value"/></xsl:attribute>
+              <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']">
+                <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute>
               </xsl:if>
             </input>
             <xsl:text> </xsl:text>

Modified: releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js
===================================================================
--- releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js	2008-04-11 21:10:57 UTC (rev 1818)
+++ releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js	2008-04-11 21:11:15 UTC (rev 1819)
@@ -340,8 +340,11 @@
 }
 function setBedeworkXProperties(formObj) {
   // set up specific Bedework X-Properties
-  var xBwImage = document.getElementById("X-BEDEWORK-IMAGE");
-  xBwImage.value = "X-BEDEWORK-IMAGE:" + formObj["xBwImageHolder"].value;
+  if (formObj["xBwImageHolder"].value != '') {
+    var xBwImage = document.getElementById("X-BEDEWORK-IMAGE");
+    // the fake description parameter is temporary
+    xBwImage.value = "X-BEDEWORK-IMAGE;X-BEDEWORK-PARAM-DESCRIPTION=anImage:" + formObj["xBwImageHolder"].value;
+  }
 }
 function swapAllDayEvent(obj) {
   allDayStartDateField = document.getElementById("allDayStartDateField");