Changeset 1909

Show
Ignore:
Timestamp:
07/30/08 16:50:52
Author:
johnsa
Message:

user client: start at changing the subscription model in the UI

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1884 r1909  
     1body { 
     2  color: black; 
     3  background-color: white; 
     4} 
     5 
    16#bedework { 
    27  /* this is the main wrapper div used to encapsulate all Bedework CSS; we 
    …… 
    234239  background: transparent; 
    235240  text-decoration: none; 
     241} 
     242#bedework #bodyBlock td#sideBar h3 a.calManageLink { 
     243  padding-right: 4px; 
     244  margin-right: 4px; 
     245  border-right: 1px solid #aaa; 
    236246} 
    237247#bedework #bodyBlock td#sideBarClosed { 
    …… 
    15031513} 
    15041514#bedework #subsTable td.cals { 
    1505   width: 200px; 
     1515  white-space: nowrap; 
    15061516} 
    15071517#bedework .calendarTree ul { 
    …… 
    15721582#bedework #submitTable td { 
    15731583  white-space: nowrap; 
     1584} 
     1585#bedework #subsMenu li { 
     1586  padding-bottom: 0.5em; 
     1587} 
     1588#bedework #content { 
     1589  /* for genric content - no tables */ 
     1590  margin: 0; 
     1591  padding: 1em; 
    15741592} 
    15751593#bedework .note { 

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

    r1905 r1909  
    105105  <xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions/a/@href"/> 
    106106  <xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd/a/@href"/> 
     107  <xsl:variable name="calendar-initAddExternal" select="/bedework/urlPrefixes/calendar/initAddExternal/a/@href"/> 
     108  <xsl:variable name="calendar-initAddAlias" select="/bedework/urlPrefixes/calendar/initAddAlias/a/@href"/> 
    107109  <xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete/a/@href"/> 
    108110  <xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay/a/@href"/> 
    …… 
    114116  <xsl:variable name="calendar-listForExport" select="/bedework/urlPrefixes/calendar/listForExport/a/@href"/> 
    115117  <!-- subscriptions --> 
     118  <xsl:variable name="subscriptions-showSubsMenu" select="/bedework/urlPrefixes/subscriptions/showSubsMenu/a/@href"/> 
    116119  <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch/a/@href"/> 
    117120  <xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate/a/@href"/> 
    118   <xsl:variable name="subscriptions-addSubByUri" select="/bedework/urlPrefixes/subscriptions/addSubByUri/a/@href"/> 
    119   <xsl:variable name="subscriptions-subscribeByUri" select="/bedework/urlPrefixes/subscriptions/subscribeByUri/a/@href"/> 
    120121  <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd/a/@href"/> 
    121122  <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe/a/@href"/> 
    …… 
    261262                    <xsl:call-template name="deleteLocationConfirm"/> 
    262263                  </xsl:when> 
     264                  <xsl:when test="/bedework/page='subsMenu'"> 
     265                    <xsl:call-template name="subsMenu"/> 
     266                  </xsl:when> 
    263267                  <xsl:when test="/bedework/page='subscriptions' or 
    264                                   /bedework/page='modSubscription' or 
    265                                   /bedework/page='addSubByUri'"> 
     268                                  /bedework/page='modSubscription'"> 
    266269                    <xsl:apply-templates select="/bedework/subscriptions"/> 
     270                  </xsl:when> 
     271                  <xsl:when test="/bedework/page='addAlias'"> 
     272                    <xsl:call-template name="addAlias"/> 
    267273                  </xsl:when> 
    268274                  <xsl:when test="/bedework/page='subInaccessible'"> 
    …… 
    538544 
    539545    <h3> 
    540       <a href="{$calendar-fetch}" title="manage calendars"> 
     546      <a href="{$subscriptions-showSubsMenu}" title="subscribe to calendars or iCal feeds"> 
     547        subscribe 
     548      </a> 
     549      <a href="{$calendar-fetch}" title="manage calendars" class="calManageLink"> 
    541550        manage 
    542551      </a> 
    …… 
    545554    <!-- normal calendars --> 
    546555    <ul class="calendarTree"> 
    547       <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar/calendar[canAlias = 'true']" mode="myCalendars"/> 
     556      <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar" mode="myCalendars"/> 
    548557    </ul> 
    549558    <!-- special calendars: inbox, outbox, and trash --> 
    …… 
    555564    </ul> 
    556565 
     566    <!-- 
    557567    <h3> 
    558568      <a href="{$subscriptions-fetch}" title="manage subscriptions"> 
    …… 
    571581        </xsl:otherwise> 
    572582      </xsl:choose> 
    573     </ul> 
     583    </ul>--> 
    574584 
    575585    <h3>options</h3> 
    …… 
    42034213      <xsl:if test="calendar"> 
    42044214        <ul> 
    4205           <xsl:apply-templates select="calendar" mode="myCalendars"/> 
     4215          <xsl:apply-templates select="calendar[canAlias = 'true']" mode="myCalendars"/> 
    42064216        </ul> 
    42074217      </xsl:if> 
    …… 
    46444654          <li>Calendars may only contain events (and other calendar items).</li> 
    46454655          <li> 
    4646             If a calendar is empty, it may be converted to a folder and vice 
    4647             versa.  If a calendar or folder are not empty, it may not be 
    4648             converted. 
     4656            An empty calendar may be converted to a folder and vice 
     4657            versa. 
    46494658          </li> 
    46504659        </ul> 
    …… 
    49184927 
    49194928  <!--+++++++++++++++ Subscriptions ++++++++++++++++++++--> 
     4929  <xsl:template name="subsMenu"> 
     4930    <h2>Add Subscriptions</h2> 
     4931    <div id="content"> 
     4932      <h4>Subscribe to:</h4> 
     4933      <ul id="subsMenu"> 
     4934        <li> 
     4935          <a href="{$subscriptions-fetch}" title="manage subscriptions"> 
     4936            a public calendar (in this system) 
     4937          </a> 
     4938        </li> 
     4939        <li> 
     4940          <a href="{$calendar-initAddAlias}&amp;calPath=/user/johnsa"> 
     4941            a user calendar (in this system) 
     4942          </a> 
     4943        </li> 
     4944        <li> 
     4945           an external iCal feed (e.g. Google, Eventful, etc) 
     4946        </li> 
     4947      </ul> 
     4948    </div> 
     4949  </xsl:template> 
     4950 
    49204951  <xsl:template match="subscriptions"> 
    4921     <h2>Manage Subscriptions</h2> 
     4952    <h2>Subscribe to a Public Calendar</h2> 
    49224953    <table id="subsTable"> 
    49234954      <tr> 
    49244955        <td class="cals"> 
    4925           <p class="smaller"> 
    4926             Select a calendar below to add a <em><strong>new</strong></em> 
    4927             internal subscription. <!-- or 
    4928             <a href="{$subscriptions-initAdd}&amp;calUri=please enter a calendar uri"> 
    4929             subscribe to an external calendar</a>.--> 
    4930           </p> 
    4931           <h3>My calendars</h3> 
    4932           <ul class="calendarTree"> 
    4933             <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar[canAlias='true']" mode="subscribe"/> 
    4934           </ul> 
    49354956          <h3>Public calendars</h3> 
    49364957          <ul class="calendarTree"> 
    …… 
    49394960        </td> 
    49404961        <td class="subs"> 
    4941           <xsl:choose> 
    4942             <xsl:when test="/bedework/page='subscriptions'"> 
    4943               <xsl:call-template name="subscriptionList"/> 
    4944             </xsl:when> 
    4945             <xsl:when test="/bedework/page='addSubByUri'"> 
    4946               <xsl:call-template name="addSubByUri"/> 
    4947             </xsl:when> 
    4948             <xsl:when test="/bedework/creating='true'"> 
    4949               <xsl:apply-templates select="subscription" mode="addSystemSubscription"/> 
    4950             </xsl:when> 
    4951             <xsl:otherwise> 
    4952               <xsl:apply-templates select="subscription" mode="modSubscription"/> 
    4953             </xsl:otherwise> 
    4954           </xsl:choose> 
     4962          <h3>Add a public subscription</h3> 
     4963          <p> 
     4964            Select a calendar to the left to add a new internal public subscription. 
     4965          </p> 
     4966          <h3>Add a public subscription</h3> 
     4967          <p class="note">*the subsciption name must be unique</p> 
     4968          <form name="subscribeForm" action="{$calendar-update}" onsubmit="return setSubscriptionUri(this,'bwcal://')" method="post"> 
     4969            <input type="hidden" value="" name="aliasUri"/> 
     4970            <table class="common" cellspacing="0"> 
     4971              <tr> 
     4972                <td class="fieldname">Name:</td> 
     4973                <td> 
     4974                  <xsl:variable name="subName" select="name"/> 
     4975                  <input type="text" value="{$subName}" name="calendar.name" size="60"/> 
     4976                </td> 
     4977              </tr> 
     4978              <!--<xsl:if test="internal='false'"> 
     4979                <tr> 
     4980                  <td class="fieldname">Uri:</td> 
     4981                  <td> 
     4982                    <xsl:variable name="calPath" select="uri"/> 
     4983                    <input type="text" value="{$calPath}" name="aliasUri" size="60"/> 
     4984                  </td> 
     4985                </tr> 
     4986              </xsl:if> 
     4987              <tr> 
     4988                <td class="fieldname">Display:</td> 
     4989                <td> 
     4990                  <input type="radio" value="true" name="subscription.display" checked="checked"/> yes 
     4991                  <input type="radio" value="false" name="subscription.display"/> no 
     4992                </td> 
     4993              </tr>--> 
     4994              <tr> 
     4995                <td class="fieldname">Affects Free/Busy:</td> 
     4996                <td> 
     4997                  <input type="radio" value="true" name="subscription.affectsFreeBusy"/> yes 
     4998                  <input type="radio" value="false" name="subscription.affectsFreeBusy" checked="checked"/> no 
     4999                </td> 
     5000              </tr> 
     5001              <tr> 
     5002                <td class="fieldname">Style:</td> 
     5003                <td> 
     5004                  <select name="subscription.style"> 
     5005                    <option value="default">default</option> 
     5006                    <xsl:for-each select="document('subColors.xml')/subscriptionColors/color"> 
     5007                      <xsl:variable name="subColor" select="."/> 
     5008                      <option value="{$subColor}" class="{$subColor}"> 
     5009                        <xsl:value-of select="@name"/> 
     5010                      </option> 
     5011                    </xsl:for-each> 
     5012                  </select> 
     5013                </td> 
     5014              </tr> 
     5015              <!--<tr> 
     5016                <td class="fieldname">Unremovable:</td> 
     5017                <td> 
     5018                  <input type="radio" value="true" name="subscription.unremoveable" size="60"/> true 
     5019                  <input type="radio" value="false" name="subscription.unremoveable" size="60" checked="checked"/> false 
     5020                </td> 
     5021              </tr>--> 
     5022            </table> 
     5023            <table border="0" id="submitTable"> 
     5024              <tr> 
     5025                <td> 
     5026                  <input type="submit" name="addSubscription" value="Add Subscription"/> 
     5027                  <input type="submit" name="cancelled" value="cancel"/> 
     5028                </td> 
     5029              </tr> 
     5030            </table> 
     5031          </form> 
    49555032        </td> 
    49565033      </tr> 
    …… 
    49805057  </xsl:template> 
    49815058 
    4982   <!-- add a subscription to a user calendar by user and path; this is actually 
    4983        a subscription to an arbitrary URI (which we can expose later) --> 
    4984   <xsl:template name="addSubByUri"> 
    4985     <h3>Add Subscription to User Calendar</h3> 
    4986     <p class="note">*the subsciption name must be unique</p> 
    4987     <form name="subscribeForm" action="{$subscriptions-initAdd}" onsubmit="return setSubscriptionUri(this,'bwcal:///user/')" method="post"> 
    4988       <table class="common" cellspacing="0"> 
    4989         <tr> 
    4990           <td class="fieldname">Name:</td> 
    4991           <td> 
    4992             <input type="text" value="" name="name" size="60"/> 
    4993           </td> 
    4994         </tr> 
    4995         <!-- the following would be for an arbitrary URI.  We'll add this later. 
    4996         <tr> 
    4997           <td class="fieldname">Uri:</td> 
    4998           <td> 
    4999             <input type="text" value="" name="calUri" size="60"/> 
    5000           </td> 
    5001         </tr>--> 
    5002         <tr> 
    5003           <td class="fieldname">User ID:</td> 
    5004           <td> 
    5005             <input type="hidden" value="" name="calUri"/> 
    5006             <input type="text" value="" name="userId" size="20"/> 
    5007             <span class="note">ex: janedoe</span> 
    5008           </td> 
    5009         </tr> 
    5010         <tr> 
    5011           <td class="fieldname">Calendar path:</td> 
    5012           <td> 
    5013             <input type="text" value="" name="userPath" size="20"/> 
    5014             <span class="note"> 
    5015               (optional) ex: calendar<br/> 
    5016               to subscribe to bwcal:///user/janedoe/someFolder/someCalendar, enter "someFolder/someCalendar" 
    5017             </span> 
    5018           </td> 
    5019         </tr> 
    5020         <!--<tr> 
    5021           <td class="fieldname">Display:</td> 
    5022           <td> 
    5023             <input type="radio" value="true" name="display" checked="checked"/> yes 
    5024             <input type="radio" value="false" name="display"/> no 
    5025           </td> 
    5026         </tr>--> 
    5027         <tr> 
    5028           <td class="fieldname">Affects Free/Busy:</td> 
    5029           <td> 
    5030             <input type="radio" value="true" name="affectsFreeBusy"/> yes 
    5031             <input type="radio" value="false" name="affectsFreeBusy" checked="checked"/> no 
    5032           </td> 
    5033         </tr> 
    5034         <tr> 
    5035           <td class="fieldname">Style:</td> 
    5036           <td> 
    5037             <select name="style"> 
    5038               <option value="default">default</option> 
    5039               <xsl:for-each select="document('subColors.xml')/subscriptionColors/color"> 
    5040                 <xsl:variable name="subColor" select="."/> 
    5041                 <option value="{$subColor}" class="{$subColor}"> 
    5042                   <xsl:value-of select="@name"/> 
    5043                 </option> 
    5044               </xsl:for-each> 
    5045             </select> 
    5046           </td> 
    5047         </tr> 
    5048         <!--<tr> 
    5049           <td class="fieldname">Unremovable:</td> 
    5050           <td> 
    5051             <input type="radio" value="true" name="unremoveable" size="60"/> true 
    5052             <input type="radio" value="false" name="unremoveable" size="60" checked="checked"/> false 
    5053           </td> 
    5054         </tr>--> 
    5055       </table> 
    5056       <table border="0" id="submitTable"> 
    5057         <tr> 
    5058           <td> 
    5059             <input type="submit" name="addSubscription" value="Add Subscription"/> 
    5060             <input type="submit" name="cancelled" value="cancel"/> 
    5061           </td> 
    5062         </tr> 
    5063       </table> 
    5064     </form> 
    5065  
    5066     <ul class="note" style="margin-left: 2em;"> 
    5067       <li>The <strong>Name</strong> is anything you want to call your subscription.</li> 
    5068       <li> 
    5069         The <strong>Path</strong> is the name of the folder and/or calendar within 
    5070         the remote user's calendar tree.  For example, to subscribe to 
    5071         bwcal:///user/johnsa/someFolder/someCalendar, enter "someFolder/someCalendar" 
    5072       </li> 
    5073       <li> 
    5074         You must be granted at least read access to the other user's calendar 
    5075         to subscribe to it. 
    5076       </li> 
    5077     </ul> 
    5078   </xsl:template> 
    5079  
    5080   <!-- add a subscription to a public calendar within the system --> 
    5081   <xsl:template match="subscription" mode="addSystemSubscription"> 
    5082     <h3>Add New Subscription</h3> 
    5083     <p class="note">*the subsciption name must be unique</p> 
    5084     <form name="subscribeForm" action="{$subscriptions-subscribe}" method="post"> 
    5085       <table class="common" cellspacing="0"> 
    5086         <tr> 
    5087           <td class="fieldname">Name:</td> 
    5088           <td> 
    5089             <xsl:variable name="subName" select="name"/> 
    5090             <input type="text" value="{$subName}" name="subscription.name" size="60"/> 
    5091           </td> 
    5092         </tr> 
    5093         <xsl:if test="internal='false'"> 
     5059  <!-- add a subscription to a user calendar by user and path --> 
     5060  <xsl:template name="addAlias"> 
     5061    <h2>Subscribe to User Calendar</h2> 
     5062    <div id="content"> 
     5063      <p class="note">*the subsciption name must be unique</p> 
     5064      <form name="subscribeForm" action="{$calendar-update}" onsubmit="return setSubscriptionUri(this,'bwcal:///user/')" method="post"> 
     5065        <table class="common" cellspacing="0"> 
     5066          <tr> 
     5067            <td class="fieldname">Name:</td> 
     5068            <td> 
     5069              <input type="text" value="" name="calendar.name" size="60"/> 
     5070            </td> 
     5071          </tr> 
     5072          <!-- the following would be for an arbitrary URI.  We'll add this later. 
    50945073          <tr> 
    50955074            <td class="fieldname">Uri:</td> 
    50965075            <td> 
    5097               <xsl:variable name="calPath" select="uri"/> 
    5098               <input type="text" value="{$calPath}" name="calPath" size="60"/> 
     5076              <input type="text" value="" name="aliasUri" size="60"/> 
     5077            </td> 
     5078          </tr>--> 
     5079          <tr> 
     5080            <td class="fieldname">User ID:</td> 
     5081            <td> 
     5082              <input type="hidden" value="" name="aliasUri"/> 
     5083              <input type="text" value="" name="userId" size="20"/> 
     5084              <span class="note"> ex: janedoe</span> 
    50995085            </td> 
    51005086          </tr> 
    5101         </xsl:if> 
    5102         <!--<tr> 
    5103           <td class="fieldname">Display:</td> 
    5104           <td> 
    5105             <input type="radio" value="true" name="subscription.display" checked="checked"/> yes 
    5106             <input type="radio" value="false" name="subscription.display"/> no 
    5107           </td> 
    5108         </tr>--> 
    5109         <tr> 
    5110           <td class="fieldname">Affects Free/Busy:</td> 
    5111           <td> 
    5112             <input type="radio" value="true" name="subscription.affectsFreeBusy"/> yes 
    5113             <input type="radio" value="false" name="subscription.affectsFreeBusy" checked="checked"/> no 
    5114           </td> 
    5115         </tr> 
    5116         <tr> 
    5117           <td class="fieldname">Style:</td> 
    5118           <td> 
    5119             <select name="subscription.style"> 
    5120               <option value="default">default</option> 
    5121               <xsl:for-each select="document('subColors.xml')/subscriptionColors/color"> 
    5122                 <xsl:variable name="subColor" select="."/> 
    5123                 <option value="{$subColor}" class="{$subColor}"> 
    5124                   <xsl:value-of select="@name"/> 
    5125                 </option> 
    5126               </xsl:for-each> 
    5127             </select> 
    5128           </td> 
    5129         </tr> 
    5130         <!--<tr> 
    5131           <td class="fieldname">Unremovable:</td> 
    5132           <td> 
    5133             <input type="radio" value="true" name="subscription.unremoveable" size="60"/> true 
    5134             <input type="radio" value="false" name="subscription.unremoveable" size="60" checked="checked"/> false 
    5135           </td> 
    5136         </tr>--> 
    5137       </table> 
    5138       <table border="0" id="submitTable"> 
    5139         <tr> 
    5140           <td> 
    5141             <input type="submit" name="addSubscription" value="Add Subscription"/> 
    5142             <input type="submit" name="cancelled" value="cancel"/> 
    5143           </td> 
    5144         </tr> 
    5145       </table> 
    5146     </form> 
    5147   </xsl:template> 
    5148  
     5087          <tr> 
     5088            <td class="fieldname">Calendar path:</td> 
     5089            <td> 
     5090              <input type="text" value="" name="userPath" size="20"/> 
     5091              <span class="note"> ex: calendar</span> 
     5092            </td> 
     5093          </tr> 
     5094          <!--<tr> 
     5095            <td class="fieldname">Display:</td> 
     5096            <td> 
     5097              <input type="radio" value="true" name="display" checked="checked"/> yes 
     5098              <input type="radio" value="false" name="display"/> no 
     5099            </td> 
     5100          </tr>--> 
     5101          <tr> 
     5102            <td class="fieldname">Affects Free/Busy:</td> 
     5103            <td> 
     5104              <input type="radio" value="true" name="affectsFreeBusy"/> yes 
     5105              <input type="radio" value="false" name="affectsFreeBusy" checked="checked"/> no 
     5106            </td> 
     5107          </tr> 
     5108          <tr> 
     5109            <td class="fieldname">Style:</td> 
     5110            <td> 
     5111              <select name="style"> 
     5112                <option value="default">default</option> 
     5113                <xsl:for-each select="document('subColors.xml')/subscriptionColors/color"> 
     5114                  <xsl:variable name="subColor" select="."/> 
     5115                  <option value="{$subColor}" class="{$subColor}"> 
     5116                    <xsl:value-of select="@name"/> 
     5117                  </option> 
     5118                </xsl:for-each> 
     5119              </select> 
     5120            </td> 
     5121          </tr> 
     5122          <!--<tr> 
     5123            <td class="fieldname">Unremovable:</td> 
     5124            <td> 
     5125              <input type="radio" value="true" name="unremoveable" size="60"/> true 
     5126              <input type="radio" value="false" name="unremoveable" size="60" checked="checked"/> false 
     5127            </td> 
     5128          </tr>--> 
     5129        </table> 
     5130        <table border="0" id="submitTable"> 
     5131          <tr> 
     5132            <td> 
     5133              <input type="submit" name="addSubscription" value="Add Subscription"/> 
     5134              <input type="submit" name="cancelled" value="cancel"/> 
     5135            </td> 
     5136          </tr> 
     5137        </table> 
     5138      </form> 
     5139 
     5140      <ul class="note" style="margin-left: 2em;"> 
     5141        <li>The <strong>Name</strong> is anything you want to call your subscription.</li> 
     5142        <li>The <strong>User ID</strong> is the user id that owns the calendar</li> 
     5143        <li> 
     5144          The <strong>Path</strong> is the name of the folder and/or calendar within 
     5145          the remote user's calendar tree.  For example, to subscribe to 
     5146          janedoe/someFolder/someCalendar, enter "someFolder/someCalendar".  To subscribe to janedoe's root folder, leave this field blank. 
     5147        </li> 
     5148        <li> 
     5149          You must be granted at least read access to the other user's calendar 
     5150          to subscribe to it. 
     5151        </li> 
     5152        <li> 
     5153          You can add subscriptions to your own calendars to help group and organize collections you may wish to share. 
     5154        </li> 
     5155      </ul> 
     5156    </div> 
     5157  </xsl:template> 
     5158 
     5159<!-- DEPRECTATED --> 
    51495160  <xsl:template match="subscription" mode="modSubscription"> 
    51505161    <h3>Modify Subscription</h3> 
    …… 
    52695280  </xsl:template> 
    52705281 
     5282<!-- DEPRECTATED --> 
    52715283  <xsl:template name="subscriptionList"> 
    52725284    <h3>Current subscriptions</h3> 
    …… 
    53255337      </xsl:for-each> 
    53265338    </table> 
    5327     <h4><a href="{$subscriptions-addSubByUri}">Subscribe to another user's calendar</a></h4> 
    5328   </xsl:template> 
    5329  
     5339  </xsl:template> 
     5340 
     5341<!-- DEPRECTATED --> 
    53305342  <xsl:template match="subscription" mode="mySubscriptions"> 
    53315343    <li> 
    …… 
    53595371  </xsl:template> 
    53605372 
     5373<!-- DEPRECTATED --> 
    53615374  <xsl:template name="subInaccessible"> 
    53625375    <h2 class="bwStatusConfirmed">Inaccessible</h2> 

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml

    r1067 r1909  
    2727    to the maximum extent the law permits. --> 
    2828 
     29<!-- 
     30 
     31  Bedework Subscription Colors 
     32 
     33  Parameters 
     34    name = value suitable for displaying in a UI 
     35    rgb  = rgb value for embedding in objects, e.g. calendars 
     36 
     37  Value 
     38    The value is a class name reprsented in subColors.css. 
     39    Future versions of Bedework will imbed rgb values as properties of 
     40    calendars, and will use these values directly. 
     41    The class names are kept for Bedework 3.4.1.1 backwards compatibility. 
     42 
     43 --> 
     44 
     45 
    2946<subscriptionColors> 
    3047  <!-- light pastels --> 
    31   <color name="white">bwwhite</color> 
    32   <color name="lt pink">bwltpink</color> 
    33   <color name="lt purple">bwltpurple</color> 
    34   <color name="lt steelblue">bwltsteelblue</color> 
    35   <color name="lt blue">bwltblue</color> 
    36   <color name="lt aquamarine">bwltaquamarine</color> 
    37   <color name="lt seagreen">bwltaquamarine</color> 
    38   <color name="lt green">bwltgreen</color> 
    39   <color name="lt yellow">bwltyellow</color> 
    40   <color name="lt salmon">bwltsalmon</color> 
     48  <color name="white" rgb="ffffff" rgb="">bwwhite</color> 
     49  <color name="lt pink" rgb="fddeee">bwltpink</color> 
     50  <color name="lt purple" rgb="ddd4e8">bwltpurple</color> 
     51  <color name="lt steelblue" rgb="bfd5e8">bwltsteelblue</color> 
     52  <color name="lt blue" rgb="ccecef">bwltblue</color> 
     53  <color name="lt aquamarine" rgb="b3e2dd">bwltaquamarine</color> 
     54  <color name="lt seagreen" rgb="cfeccf">bwltaquamarine</color> 
     55  <color name="lt green" rgb="e0f3b0">bwltgreen</color> 
     56  <color name="lt yellow" rgb="ffffb0">bwltyellow</color> 
     57  <color name="lt salmon" rgb="feebc9">bwltsalmon</color> 
    4158 
    4259  <!-- medium pastels --> 
    43   <color name="gray">bwgray</color> 
    44   <color name="pink">bwpink</color> 
    45   <color name="purple">bwpurple</color> 
    46   <color name="steelblue">bwsteelblue</color> 
    47   <color name="blue">bwblue</color> 
    48   <color name="aquamarine">bwaquamarine</color> 
    49   <color name="seagreen">bwseagreen</color> 
    50   <color name="green">bwgreen</color> 
     60  <color name="gray" rgb="eeeeee">bwgray</color> 
     61  <color name="pink" rgb="fbb6d1">bwpink</color> 
     62  <color name="purple" rgb="c1b3d7">bwpurple</color> 
     63  <color name="steelblue" rgb="94a8d0">bwsteelblue</color> 
     64  <color name="blue" rgb="9acedf">bwblue</color> 
     65  <color name="aquamarine" rgb="86cfbe">bwaquamarine</color> 
     66  <color name="seagreen" rgb="b5e1ae">bwseagreen</color> 
     67  <color name="green" rgb="bfe476">bwgreen</color> 
    5168  <!-- don't allow bright yellow - reserve for a hover color 
    52   <color name="yellow">bwyellow</color> --> 
    53   <color name="salmon">bwsalmon</color> 
     69  <color name="yellow" rgb="fffa81">bwyellow</color> --> 
     70  <color name="salmon" rgb="fdcaa2">bwsalmon</color> 
    5471 
    5572  <!-- dark pastels --> 
    56   <color name="md gray">bwmdgray</color> 
    57   <color name="md pink">bwmdpink</color> 
    58   <color name="md purple">bwmdpurple</color> 
    59   <color name="md steelblue">bwmdsteelblue</color> 
    60   <color name="md blue">bwmdblue</color> 
    61   <color name="md aquamarine">bwmdaquamarine</color> 
    62   <color name="md seagreen">bwmdseagreen</color> 
    63   <color name="md green">bwmdgreen</color> 
     73  <color name="md gray" rgb="dddddd">bwmdgray</color> 
     74  <color name="md pink" rgb="f98cb6">bwmdpink</color> 
     75  <color name="md purple" rgb="a589c1">bwmdpurple</color> 
     76  <color name="md steelblue" rgb="7589bf">bwmdsteelblue</color> 
     77  <color name="md blue" rgb="6fb7d6">bwmdblue</color> 
     78  <color name="md aquamarine" rgb="48b5a3">bwmdaquamarine</color> 
     79  <color name="md seagreen" rgb="91d290">bwmdseagreen</color> 
     80  <color name="md green" rgb="85ca5d">bwmdgreen</color> 
    6481  <!-- don't allow bright yellow - reserve for a hover color 
    65   <color name="md yellow">bwmdyellow</color> --> 
    66   <color name="md salmon">bwmdsalmon</color> 
     82  <color name="md yellow" rgb="ffed62">bwmdyellow</color> --> 
     83  <color name="md salmon" rgb="fca985">bwmdsalmon</color> 
    6784</subscriptionColors> 

  • trunk/deployment/webuser/webapp/resources/demoskins/resources/bedework.js

    r1509 r1909  
    184184      } 
    185185    } 
    186     formObj.calUri.value = fullUri; 
     186    formObj.aliasUri.value = fullUri; 
    187187    return true; 
    188188  } else {