Changeset 1837

Show
Ignore:
Timestamp:
04/17/08 00:20:54
Author:
johnsa
Message:

admin client: front-end xproperty support

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1830 r1837  
    227227          <script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js">&#160;</script> 
    228228          <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js">&#160;</script> 
     229          <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js">&#160;</script> 
    229230          <xsl:if test="$portalFriendly = 'true'"> 
    230231            <script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js">&#160;</script> 
    …… 
    238239                bwRdates.update('<xsl:value-of select="date"/>','<xsl:value-of select="time"/>',false,false,false,'<xsl:value-of select="tzid"/>'); 
    239240              </xsl:for-each> 
    240               // return string values to be loaded into javascript for rdates 
     241              // return string values to be loaded into javascript for exdates 
    241242              <xsl:for-each select="/bedework/formElements/form/exdates/rdate"> 
    242243                bwExdates.update('<xsl:value-of select="date"/>','<xsl:value-of select="time"/>',false,false,false,'<xsl:value-of select="tzid"/>'); 
     244              </xsl:for-each> 
     245            } 
     246            function initXProperties() { 
     247              <xsl:for-each select="form/xproperties/node()"> 
     248                bwXprops.init('<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"/>"); 
     249                <!-- <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> 
     250                <input type="hidden" name="xproperty" value="{$xprop}" id="name()"/> --> 
    243251              </xsl:for-each> 
    244252            } 
    …… 
    282290        <xsl:choose> 
    283291          <xsl:when test="(/bedework/page='modEvent' or /bedework/page='modEventPending') and /bedework/formElements/recurrenceId=''"> 
    284             <xsl:attribute name="onload">initRXDates();focusFirstElement();</xsl:attribute> 
     292            <xsl:attribute name="onload">initRXDates();initXProperties();focusFirstElement();</xsl:attribute> 
    285293          </xsl:when> 
    286294          <xsl:otherwise> 
    …… 
    10601068        </xsl:otherwise> 
    10611069      </xsl:choose> 
    1062  
    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> 
    1065         <input type="hidden" name="xproperty" value="{$xprop}" id="name()"/> 
    1066       </xsl:for-each> 
    10671070 
    10681071      <xsl:call-template name="submitEventButtons"/> 

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

    r1830 r1837  
    3838 
    3939var rdateDeleteStr = "remove"; 
    40  
    41 // ======================================================================== 
    42 // ======================================================================== 
    43 //   Bedework specific x-properties 
    44  
    45 var bwXpropertyImage = "X-BEDEWORK-IMAGE"; 
    46 var bwXparamDescription = "X-BEDEWORK-PARAM-DESCRIPTION"; 
    47 var bwXparamWidth = "X-BEDEWORK-PARAM-WIDTH"; 
    48 var bwXparamHeight = "X-BEDEWORK-PARAM-HEIGHT"; 
    4940 
    5041// ======================================================================== 
    …… 
    332323  setRecurrence(formObj); 
    333324  setBedeworkXProperties(formObj); 
     325 
    334326  //setAccessHow(formObj,1); 
    335327  //setAccessAcl(formObj); 
    …… 
    347339  formObj["eventEndDate.month"].value = endDate.getMonth() + 1; 
    348340  formObj["eventEndDate.day"].value = endDate.getDate(); 
    349 } 
    350 function setBedeworkXProperties(formObj) { 
    351   // set up specific Bedework X-Properties 
    352  
    353   // X-BEDEWORK-IMAGE and its parameters: 
    354   if (formObj["xBwImageHolder"].value != '') { 
    355     var xprop = bwXpropertyImage + ";" + bwXparamDescription + "=bogusDesc" + ":" + formObj["xBwImageHolder"].value; 
    356     var xBwImage = document.getElementById(bwXpropertyImage); 
    357     if (xBwImage == null) { 
    358       var xBwImageNew = formObj.appendChild(document.createElement("input")); 
    359       xBwImageNew.type = "hidden"; 
    360       xBwImageNew.name = "xproperty"; 
    361       xBwImageNew.id = bwXpropertyImage; 
    362       xBwImageNew.value = xprop; 
    363     } else { 
    364       xBwImage.value = xprop; 
    365     } 
    366   } 
    367341} 
    368342function swapAllDayEvent(obj) { 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl

    r1831 r1837  
    774774        <td colspan="2" class="fieldval description"> 
    775775          <xsl:if test="xproperties/node()[name()='X-BEDEWORK-IMAGE']"> 
    776             <xsl:variable name="bwImageUrl"><xsl:value-of select="xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:variable> 
    777             <img src="{$bwImageUrl}" class="bwEventImage"/> 
     776            <xsl:variable name="bwImage"><xsl:value-of select="xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:variable> 
     777            <img src="{$bwImage}" class="bwEventImage"/> 
    778778          </xsl:if> 
    779779          <xsl:call-template name="replace"> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl

    r1831 r1837  
    767767        <td colspan="2" class="fieldval description"> 
    768768          <xsl:if test="xproperties/node()[name()='X-BEDEWORK-IMAGE']"> 
    769             <xsl:variable name="bwImageUrl"><xsl:value-of select="xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:variable> 
    770             <img src="{$bwImageUrl}" class="bwEventImage"/> 
     769            <xsl:variable name="bwImage"><xsl:value-of select="xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:variable> 
     770            <img src="{$bwImage}" class="bwEventImage"/> 
    771771          </xsl:if> 
    772772          <xsl:call-template name="replace">