Changeset 1971

Show
Ignore:
Timestamp:
11/18/08 16:54:58
Author:
johnsa
Message:

updating subscriptions in user client

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1911 r1971  
    243243  padding-right: 4px; 
    244244  margin-right: 4px; 
    245   border-right: 1px solid #aaa; 
     245  /*border-right: 1px solid #aaa;*/ 
    246246} 
    247247#bedework #bodyBlock td#sideBarClosed { 

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

    r1967 r1971  
    373373         losing the script closing tags (which avoids browser problems) --> 
    374374    <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js">&#160;</script> 
     375    <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
     376    <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script> 
     377    <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> 
    375378    <xsl:if test="/bedework/page='modSchedulingPrefs' or 
    376379                  /bedework/page='modPrefs' or 
    …… 
    400403        </xsl:when> 
    401404        <xsl:otherwise> 
    402           <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
    403           <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script> 
    404           <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> 
    405405          <script type="text/javascript"> 
    406406            <xsl:comment> 
    …… 
    570570 
    571571    <h3> 
    572       <a href="{$subscriptions-showSubsMenu}" title="subscribe to calendars or iCal feeds"> 
     572      <!-- a href="{$subscriptions-showSubsMenu}" title="subscribe to calendars or iCal feeds"> 
    573573        subscribe 
    574       </a> 
    575       <a href="{$calendar-fetch}" title="manage calendars" class="calManageLink"> 
     574      </a --> 
     575      <a href="{$calendar-fetch}" title="manage calendars and subscriptions" class="calManageLink"> 
    576576        manage 
    577577      </a> 
    …… 
    42254225  <!--+++++++++++++++ Calendars ++++++++++++++++++++--> 
    42264226  <xsl:template match="calendars" mode="manageCalendars"> 
    4227     <h2>Manage Calendars</h2> 
     4227    <h2>Manage Calendars &amp; Subscriptions</h2> 
    42284228    <table id="calendarTable"> 
    42294229      <tr> 
    …… 
    43014301      <xsl:attribute name="class"> 
    43024302        <xsl:choose> 
    4303           <xsl:when test="/bedework/selectionState/selectionType = 'calendar' 
     4303          <xsl:when test="/bedework/selectionState/selectionType = 'collections' 
    43044304                          and path = /bedework/selectionState/subscriptions/subscription/calendar/path">selected</xsl:when> 
    43054305          <xsl:when test="calType='2' or calType='3'">trash</xsl:when> 
    …… 
    47714771 
    47724772  <xsl:template name="calendarList"> 
    4773     <h3>Managing Calendars</h3> 
     4773    <h3>Managing Calendars &amp; Subscriptions</h3> 
    47744774    <ul> 
    4775       <li>Select an item from the calendar list on the left to modify 
    4776       a calendar or folder.</li> 
     4775      <li>Select an item from the calendar tree on the left to modify a<br/> 
     4776      calendar (<img src="{$resourcesRoot}/resources/calIcon-sm.gif" width="13" height="13" alt="true" border="0"/>), 
     4777      subscription (<img src="{$resourcesRoot}/resources/calIconAlias2-sm.gif" width="17" height="13" alt="true" border="0"/>), or 
     4778      folder (<img src="{$resourcesRoot}/resources/catIcon.gif" width="13" height="13" alt="true" border="0"/>).</li> 
    47774779      <li>Select the 
    47784780      <img src="{$resourcesRoot}/resources/calAddIcon.gif" width="13" height="13" alt="true" border="0"/> 
    4779       icon to add a new calendar or folder to the tree. 
     4781      icon to add a new calendar, subscription, or folder to the tree. 
    47804782        <ul> 
    47814783          <li>Folders may only contain calendars and subfolders.</li>