Changeset 2234

Show
Ignore:
Timestamp:
06/26/09 14:35:04
Author:
johnsa
Message:

user client: tidy up final scheduling issues
admin client: fix up subscriptions, topical areas, views

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2201 r2234  
    975975  width: 200px; 
    976976} 
     977#viewsTable table.subscriptionsListSubs td { 
     978  white-space: nowrap; 
     979} 
    977980#viewsTable table td.arrows { 
    978981  width: 15px; 
    …… 
    992995  margin: 0; 
    993996  padding: 0; 
     997  font-size: 0.8em; 
     998  font-style: italic; 
     999} 
     1000ul.note { 
    9941001  font-size: 0.8em; 
    9951002  font-style: italic; 

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

    r2225 r2234  
    835835        <li> 
    836836          <a href="{$subscriptions-fetch}" title="subscriptions to calendars"> 
    837             Manage topical areas 
     837            Manage subscriptions 
    838838          </a> 
    839839        </li> 
    840840        <li> 
    841           <a href="{$view-fetch}" title="collections of topical areas"> 
     841          <a href="{$view-fetch}" title="collections of subscriptions"> 
    842842            Manage views 
    843843          </a> 
    …… 
    25592559 
    25602560        <!-- Topical area  --> 
    2561         <!-- These are the subscriptions (aliases) where the events should show up. 
    2562              By selecting one or more of these, appropriate categories will be set on the event --> 
     2561        <!-- By selecting one or more of these, appropriate categories will be set on the event --> 
    25632562        <tr> 
    25642563          <td class="fieldName"> 
    …… 
    41374136          </td> 
    41384137        </tr> 
     4138        <xsl:if test="/bedework/page = 'modSubscription'"> 
     4139          <tr> 
     4140            <th>Topical Area:</th> 
     4141            <td> 
     4142              <input type="radio" name="calendar.isTopicalArea" value="true"> 
     4143                <xsl:if test="isTopicalArea = 'true'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     4144              </input> true 
     4145              <input type="radio" name="calendar.isTopicalArea" value="false"> 
     4146                <xsl:if test="isTopicalArea = 'false'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     4147              </input> false 
     4148            </td> 
     4149          </tr> 
     4150        </xsl:if> 
    41394151        <tr> 
    41404152          <th>Description:</th> 
    …… 
    47914803      <tr> 
    47924804        <td class="cals"> 
    4793           <h3>Topical Areas</h3> 
     4805          <h3>Subscriptions</h3> 
    47944806          <ul class="calendarTree"> 
    47954807            <xsl:apply-templates select="calendar" mode="listForUpdateSubscription"> 
    …… 
    48194831 
    48204832  <xsl:template name="subscriptionIntro"> 
    4821     <h3>Managing Topical Areas</h3> 
     4833    <h3>Managing Subscriptions</h3> 
    48224834    <ul> 
    4823       <li>Select an item from the tree on the left to modify a topical area.</li> 
    4824       <li>Select the 
    4825       <img src="{$resourcesRoot}/resources/calAddIcon.gif" width="13" height="13" alt="true" border="0"/> 
    4826       icon to add a new topical area to the tree. 
     4835      <li> 
     4836        Select an item from the tree on the left to modify a subscription. 
     4837      </li> 
     4838      <li> 
     4839        Select the 
     4840        <img src="{$resourcesRoot}/resources/calAddIcon.gif" width="13" height="13" alt="true" border="0"/> 
     4841        icon to add a new subscription or folder to the tree. 
     4842      </li> 
     4843    </ul> 
     4844    <ul> 
     4845      <li> 
     4846        <strong>Topical Areas:</strong> 
     4847        <ul> 
     4848          <li> 
     4849            A subscription marked as a "Topical Area" will be presented to event administrators when creating events. 
     4850            These are used for input (tagging) and output (if added to a view). 
     4851          </li> 
     4852          <li> 
     4853            A subscription not marked as a "Topical Area" can be used in Views, 
     4854            but will not appear when creating events.  Such subscriptions are used for output only, 
     4855            e.g. an ical feed of holidays from an external source. 
     4856          </li> 
     4857        </ul> 
    48274858      </li> 
    48284859    </ul> 
    …… 
    51625193    <h2>Manage Views</h2> 
    51635194    <p> 
    5164       Views are named aggregations of topical areas used 
     5195      Views are named aggregations of subscriptions used 
    51655196      to display sets of events within a calendar suite. 
    51665197    </p> 
    …… 
    51765207      <tr> 
    51775208        <th>Name</th> 
    5178         <th>Included topical areas</th> 
     5209        <th>Included subscriptions</th> 
    51795210      </tr> 
    51805211 
    …… 
    52085239    <h2>Update View</h2> 
    52095240 
    5210     <p class="note"> 
    5211       Note: In some configurations, changes made here will not show up in the calendar suite until 
    5212       the cache is flushed (approx. 5 minutes) or you start a new session (e.g. clear your cookies). 
    5213       Deleting a view on a production system should be followed by a server restart to clear the cache for all users. 
    5214     </p> 
     5241    <ul class="note"> 
     5242      <li> 
     5243        In some configurations, changes made here will not show up in the calendar suite until 
     5244        the cache is flushed (approx. 5 minutes) or you start a new session (e.g. clear your cookies). 
     5245      </li> 
     5246      <li> 
     5247        Deleting a view on a production system should be followed by a server restart to clear the cache for all users. 
     5248      </li> 
     5249      <li> 
     5250        To see underlying subscriptions in a local folder, open the folder in the 
     5251        "<a href="{$subscriptions-fetch}" title="subscriptions to calendars">Manage Subscriptions</a>" tree 
     5252        (this will be improved in a later version...). 
     5253      </li> 
     5254      <li> 
     5255        If you include a folder in a view, you do not need to 
     5256        include its children. 
     5257      </li> 
     5258    </ul> 
    52155259 
    52165260    <h3 class="viewName"> 
    …… 
    52205264      <tr> 
    52215265        <td class="subs"> 
    5222           <h3>Available topical areas:</h3> 
     5266          <h3>Available subscriptions:</h3> 
    52235267 
    52245268          <table class="subscriptionsListSubs"> 
    5225             <xsl:for-each select="/bedework/calendars/calendar/calendar[isSubscription = 'true']"> 
    5226               <xsl:sort select="name" order="ascending" case-order="upper-first"/> 
     5269            <xsl:for-each select="/bedework/calendars/calendar//calendar[isSubscription = 'true' or calType = '0']"> 
     5270              <xsl:sort select="substring-after(path, $userPath)" order="ascending" case-order="upper-first"/> 
    52275271              <xsl:if test="not(/bedework/currentView//path = path)"> 
    52285272                <tr> 
    52295273                  <td> 
    5230                     <xsl:value-of select="summary"/> 
     5274                    <xsl:if test="calType = '0' and isSubscription = 'false'"> 
     5275                      <!-- display a folder icon for local folders... --> 
     5276                      <img src="{$resourcesRoot}/resources/catIcon.gif" 
     5277                          width="13" height="13" border="0" 
     5278                          alt="folder"/> 
     5279                      <xsl:text> </xsl:text> 
     5280                    </xsl:if> 
     5281                    <xsl:value-of select="substring-after(path, $userPath)"/> 
    52315282                  </td> 
    52325283                  <td class="arrows"> 
    …… 
    52355286                      <img src="{$resourcesRoot}/resources/arrowRight.gif" 
    52365287                          width="13" height="13" border="0" 
    5237                           alt="add topical area"/> 
     5288                          alt="add subscription"/> 
    52385289                    </a> 
    52395290                  </td> 
    …… 
    52465297        </td> 
    52475298        <td class="view"> 
    5248           <h3>Active topical areas:</h3> 
     5299          <h3>Active subscriptions:</h3> 
    52495300          <table class="subscriptionsListView"> 
    52505301            <xsl:for-each select="/bedework/currentView/path"> 
    …… 
    52565307                    <img src="{$resourcesRoot}/resources/arrowLeft.gif" 
    52575308                        width="13" height="13" border="0" 
    5258                         alt="add topical area"/> 
     5309                        alt="add subscription"/> 
    52595310                  </a> 
    52605311                </td> 

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

    r2224 r2234  
    891891  font-size: 0.9em; 
    892892} 
    893 #bedework #scheduling p.editAttendees { 
     893#bedework #scheduling .editAttendees { 
    894894  padding-top: 1em; 
    895895  clear: both; 

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

    r2232 r2234  
    23462346              </xsl:for-each> 
    23472347            </table> 
    2348             <p> 
    2349               <em> 
    2350                 <a href="{$schedule-initAttendeeUpdate}&amp;initUpdate=yes"> 
    2351                   change my status 
    2352                 </a> 
    2353               </em> 
    2354             </p> 
     2348            <xsl:if test="not(organizerSchedulingObject)"> 
     2349              <p> 
     2350                <em> 
     2351                  <a href="{$schedule-initAttendeeUpdate}&amp;initUpdate=yes"> 
     2352                    change my status 
     2353                  </a> 
     2354                </em> 
     2355              </p> 
     2356            </xsl:if> 
    23552357          </td> 
    23562358        </tr> 
    23572359      </xsl:if> 
     2360      <!-- Recipients are deprecated --> 
     2361      <!-- 
    23582362      <xsl:if test="recipient"> 
    23592363        <tr> 
    …… 
    23862390        </tr> 
    23872391      </xsl:if> 
     2392      --> 
    23882393      <xsl:if test="cost!=''"> 
    23892394        <tr> 
    …… 
    39083913          </xsl:apply-templates> 
    39093914        </xsl:if> 
    3910  
     3915        <!-- Recipients are deprecated --> 
     3916        <!-- 
    39113917        <xsl:if test="form/recipients/recipient"> 
    39123918          <xsl:apply-templates select="form/recipients"> 
    …… 
    39143920          </xsl:apply-templates> 
    39153921        </xsl:if> 
     3922        --> 
    39163923        <div class="editAttendees"> 
    39173924          <xsl:choose> 
    3918             <xsl:when test="form/scheduleMethod = '2'"> 
    3919               <input name="editEventAttendees" type="submit" value="edit attendees and recipients"/> 
     3925            <xsl:when test="form/organizerSchedulingObject"> 
     3926              <input name="editEventAttendees" type="submit" value="edit attendees"/> 
     3927            </xsl:when> 
     3928            <xsl:when test="form/attendeeSchedulingObject"> 
     3929              <p> 
     3930                <em> 
     3931                  <a href="{$schedule-initAttendeeUpdate}&amp;initUpdate=yes"> 
     3932                    change my status 
     3933                  </a> 
     3934                </em> 
     3935              </p> 
    39203936            </xsl:when> 
    39213937            <xsl:otherwise> 
    …… 
    39253941                </xsl:when> 
    39263942                <xsl:otherwise> 
    3927                   <input name="makeEventIntoMeeting" type="submit" value="make into meeting - invite attendees and recipients"/> 
     3943                  <input name="makeEventIntoMeeting" type="submit" value="make into meeting - invite attendees"/> 
    39283944                </xsl:otherwise> 
    39293945              </xsl:choose> 
    …… 
    41304146 
    41314147    <div id="recipientsAndAttendees"> 
    4132       <h4> Add attendees and recipients</h4> 
     4148      <h4>Add attendees</h4> 
    41334149      <form name="raForm" id="recipientsAndAttendeesForm" action="{$event-attendeesForEvent}" method="post"> 
    41344150        <div id="raContent"> 
    …… 
    41364152            <input type="text" name="uri" width="40" id="bwRaUri"/> 
    41374153            <input type="submit" value="add" /> 
    4138             &#160; 
    4139             <input type="checkbox" name="recipient" value="true" checked="checked"/> recipient 
    4140             <input type="checkbox" name="attendee"  value="true" checked="checked"/> attendee 
     4154            <!-- Recipients are deprecated: default all to attendees --> 
     4155            <input type="hidden" name="recipient" value="true"/> 
     4156            <input type="hidden" name="attendee"  value="true"/> 
    41414157            &#160; 
    41424158            Role: 
    …… 
    41624178          </xsl:if> 
    41634179 
     4180          <!-- Recipients are deprecated --> 
     4181          <!-- 
    41644182          <xsl:if test="/bedework/recipients/recipient"> 
    41654183            <xsl:apply-templates select="/bedework/recipients"/> 
    41664184          </xsl:if> 
     4185          --> 
    41674186 
    41684187          <xsl:apply-templates select="/bedework/freebusy" mode="freeBusyGrid"> 
    …… 
    43824401  </xsl:template> 
    43834402 
     4403  <!-- Recipients are deprecated --> 
    43844404  <xsl:template match="recipients"> 
    43854405    <xsl:param name="trash">yes</xsl:param>