Changeset 2172

Show
Ignore:
Timestamp:
05/14/09 16:36:55
Author:
johnsa
Message:

submissions client: set topical areas as suggested topical areas, not real ones
user clients: remove all references to deprecated subscription ID

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/resources/javascript/bedework/bedeworkXProperties.js

    r2171 r2172  
    3737var bwXPropertyContact = "X-BEDEWORK-CONTACT"; 
    3838var bwXPropertyCategories = "X-BEDEWORK-CATEGORIES"; 
     39var bwXPropertySubmitAlias = "X-BEDEWORK-SUBMIT-ALIAS"; 
    3940var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT"; 
    4041var bwXPropertySubmitStatus = "X-BEDEWORK-SUBMIT-STATUS"; 

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

    r2171 r2172  
    763763  <xsl:template name="tabPendingEvents"> 
    764764    <h2>Pending Events</h2> 
    765     <p>The following events were submitted to the calendar:</p> 
     765    <p>The following events are awaiting moderation:</p> 
    766766    <xsl:call-template name="eventListCommon"> 
    767767      <xsl:with-param name="pending">true</xsl:with-param> 
    …… 
    959959        <th>Start</th> 
    960960        <th>End</th> 
    961         <th>Topical Areas</th> 
    962         <th>Categories</th> 
    963         <!-- <th>Calendar</th> --> 
     961        <th> 
     962          <xsl:if test="/bedework/page='tabPendingEvents'">Suggested </xsl:if> 
     963          Topical Areas 
     964        </th> 
    964965        <th>Description</th> 
    965966      </tr> 
    …… 
    10571058      </td> 
    10581059      <td class="calcat"> 
    1059         <xsl:for-each select="xproperties/X-BEDEWORK-ALIAS"> 
    1060           <xsl:call-template name="substring-afterLastInstanceOf"> 
    1061             <xsl:with-param name="string" select="values/text"/> 
    1062             <xsl:with-param name="char">/</xsl:with-param> 
    1063           </xsl:call-template><br/> 
    1064         </xsl:for-each> 
     1060        <xsl:choose> 
     1061          <xsl:when test="/bedework/page='tabPendingEvents'"> 
     1062            <xsl:for-each select="xproperties/X-BEDEWORK-SUBMIT-ALIAS"> 
     1063              <xsl:call-template name="substring-afterLastInstanceOf"> 
     1064                <xsl:with-param name="string" select="values/text"/> 
     1065                <xsl:with-param name="char">/</xsl:with-param> 
     1066              </xsl:call-template><br/> 
     1067            </xsl:for-each> 
     1068          </xsl:when> 
     1069          <xsl:otherwise> 
     1070            <xsl:for-each select="xproperties/X-BEDEWORK-ALIAS"> 
     1071              <xsl:call-template name="substring-afterLastInstanceOf"> 
     1072                <xsl:with-param name="string" select="values/text"/> 
     1073                <xsl:with-param name="char">/</xsl:with-param> 
     1074              </xsl:call-template><br/> 
     1075            </xsl:for-each> 
     1076          </xsl:otherwise> 
     1077        </xsl:choose> 
    10651078      </td> 
    1066       <td class="calcat"> 
    1067         <xsl:for-each select="categories/category"> 
    1068           <xsl:sort select="keyword"/> 
    1069           <xsl:value-of select="keyword"/><br/> 
    1070         </xsl:for-each> 
    1071       </td> 
    1072       <!-- <td> 
    1073         <xsl:value-of select="calendar/name"/> 
    1074       </td>--> 
    10751079      <td> 
    10761080        <xsl:value-of select="description"/> 
    …… 
    11121116          '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:call-template>', 
    11131117          '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-EMAIL']"/></xsl:call-template>', 
    1114           '<xsl:for-each select="form/xproperties/node()[name()='X-BEDEWORK-ALIAS']/values/text"><xsl:call-template name="escapeApos"><xsl:with-param name="str"><xsl:call-template name="substring-afterLastInstanceOf"><xsl:with-param name="string" select="."/><xsl:with-param name="char">/</xsl:with-param></xsl:call-template></xsl:with-param></xsl:call-template><br/></xsl:for-each>', 
     1118          '<xsl:for-each select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-ALIAS']/values/text"><xsl:call-template name="escapeApos"><xsl:with-param name="str"><xsl:call-template name="substring-afterLastInstanceOf"><xsl:with-param name="string" select="."/><xsl:with-param name="char">/</xsl:with-param></xsl:call-template></xsl:with-param></xsl:call-template><br/></xsl:for-each>', 
    11151119          '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:call-template>', 
    11161120          '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text"/></xsl:call-template>'); 
    …… 
    25982602            <input type="checkbox" name="alias" onclick="toggleBedeworkXProperty('X-BEDEWORK-ALIAS','{$virtualPath}',this.checked)"> 
    25992603              <xsl:attribute name="value"><xsl:value-of select="$virtualPath"/></xsl:attribute> 
    2600               <xsl:if test="path = /bedework/formElements/form/xproperties//X-BEDEWORK-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> 
     2604              <xsl:if test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> 
    26012605            </input> 
    26022606            <xsl:choose> 
    2603               <xsl:when test="path = /bedework/formElements/form/xproperties//X-BEDEWORK-ALIAS/values/text"> 
     2607              <xsl:when test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-ALIAS/values/text"> 
    26042608                <strong><xsl:value-of select="name"/></strong> 
    26052609              </xsl:when> 
    …… 
    26702674              <input type="submit" name="updateSubmitEvent" value="Update Event"/> 
    26712675              <input type="button" name="publishEvent" value="Publish Event" onclick="changeClass('publishBox','visible')"/> 
    2672               <input type="submit" name="cancel" value="Cancel"/> 
     2676              <input type="submit" name="cancelled" value="Cancel"/> 
    26732677            </xsl:when> 
    26742678            <xsl:otherwise> 
    …… 
    26782682                <xsl:attribute name="onclick">doPublishEvent('<xsl:value-of select="form/calendar/all/select/option/@value"/>','<xsl:value-of select="$eventTitle"/>','<xsl:value-of select="$eventUrlPrefix"/>');</xsl:attribute> 
    26792683              </input> 
    2680               <input type="submit" name="cancel" value="Cancel"/> 
     2684              <input type="submit" name="cancelled" value="Cancel"/> 
    26812685            </xsl:otherwise> 
    26822686          </xsl:choose> 

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

    r2171 r2172  
    284284      output += '</table>'; 
    285285    } 
    286     if (this.category != "") { 
     286    // categories: deprecated - there will be no categories because the topical 
     287    // areas selected by the submitter are only suggestions 
     288    /*if (this.category != "") { 
    287289      output += '<p><strong>Type of Event:</strong> (if Topical Areas weren\'t sufficient)<br/>'; 
    288290      output += this.category; 
    289291      output += '</p>'; 
    290     } 
     292    }*/ 
    291293    output += '<p>'; 
    292294    if (this.notes != "") { 

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

    r2171 r2172  
    566566  <!--==== SINGLE EVENT ====--> 
    567567  <xsl:template match="event"> 
    568     <xsl:variable name="subscriptionId" select="subscription/id"/> 
    569568    <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    570569    <xsl:variable name="guid" select="guid"/> 
    …… 
    578577    </xsl:variable> 
    579578    <h2 class="{$statusClass}"> 
    580       <a id="linkToEvent" href="javascript:showLink('{$urlPrefix}/event/eventView.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')" title="generate link to this event"> 
     579      <a id="linkToEvent" href="javascript:showLink('{$urlPrefix}/event/eventView.do?calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')" title="generate link to this event"> 
    581580       link to this event 
    582581     </a> 
    …… 
    724723        <th class="icalIcon" rowspan="2"> 
    725724          <div id="eventIcons"> 
    726             <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
     725            <a href="{$privateCal}/event/addEventRef.do?calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
    727726              <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/> 
    728727              add to my calendar 
    729728            </a> 
    730729            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 
    731             <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
     730            <a href="{$export}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
    732731              <img src="{$resourcesRoot}/images/std-ical_icon.gif" width="20" height="26" border="0" alt="Download this event"/> 
    733732             download</a> 
    …… 
    897896            <xsl:for-each select="event"> 
    898897              <xsl:variable name="id" select="id"/> 
    899               <xsl:variable name="subscriptionId" select="subscription/id"/> 
    900898              <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    901899              <xsl:variable name="guid" select="guid"/> 
    …… 
    926924                                  start/time = end/time"> 
    927925                    <td class="{$dateRangeStyle} center" colspan="3"> 
    928                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     926                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    929927                        <xsl:value-of select="start/time"/> 
    930928                      </a> 
    …… 
    933931                  <xsl:otherwise> 
    934932                    <td class="{$dateRangeStyle} right"> 
    935                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     933                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    936934                      <xsl:choose> 
    937935                        <xsl:when test="start/allday = 'true' and 
    …… 
    950948                    </td> 
    951949                    <td class="{$dateRangeStyle} center"> 
    952                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a> 
     950                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a> 
    953951                    </td> 
    954952                    <td class="{$dateRangeStyle} left"> 
    955                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     953                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    956954                      <xsl:choose> 
    957955                        <xsl:when test="end/allday = 'true' and 
    …… 
    991989                  <xsl:choose> 
    992990                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    993                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     991                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    994992                        <strong> 
    995993                          <xsl:value-of select="summary"/>: 
    …… 
    10271025                    </xsl:when> 
    10281026                    <xsl:otherwise> 
    1029                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1027                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    10301028                        <xsl:value-of select="summary"/> 
    10311029                        <xsl:if test="location/address != ''">, <xsl:value-of select="location/address"/></xsl:if> 
    …… 
    10471045                </td> 
    10481046                <td class="icons"> 
    1049                   <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
     1047                  <a href="{$privateCal}/event/addEventRef.do?calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
    10501048                    <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/> 
    10511049                  </a> 
    10521050                  <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 
    1053                   <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
     1051                  <a href="{$export}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
    10541052                    <img src="{$resourcesRoot}/images/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/> 
    10551053                  </a> 
    …… 
    10821080            <xsl:for-each select="event"> 
    10831081              <xsl:variable name="id" select="id"/> 
    1084               <xsl:variable name="subscriptionId" select="subscription/id"/> 
    10851082              <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    10861083              <xsl:variable name="guid" select="guid"/> 
    …… 
    10971094                <xsl:if test="status='TENTATIVE'"><em>TENTATIVE: </em></xsl:if> 
    10981095 
    1099                 <a class="title" href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1096                <a class="title" href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    11001097                  <xsl:value-of select="summary"/> 
    11011098                </a><xsl:if test="location/address != ''">, <xsl:value-of select="location/address"/></xsl:if> 
    …… 
    11071104 
    11081105                <xsl:text> </xsl:text> 
    1109                 <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
     1106                <a href="{$privateCal}/event/addEventRef.do?calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
    11101107                  <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/> 
    11111108                </a> 
    11121109                <xsl:text> </xsl:text> 
    11131110                <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 
    1114                 <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
     1111                <a href="{$export}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
    11151112                  <img src="{$resourcesRoot}/images/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/> 
    11161113                </a> 
    …… 
    12541251  <xsl:template match="event" mode="calendarLayout"> 
    12551252    <xsl:param name="dayPos"/> 
    1256     <xsl:variable name="subscriptionId" select="subscription/id"/> 
    12571253    <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    12581254    <xsl:variable name="guid" select="guid"/> 
    …… 
    12781274    </xsl:variable> 
    12791275    <li> 
    1280       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass} {$subscriptionClass}"> 
     1276      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass} {$subscriptionClass}"> 
    12811277        <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
    12821278        <xsl:choose> 
    …… 
    16131609      </xsl:if> 
    16141610      <xsl:for-each select="/bedework/searchResults/searchResult"> 
    1615         <xsl:variable name="subscriptionId" select="event/subscription/id"/> 
    16161611        <xsl:variable name="calPath" select="event/calendar/encodedPath"/> 
    16171612        <xsl:variable name="guid" select="event/guid"/> 
    …… 
    16251620          </td> 
    16261621          <td> 
    1627             <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1622            <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    16281623              <xsl:value-of select="event/summary"/> 
    16291624            </a> 

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

    r2171 r2172  
    565565  <!--==== SINGLE EVENT ====--> 
    566566  <xsl:template match="event"> 
    567     <xsl:variable name="subscriptionId" select="subscription/id"/> 
    568567    <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    569568    <xsl:variable name="guid" select="guid"/> 
    …… 
    577576    </xsl:variable> 
    578577    <h2 class="{$statusClass}"> 
    579       <a id="linkToEvent" href="javascript:showLink('{$urlPrefix}/event/eventView.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')" title="generate link to this event"> 
     578      <a id="linkToEvent" href="javascript:showLink('{$urlPrefix}/event/eventView.do?calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')" title="generate link to this event"> 
    580579       link to this event 
    581580     </a> 
    …… 
    723722        <th class="icalIcon" rowspan="2"> 
    724723          <div id="eventIcons"> 
    725             <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
     724            <a href="{$privateCal}/event/addEventRef.do?calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
    726725              <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/> 
    727726              add to my calendar 
    728727            </a> 
    729728            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 
    730             <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
     729            <a href="{$export}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
    731730              <img src="{$resourcesRoot}/images/std-ical_icon.gif" width="20" height="26" border="0" alt="Download this event"/> 
    732731             download</a> 
    …… 
    896895            <xsl:for-each select="event"> 
    897896              <xsl:variable name="id" select="id"/> 
    898               <xsl:variable name="subscriptionId" select="subscription/id"/> 
    899897              <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    900898              <xsl:variable name="guid" select="guid"/> 
    …… 
    925923                                  start/time = end/time"> 
    926924                    <td class="{$dateRangeStyle} center" colspan="3"> 
    927                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     925                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    928926                        <xsl:value-of select="start/time"/> 
    929927                      </a> 
    …… 
    932930                  <xsl:otherwise> 
    933931                    <td class="{$dateRangeStyle} right"> 
    934                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     932                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    935933                      <xsl:choose> 
    936934                        <xsl:when test="start/allday = 'true' and 
    …… 
    949947                    </td> 
    950948                    <td class="{$dateRangeStyle} center"> 
    951                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a> 
     949                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a> 
    952950                    </td> 
    953951                    <td class="{$dateRangeStyle} left"> 
    954                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     952                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    955953                      <xsl:choose> 
    956954                        <xsl:when test="end/allday = 'true' and 
    …… 
    990988                  <xsl:choose> 
    991989                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    992                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     990                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    993991                        <strong> 
    994992                          <xsl:value-of select="summary"/>: 
    …… 
    10261024                    </xsl:when> 
    10271025                    <xsl:otherwise> 
    1028                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1026                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    10291027                        <xsl:value-of select="summary"/> 
    10301028                        <xsl:if test="location/address != ''">, <xsl:value-of select="location/address"/></xsl:if> 
    …… 
    10461044                </td> 
    10471045                <td class="icons"> 
    1048                   <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
     1046                  <a href="{$privateCal}/event/addEventRef.do?calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
    10491047                    <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/> 
    10501048                  </a> 
    10511049                  <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 
    1052                   <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
     1050                  <a href="{$export}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
    10531051                    <img src="{$resourcesRoot}/images/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/> 
    10541052                  </a> 
    …… 
    10811079            <xsl:for-each select="event"> 
    10821080              <xsl:variable name="id" select="id"/> 
    1083               <xsl:variable name="subscriptionId" select="subscription/id"/> 
    10841081              <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    10851082              <xsl:variable name="guid" select="guid"/> 
    …… 
    10961093                <xsl:if test="status='TENTATIVE'"><em>TENTATIVE: </em></xsl:if> 
    10971094 
    1098                 <a class="title" href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1095                <a class="title" href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    10991096                  <xsl:value-of select="summary"/> 
    11001097                </a><xsl:if test="location/address != ''">, <xsl:value-of select="location/address"/></xsl:if> 
    …… 
    11061103 
    11071104                <xsl:text> </xsl:text> 
    1108                 <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
     1105                <a href="{$privateCal}/event/addEventRef.do?calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
    11091106                  <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/> 
    11101107                </a> 
    11111108                <xsl:text> </xsl:text> 
    11121109                <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 
    1113                 <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
     1110                <a href="{$export}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
    11141111                  <img src="{$resourcesRoot}/images/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/> 
    11151112                </a> 
    …… 
    12531250  <xsl:template match="event" mode="calendarLayout"> 
    12541251    <xsl:param name="dayPos"/> 
    1255     <xsl:variable name="subscriptionId" select="subscription/id"/> 
    12561252    <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    12571253    <xsl:variable name="guid" select="guid"/> 
    …… 
    12771273    </xsl:variable> 
    12781274    <li> 
    1279       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass} {$subscriptionClass}"> 
     1275      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass} {$subscriptionClass}"> 
    12801276        <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
    12811277        <xsl:choose> 
    …… 
    16121608      </xsl:if> 
    16131609      <xsl:for-each select="/bedework/searchResults/searchResult"> 
    1614         <xsl:variable name="subscriptionId" select="event/subscription/id"/> 
    16151610        <xsl:variable name="calPath" select="event/calendar/encodedPath"/> 
    16161611        <xsl:variable name="guid" select="event/guid"/> 
    …… 
    16241619          </td> 
    16251620          <td> 
    1626             <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1621            <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    16271622              <xsl:value-of select="event/summary"/> 
    16281623            </a> 

  • trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.css

    r2160 r2172  
    768768} 
    769769#bedework #commonListTable { 
     770  font-size: 0.9em; 
    770771  margin-bottom: 2em; 
    771772} 
    …… 
    784785  background-color: #eee; 
    785786} 
     787#commonListTable td.unclaimed { 
     788  background-color: #eee; 
     789  color: #900 !important; 
     790  font-style: italic; 
     791} 

  • trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl

    r2170 r2172  
    349349  <!--==== ADD and EDIT EVENT FORM ====--> 
    350350  <xsl:template match="formElements" mode="eventForm"> 
    351     <xsl:variable name="subscriptionId" select="subscriptionId"/> 
    352351    <xsl:variable name="calPathEncoded" select="form/calendar/encodedPath"/> 
    353352    <xsl:variable name="calPath" select="form/calendar/path"/> 
    …… 
    377376                    <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    378377                    Delete: 
    379                     <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="delete master (recurring event)">all</a>, 
    380                     <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete instance (recurring event)">instance</a> 
     378                    <a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}" title="delete master (recurring event)">all</a>, 
     379                    <a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete instance (recurring event)">instance</a> 
    381380                  </xsl:when> 
    382381                  <xsl:otherwise> 
    383                     <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete event"> 
     382                    <a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete event"> 
    384383                      <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    385384                      Delete 
    …… 
    499498          </a> 
    500499        </div> 
    501         <strong>Step 4:</strong> Select Topical Areas. <em>Optional.</em> 
     500        <strong>Step 4:</strong> Suggest Topical Areas. <em>Optional.</em> 
    502501      </div> 
    503502      <div id="bwHelp-Review" class="invisible"> 
    …… 
    12751274          </xsl:when> 
    12761275          <xsl:otherwise> 
    1277             <input type="checkbox" name="alias"> 
    1278               <xsl:attribute name="value"><xsl:value-of select="path"/></xsl:attribute> 
    1279               <xsl:if test="path = /bedework/formElements/form/xproperties//X-BEDEWORK-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> 
     1276            <xsl:variable name="virtualPath">/user<xsl:for-each select="ancestor-or-self::calendar/name">/<xsl:value-of select="."/></xsl:for-each></xsl:variable> 
     1277            <input type="checkbox" name="alias" onclick="toggleBedeworkXProperty('X-BEDEWORK-SUBMIT-ALIAS','{$virtualPath}',this.checked)"> 
     1278              <xsl:attribute name="value"><xsl:value-of select="$virtualPath"/></xsl:attribute> 
     1279              <xsl:if test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> 
    12801280            </input> 
    12811281            <xsl:choose> 
    1282               <xsl:when test="path = /bedework/formElements/form/xproperties//X-BEDEWORK-ALIAS/values/text"> 
     1282              <xsl:when test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text"> 
    12831283                <strong><xsl:value-of select="name"/></strong> 
    12841284              </xsl:when> 
    …… 
    14781478      calendar administrator.  You may edit or delete the 
    14791479      events until they have been accepted.  Once your 
    1480       event is picked up, you 
    1481       will no longer see it in your list. 
     1480      event is published, you will no longer see it in your list. 
    14821481    </p> 
    14831482    <xsl:call-template name="eventListCommon"/> 
    …… 
    14881487      <tr> 
    14891488        <th>Title</th> 
    1490         <!-- <th>Submitted</th> --> 
     1489        <th>Claimed By</th> 
    14911490        <th>Start</th> 
    14921491        <th>End</th> 
    1493         <th>Categories</th> 
     1492        <th>Topical Areas</th> 
    14941493        <th>Description</th> 
    14951494      </tr> 
    14961495 
    14971496      <xsl:for-each select="/bedework/events/event"> 
    1498         <xsl:variable name="subscriptionId" select="subscription/id"/> 
    14991497        <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    15001498        <xsl:variable name="guid" select="guid"/> 
    …… 
    15021500        <tr> 
    15031501          <td> 
    1504             <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1502            <a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    15051503              <xsl:choose> 
    15061504                <xsl:when test="summary != ''"> 
    …… 
    15131511            </a> 
    15141512          </td> 
    1515           <!-- need to output created date 
    1516           <td class="date"> 
    1517             <xsl:value-of select="end/longdate"/> 
    1518           </td> --> 
     1513          <xsl:choose> 
     1514            <xsl:when test="xproperties/X-BEDEWORK-SUBMISSION-CLAIMANT"> 
     1515              <td> 
     1516                <xsl:value-of select="xproperties/X-BEDEWORK-SUBMISSION-CLAIMANT/values/text"/> 
     1517                <xsl:text> </xsl:text> 
     1518                (<xsl:value-of select="xproperties/X-BEDEWORK-SUBMISSION-CLAIMANT/parameters/X-BEDEWORK-SUBMISSION-CLAIMANT-USER"/>) 
     1519              </td> 
     1520            </xsl:when> 
     1521            <xsl:otherwise> 
     1522              <td class="unclaimed">unclaimed</td> 
     1523            </xsl:otherwise> 
     1524          </xsl:choose> 
    15191525          <td class="date"> 
    15201526            <xsl:value-of select="start/shortdate"/> 
    …… 
    15281534          </td> 
    15291535          <td> 
    1530             <xsl:for-each select="categories/category"> 
    1531               <xsl:value-of select="word"/><br/> 
     1536            <xsl:for-each select="xproperties/X-BEDEWORK-SUBMIT-ALIAS"> 
     1537              <xsl:call-template name="substring-afterLastInstanceOf"> 
     1538                <xsl:with-param name="string" select="values/text"/> 
     1539                <xsl:with-param name="char">/</xsl:with-param> 
     1540              </xsl:call-template><br/> 
    15321541            </xsl:for-each> 
    15331542          </td> 
    …… 
    15381547                Recurring event. 
    15391548                Edit: 
    1540                 <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}"> 
     1549                <a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}"> 
    15411550                  master 
    15421551                </a> | 
    1543                 <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1552                <a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    15441553                  instance 
    15451554                </a> 

  • trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js

    r2160 r2172  
    322322  // commit all xproperties back to the form 
    323323  bwXProps.generate(formObj); 
     324} 
     325function toggleBedeworkXProperty(xprop,value,checked) { 
     326  if (!checked) { 
     327    bwXProps.removeByValue(xprop, value); 
     328  } else { 
     329    bwXProps.update(bwXPropertySubmitAlias,[],value,false); 
     330  } 
    324331} 
    325332// create table of form fields for review