Changeset 1824

Show
Ignore:
Timestamp:
04/14/08 16:23:36
Author:
johnsa
Message:

admin client: updates to support x-properties, particularly imageurl x-property

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1821 r1824  
    10631063      <xsl:for-each select="form/xproperties/node()"> 
    10641064        <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> 
    1065         <input type="hidden" name="xproperty" value="{$xprop}"/> 
     1065        <input type="hidden" name="xproperty" value="{$xprop}" id="name()"/> 
    10661066      </xsl:for-each> 
    10671067 
    …… 
    20752075          </td> 
    20762076          <td> 
    2077             <input type="hidden" name="xproperty" id="X-BEDEWORK-IMAGE"/> 
    20782077            <input type="text" name="xBwImageHolder" value="" class="edit" size="30"> 
    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> 
     2078              <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-IMAGEURL']"> 
     2079                <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGEURL']/values/text"/></xsl:attribute> 
    20812080              </xsl:if> 
    20822081            </input> 
    …… 
    21832182                  <td> 
    21842183                    <xsl:for-each select="form/categories/preferred/category[position() &lt;= ceiling($catCount div 2)]"> 
    2185                       <xsl:sort select="keyword" order="ascending"/> 
     2184                      <!-- <xsl:sort select="keyword" order="ascending"/> --> 
    21862185                      <input type="checkbox" name="categoryKey"> 
    21872186                        <xsl:attribute name="value"><xsl:value-of select="keyword"/></xsl:attribute> 
    …… 
    21952194                  <td> 
    21962195                    <xsl:for-each select="form/categories/preferred/category[position() &gt; ceiling($catCount div 2)]"> 
    2197                       <xsl:sort select="keyword" order="ascending"/> 
     2196                      <!-- <xsl:sort select="keyword" order="ascending"/> --> 
    21982197                      <input type="checkbox" name="categoryKey"> 
    21992198                        <xsl:attribute name="value"><xsl:value-of select="keyword"/></xsl:attribute> 

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

    r1818 r1824  
    4040 
    4141// ======================================================================== 
     42// ======================================================================== 
     43//   Bedework specific x-properties 
     44 
     45var bwXpropertyImageUrl = "X-BEDEWORK-IMAGEURL"; 
     46var bwXparamDescription = "X-BEDEWORK-PARAM-DESCRIPTION"; 
     47var bwXparamWidth = "X-BEDEWORK-PARAM-WIDTH"; 
     48var bwXparamHeight = "X-BEDEWORK-PARAM-HEIGHT"; 
     49 
     50// ======================================================================== 
    4251// rdate functions 
    4352// ======================================================================== 
    4453 
    4554/* An rdate 
    46 /* date: String: internal date 
     55 * date: String: internal date 
    4756 * time: String 
    48  * tzid timezone id or null 
     57 * tzid: timezone id or null 
    4958 */ 
    5059function BwREXdate(date, time, allDay, floating, utc, tzid) { 
    …… 
    240249 
    241250/* A comment accompanying a submitted event. 
    242 /* comment: the x-property string X-BEDEWORK-SUBMIT-COMMENT, tab delimited 
     251 * comment: the x-property string X-BEDEWORK-SUBMIT-COMMENT, tab delimited 
    243252 */ 
    244253function bwSubmitComment(comment) { 
    …… 
    341350function setBedeworkXProperties(formObj) { 
    342351  // set up specific Bedework X-Properties 
     352 
     353  // X-BEDEWORK-IMAGEURL and its parameters: 
    343354  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; 
     355    var xprop = bwXpropertyImageUrl + ";" + bwXparamDescription + "=bogusDesc" + ":" + formObj["xBwImageHolder"].value; 
     356    var xBwImage = document.getElementById(bwXpropertyImageUrl); 
     357    if (xBwImage == null) { 
     358      var xBwImageNew = formObj.appendChild(document.createElement("input")); 
     359      xBwImageNew.type = "hidden"; 
     360      xBwImageNew.name = "xproperty"; 
     361      xBwImageNew.id = bwXpropertyImageUrl; 
     362      xBwImageNew.value = xprop; 
     363    } else { 
     364      xBwImage.value = xprop; 
     365    } 
    347366  } 
    348367}