Changeset 2654

Show
Ignore:
Timestamp:
01/12/10 13:19:02
Author:
johnsa
Message:

web user: fix up attendee responses and "change my status"

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2538 r2654  
    11541154} 
    11551155#bedework table.common table#attendees { 
    1156   font-size: 0.9em; 
    11571156} 
    11581157#bedework table.common #attendees th { 
    1159   padding: 0 0.5em 0 0; 
     1158  padding: 2px 20px 2px 6px; 
     1159  font-size: 0.9em; 
    11601160} 
    11611161#bedework table.common #attendees td { 
    1162   padding: 0 0.5em 0 0; 
     1162  padding: 2px 20px 2px 6px; 
     1163  font-size: 1.1em; 
     1164} 
     1165#bedework table.common #attendees td.status { 
     1166  font-weight: bold; 
    11631167} 
    11641168#bedework #recipientsAndAttendees { 

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

    r2641 r2654  
    151151  <xsl:variable name="schedule-initAttendeeReply" select="/bedework/urlPrefixes/schedule/initAttendeeReply"/> 
    152152  <xsl:variable name="schedule-initAttendeeUpdate" select="/bedework/urlPrefixes/schedule/initAttendeeUpdate"/> 
     153  <xsl:variable name="schedule-changeStatus" select="/bedework/urlPrefixes/schedule/changeStatus"/> 
    153154  <xsl:variable name="schedule-processAttendeeReply" select="/bedework/urlPrefixes/schedule/processAttendeeReply"/> 
    154155  <xsl:variable name="schedule-clearReply" select="/bedework/urlPrefixes/schedule/clearReply"/> 
    …… 
    22782279        </tr> 
    22792280      </xsl:if> 
    2280       <tr> 
    2281         <td class="fieldname"><xsl:copy-of select="$bwStr-SgEv-Description"/><xsl:text> </xsl:text></td> 
    2282         <td class="fieldval"> 
    2283           <xsl:if test="xproperties/node()[name()='X-BEDEWORK-IMAGE']"> 
    2284             <xsl:variable name="bwImage"><xsl:value-of select="xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:variable> 
    2285             <img src="{$bwImage}" class="bwEventImage"/> 
    2286           </xsl:if> 
    2287           <xsl:call-template name="replace"> 
    2288             <xsl:with-param name="string" select="description"/> 
    2289             <xsl:with-param name="pattern" select="'&#xA;'"/> 
    2290             <xsl:with-param name="replacement"><br/></xsl:with-param> 
    2291           </xsl:call-template> 
    2292         </td> 
    2293       </tr> 
     2281      <xsl:if test="scheduleMethod != 3"> 
     2282        <tr> 
     2283          <td class="fieldname"><xsl:copy-of select="$bwStr-SgEv-Description"/><xsl:text> </xsl:text></td> 
     2284          <td class="fieldval"> 
     2285            <xsl:if test="xproperties/node()[name()='X-BEDEWORK-IMAGE']"> 
     2286              <xsl:variable name="bwImage"><xsl:value-of select="xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:variable> 
     2287              <img src="{$bwImage}" class="bwEventImage"/> 
     2288            </xsl:if> 
     2289            <xsl:call-template name="replace"> 
     2290              <xsl:with-param name="string" select="description"/> 
     2291              <xsl:with-param name="pattern" select="'&#xA;'"/> 
     2292              <xsl:with-param name="replacement"><br/></xsl:with-param> 
     2293            </xsl:call-template> 
     2294          </td> 
     2295        </tr> 
     2296      </xsl:if> 
    22942297      <xsl:if test="status !='' and status != 'CONFIRMED'"> 
    22952298        <tr> 
    …… 
    23612364              <p> 
    23622365                <em> 
    2363                   <a href="{$schedule-initAttendeeUpdate}&amp;initUpdate=yes"> 
     2366                  <a href="{$schedule-changeStatus}&amp;initUpdate=yes"> 
    23642367                    <xsl:copy-of select="$bwStr-SgEv-ChangeMyStatus"/> 
    23652368                  </a> 
    …… 
    39473950              <p> 
    39483951                <em> 
    3949                   <a href="{$schedule-initAttendeeUpdate}&amp;initUpdate=yes"> 
     3952                  <a href="{$schedule-changeStatus}&amp;initUpdate=yes"> 
    39503953                    <xsl:copy-of select="$bwStr-AEEF-ChangeMyStatus"/> 
    39513954                  </a> 
    …… 
    69596962            </td> 
    69606963          </tr> 
     6964          <!-- hide ability to set comments in v.3.6 (will restore in v.3.7) 
    69616965          <xsl:if test="scheduleMethod != '5'"> 
    69626966            <tr> 
    …… 
    69696973            </tr> 
    69706974          </xsl:if> 
     6975          --> 
    69716976        </xsl:if> 
    69726977        <tr> 

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/strings.xsl

    r2641 r2654  
    388388  <xsl:variable name="bwStr-AEEF-SaveDraft">save draft</xsl:variable> 
    389389  <xsl:variable name="bwStr-AEEF-SaveAndSendInvites">send</xsl:variable> 
    390   <xsl:variable name="bwStr-AEEF-Clear">clear</xsl:variable> 
     390  <xsl:variable name="bwStr-AEEF-Clear">clear message from Inbox</xsl:variable> 
    391391 
    392392  <!-- xsl:template match="val" mode="weekMonthYearNumbers" -->