Changeset 1676

Show
Ignore:
Timestamp:
12/17/07 17:04:11
Author:
johnsa
Message:

web submit: work on "my pending events" tab; minor work on admin client display of submitted events.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1674 r1676  
    256256  this.render = function() { 
    257257    var output = ""; 
    258     output += '<table>'; 
    259     output += '<tr><th colspan="2">Suggested Location:</th></tr>'; 
    260     output += '<tr><td>Address:</td><td>' + this.locationAddress + '</td>'; 
    261     output += '<tr><td>Subaddress:</td><td>' + this.locationSubaddress + '</td>'; 
    262     output += '<tr><td>URL:</td><td>' + this.locationUrl + '</td>'; 
    263     output += '</table>'; 
    264     output += '<table>'; 
    265     output += '<tr><th colspan="2">Suggested Contact:</th></tr>'; 
    266     output += '<tr><td>Name:</td><td>' + this.contactName + '</td></tr>'; 
    267     output += '<tr><td>Phone:</td><td>' + this.contactPhone + '</td></tr>'; 
    268     output += '<tr><td>URL:</td><td>' + this.contactUrl + '</td></tr>'; 
    269     output += '<tr><td>Email:</td><td>' + this.contactEmail + '</td></tr>'; 
    270     output += '</table>'; 
    271     output += '<p><strong>Notes:</strong><br/>'; 
    272     output += this.notes + '</p>'; 
     258    if (this.locationAddress != "" || this.locationSubaddress != "" || this.locationUrl != "") { 
     259      output += '<table>'; 
     260      output += '<tr><th colspan="2">Suggested Location:</th></tr>'; 
     261      output += '<tr><td>Address:</td><td>' + this.locationAddress + '</td>'; 
     262      output += '<tr><td>Subaddress:</td><td>' + this.locationSubaddress + '</td>'; 
     263      output += '<tr><td>URL:</td><td>' + this.locationUrl + '</td>'; 
     264      output += '</table>'; 
     265    } 
     266    if (this.contactName != "" || this.contactPhone != "" || this.contactEmail != "" || this.contactUrl != "") { 
     267      output += '<table>'; 
     268      output += '<tr><th colspan="2">Suggested Contact:</th></tr>'; 
     269      output += '<tr><td>Name:</td><td>' + this.contactName + '</td></tr>'; 
     270      output += '<tr><td>Phone:</td><td>' + this.contactPhone + '</td></tr>'; 
     271      output += '<tr><td>URL:</td><td>' + this.contactUrl + '</td></tr>'; 
     272      output += '<tr><td>Email:</td><td>' + this.contactEmail + '</td></tr>'; 
     273      output += '</table>'; 
     274    } 
     275    if (this.notes != "") { 
     276      output += '<p><strong>Notes:</strong><br/>'; 
     277      output += this.notes + '</p>'; 
     278    } 
    273279 
    274280    return output; 

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

    r1673 r1676  
    6767       string) so that all links constructed in this stylesheet may begin the 
    6868       query string with an ampersand. --> 
     69 
     70  <xsl:variable name="submissionsRootEncoded" select="/bedework/submissionsRoot/encoded"/> 
     71  <xsl:variable name="submissionsRootUnencoded" select="/bedework/submissionsRoot/unencoded"/> 
     72 
    6973  <!-- main --> 
    7074  <xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/> 
    7175  <xsl:variable name="initEvent" select="/bedework/urlPrefixes/event/initEvent"/> 
     76  <xsl:variable name="initPendingEvents" select="/bedework/urlPrefixes/event/initPendingEvents"/> 
     77  <xsl:variable name="event-fetchForUpdate" select="/bedework/urlPrefixes/event/fetchForUpdate/a/@href"/> 
    7278  <xsl:variable name="addEvent" select="/bedework/urlPrefixes/event/addEvent"/> 
    7379  <xsl:variable name="editEvent" select="/bedework/urlPrefixes/event/editEvent"/> 
    …… 
    108114              <xsl:when test="/bedework/page='addEvent'"> 
    109115                <xsl:apply-templates select="/bedework/formElements" mode="addEvent"/> 
     116              </xsl:when> 
     117              <xsl:when test="/bedework/page='eventList'"> 
     118                <xsl:call-template name="eventList"/> 
    110119              </xsl:when> 
    111120              <xsl:when test="/bedework/page='editEvent'"> 
    …… 
    209218          <li class="selected">Overview</li> 
    210219          <li><a href="{$initEvent}">Add Event</a></li> 
    211           <li><a href="">My Pending Events</a></li> 
     220          <li><a href="{$initPendingEvents}&amp;calPath={$submissionsRootEncoded}">My Pending Events</a></li> 
    212221        </xsl:when> 
    213222        <xsl:when test="/bedework/page='eventList'"> 
    …… 
    219228          <li><a href="{$setup}">Overview</a></li> 
    220229          <li class="selected">Add Event</li> 
    221           <li><a href="">My Pending Events</a></li> 
     230          <li><a href="{$initPendingEvents}&amp;calPath={$submissionsRootEncoded}">My Pending Events</a></li> 
    222231        </xsl:otherwise> 
    223232      </xsl:choose> 
    …… 
    13121321  </xsl:template> 
    13131322 
     1323  <!--++++++++++++++++++ Events ++++++++++++++++++++--> 
     1324  <xsl:template name="eventList"> 
     1325    <h2>Pending Events</h2> 
     1326    <xsl:call-template name="eventListCommon"/> 
     1327  </xsl:template> 
     1328 
     1329  <xsl:template name="eventListCommon"> 
     1330    <table id="commonListTable"> 
     1331      <tr> 
     1332        <th>Title</th> 
     1333        <th>Start Date</th> 
     1334        <th>End Date</th> 
     1335        <th>Calendar</th> 
     1336        <th>Description</th> 
     1337      </tr> 
     1338 
     1339      <xsl:for-each select="/bedework/events/event"> 
     1340        <xsl:variable name="subscriptionId" select="subscription/id"/> 
     1341        <xsl:variable name="calPath" select="calendar/encodedPath"/> 
     1342        <xsl:variable name="guid" select="guid"/> 
     1343        <xsl:variable name="recurrenceId" select="recurrenceId"/> 
     1344        <tr> 
     1345          <td> 
     1346            <a href="{$event-fetchForUpdate}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1347              <xsl:choose> 
     1348                <xsl:when test="summary != ''"> 
     1349                  <xsl:value-of select="summary"/> 
     1350                </xsl:when> 
     1351                <xsl:otherwise> 
     1352                  <em>no title</em> 
     1353                </xsl:otherwise> 
     1354              </xsl:choose> 
     1355            </a> 
     1356          </td> 
     1357          <td class="date"> 
     1358            <xsl:value-of select="start/longdate"/>, 
     1359            <xsl:value-of select="start/time"/> 
     1360          </td> 
     1361          <td class="date"> 
     1362            <xsl:value-of select="end/longdate"/>, 
     1363            <xsl:value-of select="end/time"/> 
     1364          </td> 
     1365          <td> 
     1366            <xsl:value-of select="calendar/name"/> 
     1367          </td> 
     1368          <td> 
     1369            <xsl:value-of select="description"/> 
     1370            <xsl:if test="recurring = 'true' or recurrenceId != ''"> 
     1371              <div class="recurrenceEditLinks"> 
     1372                Recurring event. 
     1373                Edit: 
     1374                <a href="{$event-fetchForUpdate}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}"> 
     1375                  master 
     1376                </a> | 
     1377                <a href="{$event-fetchForUpdate}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1378                  instance 
     1379                </a> 
     1380              </div> 
     1381            </xsl:if> 
     1382          </td> 
     1383        </tr> 
     1384      </xsl:for-each> 
     1385    </table> 
     1386  </xsl:template> 
     1387 
    13141388  <!--==== UPLOAD ====--> 
    13151389  <xsl:template name="upload">