Changeset 2132

Show
Ignore:
Timestamp:
04/14/09 00:55:54
Author:
johnsa
Message:

updates to handling of topical areas, basic fixes and clean up

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2131 r2132  
    154154  <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd/a/@href"/> 
    155155  <xsl:variable name="subscriptions-update" select="/bedework/urlPrefixes/subscriptions/update/a/@href"/> 
     156  <xsl:variable name="subscriptions-delete" select="/bedework/urlPrefixes/subscriptions/delete/a/@href"/> 
    156157  <xsl:variable name="subscriptions-openCloseMod" select="/bedework/urlPrefixes/subscriptions/subOpenCloseMod/a/@href"/> 
    157158  <!-- views --> 
    …… 
    416417                </xsl:when> 
    417418                <xsl:when test="/bedework/page='subscriptions' or 
    418                                 /bedework/page='modSubscription'"> 
     419                                /bedework/page='modSubscription' or 
     420                                /bedework/page='deleteSubConfirm'"> 
    419421                  <xsl:apply-templates select="/bedework/calendars" mode="subscriptions"/> 
    420422                </xsl:when> 
    …… 
    11601162              </xsl:if> 
    11611163              <br/> 
    1162               <span id="calDescriptionsLink"> 
     1164              <!-- span id="calDescriptionsLink"> 
    11631165                <a href="javascript:launchSimpleWindow('{$calendar-fetchDescriptions}')">calendar descriptions</a> 
    1164               </span> 
     1166              </span--> 
    11651167            </td> 
    11661168          </tr> 
    …… 
    24752477            <!-- no direct selecting of folders or folder aliases: we only want users to select the 
    24762478                 underlying calendar aliases --> 
    2477             <!--img src="{$resourcesRoot}/resources/catIcon.gif" width="13" height="13" alt="folder" class="folderForAliasTree" border="0"/--> 
    2478             <input type="checkbox" name="forDiplayOnly" disabled="disabled"/> 
     2479            <img src="{$resourcesRoot}/resources/catIcon.gif" width="13" height="13" alt="folder" class="folderForAliasTree" border="0"/> 
    24792480            <xsl:value-of select="name"/> 
    24802481          </xsl:when> 
    …… 
    43974398              <xsl:call-template name="subscriptionIntro"/> 
    43984399            </xsl:when> 
     4400            <xsl:when test="/bedework/page='deleteSubConfirm'"> 
     4401              <xsl:apply-templates select="/bedework/currentCalendar" mode="deleteSubConfirm"/> 
     4402            </xsl:when> 
    43994403            <xsl:when test="/bedework/creating='true'"> 
    44004404              <xsl:apply-templates select="/bedework/currentCalendar" mode="addSubscription"/> 
    …… 
    45744578                <input type="hidden" value="" name="publicAliasHolder" id="publicAliasHolder"/> 
    45754579                <div id="bwPublicCalDisplay"> 
    4576                   Select the public calendar or folder: 
     4580                  <button type="button" onclick="showPublicCalAliasTree();">Select a public calendar or folder</button> 
    45774581                </div> 
    4578                 <ul id="publicSubscriptionTree" class="calendarTree"> 
     4582                <ul id="publicSubscriptionTree" class="invisible"> 
    45794583                  <xsl:apply-templates select="/bedework/publicCalendars/calendar" mode="selectCalForPublicAliasCalTree"/> 
    45804584                </ul> 
    …… 
    46594663  </xsl:template> 
    46604664 
     4665  <xsl:template match="currentCalendar" mode="deleteSubConfirm"> 
     4666    <xsl:choose> 
     4667      <xsl:when test="isSubscription = 'true'"> 
     4668        <h3>Remove Subscription</h3> 
     4669        <p> 
     4670          The following subscription will be removed. 
     4671          Continue? 
     4672        </p> 
     4673      </xsl:when> 
     4674      <xsl:when test="calType = '0'"> 
     4675        <h3>Delete Folder</h3> 
     4676        <p> 
     4677          The following folder <em>and all its contents</em> will be deleted. 
     4678          Continue? 
     4679        </p> 
     4680      </xsl:when> 
     4681      <xsl:otherwise> 
     4682        <h3>Delete Calendar</h3> 
     4683        <p> 
     4684          The following calendar will be deleted.  Continue? 
     4685        </p> 
     4686      </xsl:otherwise> 
     4687    </xsl:choose> 
     4688 
     4689    <form name="delCalForm" action="{$subscriptions-delete}" method="post"> 
     4690      <table class="eventFormTable"> 
     4691        <tr> 
     4692          <th>Path:</th> 
     4693          <td> 
     4694            <xsl:value-of select="path"/> 
     4695          </td> 
     4696        </tr> 
     4697        <tr> 
     4698          <th>Name:</th> 
     4699          <td> 
     4700            <xsl:value-of select="name"/> 
     4701          </td> 
     4702        </tr> 
     4703        <tr> 
     4704          <th>Summary:</th> 
     4705          <td> 
     4706            <xsl:value-of select="summary"/> 
     4707          </td> 
     4708        </tr> 
     4709        <tr> 
     4710          <th>Description:</th> 
     4711          <td> 
     4712            <xsl:value-of select="desc"/> 
     4713          </td> 
     4714        </tr> 
     4715      </table> 
     4716 
     4717      <table border="0" id="submitTable"> 
     4718        <tr> 
     4719          <td> 
     4720            <input type="submit" name="cancelled" value="Cancel"/> 
     4721          </td> 
     4722          <td align="right"> 
     4723            <xsl:choose> 
     4724              <xsl:when test="isSubscription = 'true'"> 
     4725                <input type="submit" name="delete" value="Yes: Remove Subscription!"/> 
     4726              </xsl:when> 
     4727              <xsl:when test="calType = '0'"> 
     4728                <input type="submit" name="delete" value="Yes: Delete Folder!"/> 
     4729              </xsl:when> 
     4730              <xsl:otherwise> 
     4731                <input type="submit" name="delete" value="Yes: Delete Calendar!"/> 
     4732              </xsl:otherwise> 
     4733            </xsl:choose> 
     4734          </td> 
     4735        </tr> 
     4736      </table> 
     4737    </form> 
     4738  </xsl:template> 
     4739 
    46614740  <!--+++++++++++++++ Views ++++++++++++++++++++--> 
    46624741  <xsl:template match="views" mode="viewList"> 
    …… 
    46944773          <td> 
    46954774            <xsl:for-each select="path"> 
     4775              <xsl:sort select="substring-after(.,$userPath)" order="ascending" case-order="upper-first"/> 
    46964776              <xsl:value-of select="substring-after(.,$userPath)"/> 
    46974777              <xsl:if test="position()!=last()"><br/></xsl:if> 
    …… 
    47434823              </xsl:if> 
    47444824            </xsl:for-each> 
     4825            <!-- extra row to keep the code valid if above rows are empty --> 
     4826            <tr><td>&#160;</td></tr> 
    47454827          </table> 
    47464828        </td> 
    …… 
    47644846              </tr> 
    47654847            </xsl:for-each> 
     4848            <!-- extra row to keep the code valid if above rows are empty --> 
     4849            <tr><td>&#160;</td></tr> 
    47664850          </table> 
    47674851        </td> 
    …… 
    47884872    <h2>Remove View?</h2> 
    47894873 
    4790     <xsl:variable name="viewName" select="/bedework/views/view/name"/> 
    4791     <p>The following view will be removed. <em>Be forewarned: if caching is 
    4792     enabled, removing views from a 
    4793     production system can cause the public interface to throw errors until the 
    4794     cache is flushed (a few minutes).</em> 
     4874    <p> 
     4875      The view <strong><xsl:value-of select="/bedework/currentView/name"/></strong> 
     4876      will be removed. 
    47954877    </p> 
     4878    <p class="note"> 
     4879      Be forewarned: if caching is 
     4880      enabled, removing views from a production system can cause the public 
     4881      interface to throw errors until the 
     4882      cache is flushed (a few minutes). 
     4883    </p> 
    47964884 
    47974885    <p>Continue?</p> 
    47984886 
    4799     <h3 class="viewName"> 
    4800       <xsl:value-of select="$viewName"/> 
    4801     </h3> 
    48024887    <form name="removeView" action="{$view-remove}" method="post"> 
    4803       <input type="hidden" name="name" value="{$viewName}"/> 
     4888      <input type="hidden" name="name"> 
     4889        <xsl:attribute name="value"><xsl:value-of select="/bedework/currentView/name"/></xsl:attribute> 
     4890      </input> 
    48044891      <input type="submit" name="delete" value="Yes: Remove View"/> 
    48054892      <input type="submit" name="cancelled" value="No: Cancel"/> 

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

    r2131 r2132  
    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,calTreeNodeId,calendarCollection) { 
     168function updatePublicCalendarAlias(newCalPath,calDisplay,calendarCollection) { 
    169169  var calendarAliasHolder = document.getElementById("publicAliasHolder"); 
     170  var bwCalDisplay = document.getElementById("bwPublicCalDisplay"); 
    170171  calendarAliasHolder.value = newCalPath; 
    171   $('#'+calTreeNodeId).addClass("strong"); 
    172   var bwCalDisplay = document.getElementById("bwPublicCalDisplay"); 
    173   bwCalDisplay.innerHTML = "Selected calendar: <strong>" + calDisplay + "</strong>"; 
     172  bwCalDisplay.innerHTML = '<strong>' + calDisplay + '</strong> <button type="button" onclick="showPublicCalAliasTree();">change</button>'; 
     173  changeClass("publicSubscriptionTree","invisible"); 
     174} 
     175function showPublicCalAliasTree() { 
     176  changeClass("publicSubscriptionTree","calendarTree"); 
    174177} 
    175178// set the subscription URI when creating or updating a subscription