Changeset 1818

Show
Ignore:
Timestamp:
04/11/08 17:10:57
Author:
johnsa
Message:

admin client: support for basic image URL x-property in UI

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r1812 r1818  
    10611061      </xsl:choose> 
    10621062 
    1063       <xsl:for-each select="form/xproperties/xproperty"> 
    1064         <xsl:variable name="xprop"><xsl:value-of select="@name"/><xsl:value-of select="pars"/>:<xsl:value-of select="value"/></xsl:variable> 
     1063      <xsl:for-each select="form/xproperties/node()"> 
     1064        <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> 
    10651065        <input type="hidden" name="xproperty" value="{$xprop}"/> 
    10661066      </xsl:for-each> 
    …… 
    20612061        <tr> 
    20622062          <td class="optional"> 
    2063             URL: 
     2063            Event URL: 
    20642064          </td> 
    20652065          <td> 
    …… 
    20772077            <input type="hidden" name="xproperty" id="X-BEDEWORK-IMAGE"/> 
    20782078            <input type="text" name="xBwImageHolder" value="" class="edit" size="30"> 
    2079               <xsl:if test="form/xproperties/xproperty[@name='X-BEDEWORK-IMAGE']"> 
    2080                 <xsl:attribute name="value"><xsl:value-of select="form/xproperties/xproperty[@name='X-BEDEWORK-IMAGE']/value"/></xsl:attribute> 
     2079              <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']"> 
     2080                <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute> 
    20812081              </xsl:if> 
    20822082            </input> 

  • trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js

    r1812 r1818  
    341341function setBedeworkXProperties(formObj) { 
    342342  // set up specific Bedework X-Properties 
    343   var xBwImage = document.getElementById("X-BEDEWORK-IMAGE"); 
    344   xBwImage.value = "X-BEDEWORK-IMAGE:" + formObj["xBwImageHolder"].value; 
     343  if (formObj["xBwImageHolder"].value != '') { 
     344    var xBwImage = document.getElementById("X-BEDEWORK-IMAGE"); 
     345    // the fake description parameter is temporary 
     346    xBwImage.value = "X-BEDEWORK-IMAGE;X-BEDEWORK-PARAM-DESCRIPTION=anImage:" + formObj["xBwImageHolder"].value; 
     347  } 
    345348} 
    346349function swapAllDayEvent(obj) {