Changeset 2108

Show
Ignore:
Timestamp:
03/30/09 09:55:17
Author:
johnsa
Message:

some cosmetic changes to clear up language regarding topical areas and subscriptions

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2106 r2108  
    235235          </xsl:comment> 
    236236        </script> 
     237        <!-- Load jQuery when needed --> 
     238        <xsl:if test="/bedework/page='modEvent' or 
     239                      /bedework/page='modEventPending' or 
     240                      /bedework/page='modSubscription'"> 
     241          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
     242          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script> 
     243        </xsl:if> 
    237244        <xsl:if test="/bedework/page='modEvent' or /bedework/page='modEventPending'"> 
    238245          <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js">&#160;</script> 
    …… 
    245252            </xsl:when> 
    246253            <xsl:otherwise> 
    247               <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
    248               <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script> 
    249254              <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> 
    250255              <script type="text/javascript"> 
    …… 
    750755        <li> 
    751756          <a href="{$subscriptions-fetch}" title="subscriptions to calendars"> 
    752             Manage subscriptions 
     757            Manage topical areas 
    753758          </a> 
    754759        </li> 
    755760        <li> 
    756           <a href="{$view-fetch}" title="collections of subscriptions"> 
     761          <a href="{$view-fetch}" title="collections of topical areas"> 
    757762            Manage views 
    758763          </a> 
    …… 
    22502255        <!--  Category  --> 
    22512256        <!-- 
    2252           categories will no longer be directly set by the user; they are set 
    2253           by the back-end based on the subscriptions in the calendar suite. 
     2257          categories are no longer be directly set by the event administrator; they are set 
     2258          by the back-end based on the subscriptions (topical area) in the calendar suite. 
    22542259          A user, therefore, tells the system where they want the event to 
    2255           show up, and the categories are set for them. --> 
     2260          show up, and the categories are set for them. To make categories 
     2261          available to the event administrator --> 
    22562262        <!-- 
    22572263        <tr> 
    …… 
    42904296      <tr> 
    42914297        <td class="cals"> 
    4292           <h3>Subscription Tree</h3> 
     4298          <h3>Topical Areas</h3> 
    42934299          <ul class="calendarTree"> 
    42944300            <xsl:apply-templates select="calendar" mode="listForUpdateSubscription"> 
    …… 
    43154321 
    43164322  <xsl:template name="subscriptionIntro"> 
    4317     <h3>Managing Subscriptions</h3> 
     4323    <h3>Managing Topical Areas</h3> 
    43184324    <ul> 
    4319       <li>Select an item from the tree on the left to modify a subscription.</li> 
     4325      <li>Select an item from the tree on the left to modify a topical area.</li> 
    43204326      <li>Select the 
    43214327      <img src="{$resourcesRoot}/resources/calAddIcon.gif" width="13" height="13" alt="true" border="0"/> 
    4322       icon to add a new subscription to the tree. 
     4328      icon to add a new topical area to the tree. 
    43234329      </li> 
    43244330    </ul> 
    …… 
    45454551      <xsl:choose> 
    45464552        <xsl:when test="canAlias = 'true'"> 
    4547           <a href="javascript:updatePublicCalendarAlias('{$calPath}','{$calDisplay}','{$calendarCollection}')"> 
     4553          <a href="javascript:updatePublicCalendarAlias('{$calPath}','{$calDisplay}','bw-{$calPath}','{$calendarCollection}')" id="bw-{$calPath}"> 
    45484554            <xsl:value-of select="name"/> 
    45494555          </a> 
    …… 
    45684574    <h2>Manage Views</h2> 
    45694575    <p> 
    4570       Views are named aggregations of subscriptions used 
     4576      Views are named aggregations of topical areas used 
    45714577      to display sets of events within a calendar suite. 
    45724578    </p> 
    …… 
    45824588      <tr> 
    45834589        <th>Name</th> 
    4584         <th>Included subscriptions</th> 
     4590        <th>Included topical areas</th> 
    45854591      </tr> 
    45864592 
    …… 
    46244630      <tr> 
    46254631        <td class="subs"> 
    4626           <h3>Available Subscriptions:</h3> 
     4632          <h3>Available topical areas:</h3> 
    46274633 
    46284634          <table class="subscriptionsListSubs"> 
    …… 
    46394645                      <img src="{$resourcesRoot}/resources/arrowRight.gif" 
    46404646                          width="13" height="13" border="0" 
    4641                           alt="add subscription"/> 
     4647                          alt="add topical area"/> 
    46424648                    </a> 
    46434649                  </td> 
    …… 
    46484654        </td> 
    46494655        <td class="view"> 
    4650           <h3>Active Subscriptions:</h3> 
     4656          <h3>Active topical areas:</h3> 
    46514657          <table class="subscriptionsListView"> 
    46524658            <xsl:for-each select="/bedework/currentView/path"> 
    …… 
    46584664                    <img src="{$resourcesRoot}/resources/arrowLeft.gif" 
    46594665                        width="13" height="13" border="0" 
    4660                         alt="add subscription"/> 
     4666                        alt="add topical area"/> 
    46614667                  </a> 
    46624668                </td> 

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

    r2001 r2108  
    166166// used to update a calendar subscription (alias) We must do two things: update the hidden 
    167167// calendar input field and update the displayed text 
    168 function updatePublicCalendarAlias(newCalPath,calDisplay,calendarCollection) { 
     168function updatePublicCalendarAlias(newCalPath,calDisplay,calTreeNodeId,calendarCollection) { 
    169169  var calendarAliasHolder = document.getElementById("publicAliasHolder"); 
    170170  calendarAliasHolder.value = newCalPath; 
     171  $('#'+calTreeNodeId).addClass("strong"); 
    171172  var bwCalDisplay = document.getElementById("bwPublicCalDisplay"); 
    172173  bwCalDisplay.innerHTML = "Selected calendar: <strong>" + calDisplay + "</strong>";