Changeset 2201

Show
Ignore:
Timestamp:
05/26/09 15:28:51
Author:
johnsa
Message:

admin client: provide means to send message to user when sending an event

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2191 r2201  
    538538  margin: 1em 0 !important; 
    539539} 
     540#bwEmailBox { 
     541  margin: 1em 1em 1em 0; 
     542  padding: 0 1em 1em 1em; 
     543  background-color: #ffe; 
     544  width: 600px; 
     545  border: 1px solid #ccc; 
     546} 
    540547#calDescriptionsLink { 
    541548  font-size: 0.8em; 

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

    r2199 r2201  
    354354          </xsl:if> 
    355355        </xsl:if> 
    356         <xsl:if test="/bedework/page='upload' or /bedework/page='selectCalForEvent'"> 
     356        <xsl:if test="/bedework/page='upload' or 
     357                      /bedework/page='selectCalForEvent' or 
     358                      /bedework/page='deleteEventConfirmPending' or 
     359                      /bedework/page='addFilter' or 
     360                      /bedework/page='calSuitePrefs' or 
     361                      /bedework/page='eventList'"> 
    357362          <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js">&#160;</script> 
     363          <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkUtil.js">&#160;</script> 
    358364        </xsl:if> 
    359365        <xsl:if test="/bedework/page='calendarDescriptions' or /bedework/page='displayCalendar'"> 
    360366          <link rel="stylesheet" href="{$resourcesRoot}/resources/calendarDescriptions.css"/> 
    361         </xsl:if> 
    362         <xsl:if test="/bedework/page='addFilter' or 
    363                       /bedework/page='calSuitePrefs' or 
    364                       /bedework/page='eventList'"> 
    365           <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js">&#160;</script> 
    366367        </xsl:if> 
    367368        <link rel="icon" type="image/ico" href="{$resourcesRoot}/resources/bedework.ico" /> 
    …… 
    30803081      <xsl:when test="/bedework/page='deleteEventConfirm' or /bedework/page='deleteEventConfirmPending'"> 
    30813082        <h2>Ok to delete this event?</h2> 
    3082         <p style="width: 400px;">Note: we do not encourage deletion of old but correct events; we prefer to keep 
     3083 
     3084        <xsl:if test="/bedework/page='deleteEventConfirm'"> 
     3085          <p style="width: 400px;">Note: we do not encourage deletion of old but correct events; we prefer to keep 
    30833086           old events for historical reasons.  Please remove only those events 
    30843087           that are truly erroneous.</p> 
    3085         <p id="confirmButtons"> 
     3088        </xsl:if> 
     3089 
     3090        <xsl:variable name="eventDatesForEmail"> 
     3091          <xsl:value-of select="start/dayname"/>, <xsl:value-of select="start/longdate"/><xsl:text> </xsl:text><!-- 
     3092       --><xsl:if test="start/allday = 'false'"><xsl:value-of select="start/time"/></xsl:if><!-- 
     3093       --><xsl:if test="(end/longdate != start/longdate) or 
     3094                        ((end/longdate = start/longdate) and (end/time != start/time))"> - </xsl:if><!-- 
     3095       --><xsl:if test="end/longdate != start/longdate"><xsl:value-of select="substring(end/dayname,1,3)"/>, <xsl:value-of select="end/longdate"/><xsl:text> </xsl:text></xsl:if><!-- 
     3096       --><xsl:choose> 
     3097            <xsl:when test="start/allday = 'true'">(all day)</xsl:when> 
     3098            <xsl:when test="end/longdate != start/longdate"><xsl:value-of select="end/time"/></xsl:when> 
     3099            <xsl:when test="end/time != start/time"><xsl:value-of select="end/time"/></xsl:when> 
     3100          </xsl:choose><!-- 
     3101     --></xsl:variable> 
     3102 
     3103        <div id="confirmButtons"> 
    30863104          <form method="post"> 
    30873105            <xsl:choose> 
    30883106              <xsl:when test="/bedework/page = 'deleteEventConfirmPending'"> 
    30893107                <xsl:attribute name="action"><xsl:value-of select="$event-deletePending"/></xsl:attribute> 
     3108                <xsl:attribute name="onsubmit">doRejectMessage(this,<xsl:value-of select="summary"/>,<xsl:value-of select="$eventDatesForEmail"/>);</xsl:attribute> 
     3109                <!-- Setup email notification fields --> 
     3110                <input type="hidden" id="submitNotification" name="submitNotification" value="false"/> 
     3111                <!-- "from" should be a preference: hard code it for now --> 
     3112                <input type="hidden" id="snfrom" name="snfrom" value="bedework@yoursite.edu"/> 
     3113                <input type="hidden" id="snsubject" name="snsubject" value=""/> 
     3114                <input type="hidden" id="sntext" name="sntext" value=""/> 
     3115                <div id="bwEmailBox"> 
     3116                  <p> 
     3117                    <strong>You are deleting a pending event.</strong><br/> 
     3118                    <input type="checkbox" name="notifyFlag" checked="checked" onclick="toggleVisibility('bwRejectEventReasonBox','visible');"/> 
     3119                    Send notification to submitter 
     3120                  </p> 
     3121                  <div id="bwRejectEventReasonBox"> 
     3122                    <p>Reason (leave blank to exclude):<br/> 
     3123                      <textarea name="reason" rows="4" cols="60"> 
     3124                        <xsl:text> </xsl:text> 
     3125                      </textarea> 
     3126                    </p> 
     3127                  </div> 
     3128                </div> 
    30903129              </xsl:when> 
    30913130              <xsl:otherwise> 
    …… 
    30933132              </xsl:otherwise> 
    30943133            </xsl:choose> 
     3134            <input type="submit" name="delete" value="Yes: Delete Event"/> 
    30953135            <input type="submit" name="cancelled" value="Cancel"/> 
    3096             <input type="submit" name="delete" value="Delete"/> 
    30973136            <input type="hidden" name="calPath" value="{$calPath}"/> 
    30983137            <input type="hidden" name="guid" value="{$guid}"/> 
    30993138            <input type="hidden" name="recurrenceId" value="{$recurrenceId}"/> 
    31003139          </form> 
    3101         </p> 
     3140        </div> 
    31023141      </xsl:when> 
    31033142      <xsl:otherwise> 
    …… 
    32603299    </table> 
    32613300 
    3262     <p> 
    3263       <xsl:variable name="userPath"><xsl:value-of select="/bedework/syspars/userPrincipalRoot"/>/<xsl:value-of select="/bedework/userInfo/user"/></xsl:variable> 
    3264       <input type="button" name="return" onclick="javascript:location.replace('{$event-fetchForUpdate}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')"> 
    3265         <xsl:choose> 
    3266           <xsl:when test="$userPath = creator or /bedework/userInfo/superUser = 'true'"> 
    3267             <xsl:attribute name="value">Edit event</xsl:attribute> 
    3268           </xsl:when> 
    3269           <xsl:otherwise> 
    3270             <xsl:attribute name="value">Tag event with topical areas</xsl:attribute> 
    3271           </xsl:otherwise> 
    3272         </xsl:choose> 
    3273       </input> 
    3274  
    3275       <input type="button" name="return" value="Back" onclick="javascript:history.back()"/> 
    3276     </p> 
     3301    <xsl:if test="/bedework/page != 'deleteEventConfirmPending'"> 
     3302      <p> 
     3303        <xsl:variable name="userPath"><xsl:value-of select="/bedework/syspars/userPrincipalRoot"/>/<xsl:value-of select="/bedework/userInfo/user"/></xsl:variable> 
     3304        <input type="button" name="return" onclick="javascript:location.replace('{$event-fetchForUpdate}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')"> 
     3305          <xsl:choose> 
     3306            <xsl:when test="$userPath = creator or /bedework/userInfo/superUser = 'true'"> 
     3307              <xsl:attribute name="value">Edit event</xsl:attribute> 
     3308            </xsl:when> 
     3309            <xsl:otherwise> 
     3310              <xsl:attribute name="value">Tag event with topical areas</xsl:attribute> 
     3311            </xsl:otherwise> 
     3312          </xsl:choose> 
     3313        </input> 
     3314        <input type="button" name="return" value="Back" onclick="javascript:history.back()"/> 
     3315     </p> 
     3316    </xsl:if> 
    32773317  </xsl:template> 
    32783318 

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

    r2196 r2201  
    726726  snsubject.value = "Event Approved: " + eventTitle; 
    727727  sntext = document.getElementById("sntext"); 
    728   sntext.value = "Your event has been approved and is now published.\n\nEVENT DETAILS\n-------------\n\nTitle: " + eventTitle + "\nURL: " + eventUrlPrefix + "&calPath=" + publishingCal; 
     728  var message; 
     729  message = "Your event has been approved and is now published.\n\n"; 
     730  message += "EVENT DETAILS\n-------------\n"; 
     731  message += "Title: " + eventTitle + "\n"; 
     732  message += "URL: " + eventUrlPrefix + "&calPath=" + publishingCal; 
     733  sntext.value = message; 
    729734 
    730735  // Send the names of xproperties we wish to retain after we publish. 
    …… 
    743748} 
    744749 
    745 function doRejectEvent(reason,eventTitle) { 
    746  
    747 } 
    748  
    749  
     750function doRejectEvent(formObj, eventTitle, eventDatesForEmail){ 
     751  // If email notification is enabled, set field to true 
     752  // (set to 'true' for now to get the feature working) 
     753  formObj.submitNotification.value = true; 
     754 
     755  // set the email field values 
     756  formObj.snsubject.value = "Event Rejected: " + eventTitle; 
     757 
     758  var message; 
     759  message = "Your event has been rejected.\n\n"; 
     760  message += "EVENT DETAILS\n-------------\n"; 
     761  message = "Event Title: " + eventTitle + "\n"; 
     762  message = "Event Dates: " + eventDatesForEmail + "\n\n\n"; 
     763  if (trim(formObj.reason) != '') { 
     764    message += "Reason:\n"; 
     765    message += formObj.reason; 
     766  } 
     767  formObj.sntext.value = message; 
     768} 
     769 
     770