Changeset 1002

Show
Ignore:
Timestamp:
09/13/06 13:48:05
Author:
johnsa
Message:

added "creator" to event listings; more scheduling work; hid "user" folder in left-menu calendar listing (begin the listing one level down); allowed appearance of inbox and outbox in calendar listing.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r999 r1002  
    409409  padding: 0 0.5em; 
    410410  border-right: 1px solid #999; 
     411  color: black; 
     412  background: #ddd; 
    411413} 
    412414ul.submenu li.selected { 
    …… 
    419421ul.submenu li a:active, 
    420422ul.submenu li a:visited { 
     423  margin: 0; 
     424  padding: 0; 
    421425} 
    422426#standardForm { 
    …… 
    551555table.common .padMeTop { 
    552556  padding-top: 1em !important; 
     557} 
     558table.common .padMe { 
     559  padding: 1em !important; 
    553560} 
    554561#bwEventCalDisplay { 

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

    r999 r1002  
    375375      </a> 
    376376    </h3> 
     377    <!-- normal calendars --> 
    377378    <ul class="calendarTree"> 
    378       <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar" mode="myCalendars"/> 
     379      <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar/calendar[calType &lt; 2]" mode="myCalendars"/> 
     380    </ul> 
     381    <!-- special calendars: inbox, outbox, and trash --> 
     382    <ul class="calendarTree"> 
     383      <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar/calendar[calType &gt; 1]" mode="myCalendars"/> 
    379384    </ul> 
    380385 
    …… 
    24162421  <xsl:template match="calendar" mode="myCalendars"> 
    24172422    <!-- supress Inbox and Outbox for the moment --> 
    2418     <xsl:if test="(name != 'Inbox') and (name != 'Outbox') and (name != 'Deleted')"> 
     2423    <!--<xsl:if test="(name != 'Inbox') and (name != 'Outbox') and (name != 'Deleted')">--> 
     2424    <xsl:if test="name != 'Deleted'"> 
    24192425      <xsl:variable name="id" select="id"/> 
    2420       <xsl:variable name="itemClass"> 
    2421         <xsl:choose> 
    2422           <xsl:when test="/bedework/selectionState/selectionType = 'calendar' 
    2423                           and path = /bedework/selectionState/subscriptions/subscription/calendar/path">selected</xsl:when> 
    2424           <xsl:when test="name='Trash'">trash</xsl:when> 
    2425           <xsl:when test="calendarCollection='false'">folder</xsl:when> 
    2426           <xsl:otherwise>calendar</xsl:otherwise> 
    2427         </xsl:choose> 
    2428       </xsl:variable> 
    2429       <li class="{$itemClass}"> 
     2426      <li> 
     2427        <xsl:attribute name="class"> 
     2428          <xsl:choose> 
     2429            <xsl:when test="/bedework/selectionState/selectionType = 'calendar' 
     2430                            and path = /bedework/selectionState/subscriptions/subscription/calendar/path">selected</xsl:when> 
     2431            <xsl:when test="name='Trash'">trash</xsl:when> 
     2432            <xsl:when test="calendarCollection='false'">folder</xsl:when> 
     2433            <xsl:otherwise>calendar</xsl:otherwise> 
     2434          </xsl:choose> 
     2435        </xsl:attribute> 
    24302436        <xsl:variable name="calPath" select="path"/> 
    24312437        <a href="{$setSelection}&amp;calUrl={$calPath}"> 
    …… 
    24542460    <xsl:if test="(name != 'Inbox') and (name != 'Outbox') and (name != 'Deleted')"> 
    24552461      <xsl:variable name="calPath" select="encodedPath"/> 
    2456       <xsl:variable name="itemClass"> 
    2457         <xsl:choose> 
    2458           <xsl:when test="calendarCollection='false'">folder</xsl:when> 
    2459           <xsl:otherwise>calendar</xsl:otherwise> 
    2460         </xsl:choose> 
    2461       </xsl:variable> 
    2462       <li class="{$itemClass}"> 
     2462      <li> 
     2463        <xsl:attribute name="class"> 
     2464          <xsl:choose> 
     2465            <xsl:when test="calendarCollection='false'">folder</xsl:when> 
     2466            <xsl:otherwise>calendar</xsl:otherwise> 
     2467          </xsl:choose> 
     2468        </xsl:attribute> 
    24632469        <a href="{$calendar-fetchForUpdate}&amp;calPath={$calPath}" title="update"> 
    24642470          <xsl:value-of select="name"/> 
    …… 
    24842490    <xsl:if test="(name != 'Inbox') and (name != 'Outbox') and (name != 'Deleted')"> 
    24852491      <xsl:variable name="calPath" select="encodedPath"/> 
    2486       <xsl:variable name="itemClass"> 
    2487         <xsl:choose> 
    2488           <xsl:when test="calendarCollection='false'">folder</xsl:when> 
    2489           <xsl:otherwise>calendar</xsl:otherwise> 
    2490         </xsl:choose> 
    2491       </xsl:variable> 
    2492       <li class="{$itemClass}"> 
     2492      <li> 
     2493        <xsl:attribute name="class"> 
     2494          <xsl:choose> 
     2495            <xsl:when test="calendarCollection='false'">folder</xsl:when> 
     2496            <xsl:otherwise>calendar</xsl:otherwise> 
     2497          </xsl:choose> 
     2498        </xsl:attribute> 
    24932499        <a href="{$calendar-fetchForDisplay}&amp;calPath={$calPath}" title="display"> 
    24942500          <xsl:value-of select="name"/> 
    …… 
    25522558  <xsl:template match="calendar" mode="selectCalForEventCalTree"> 
    25532559  <!-- supress Inbox and Outbox for the moment --> 
    2554     <xsl:if test="(name != 'Inbox') and (name != 'Outbox') and (name != 'Deleted')"> 
     2560    <!--<xsl:if test="(name != 'Inbox') and (name != 'Outbox') and (name != 'Deleted')">--> 
     2561    <xsl:if test="name != 'Deleted'"> 
    25552562      <xsl:variable name="id" select="id"/> 
    2556       <xsl:variable name="itemClass"> 
    2557         <xsl:choose> 
    2558           <xsl:when test="/bedework/selectionState/selectionType = 'calendar' 
    2559                           and name = /bedework/selectionState/subscriptions/subscription/calendar/name">selected</xsl:when> 
    2560           <xsl:when test="name='Trash'">trash</xsl:when> 
    2561           <xsl:when test="calendarCollection='false'">folder</xsl:when> 
    2562           <xsl:otherwise>calendar</xsl:otherwise> 
    2563         </xsl:choose> 
    2564       </xsl:variable> 
    2565       <li class="{$itemClass}"> 
     2563      <li> 
     2564        <xsl:attribute name="class"> 
     2565          <xsl:choose> 
     2566            <xsl:when test="/bedework/selectionState/selectionType = 'calendar' 
     2567                            and name = /bedework/selectionState/subscriptions/subscription/calendar/name">selected</xsl:when> 
     2568            <xsl:when test="name='Trash'">trash</xsl:when> 
     2569            <xsl:when test="calendarCollection='false'">folder</xsl:when> 
     2570            <xsl:otherwise>calendar</xsl:otherwise> 
     2571          </xsl:choose> 
     2572        </xsl:attribute> 
    25662573        <xsl:variable name="calPath" select="path"/> 
    25672574        <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable> 
    …… 
    39853992        </tr> 
    39863993        <tr> 
    3987           <td> 
     3994          <td class="padMe"> 
    39883995            <form name="eventForm" method="post" action="{$prefs-setAccess}"> 
    39893996              <input type="hidden" name="what" value="in"/> 
    3990               <input type="text" name="who" width="40"/> 
    3991               <input type="radio" name="whoType" value="user" checked="checked"/>user 
    3992               <input type="radio" name="whoType" value="group"/>group 
    3993               <input type="radio" name="whoType" value="owner"/>owner 
    3994  
    3995               <p>may send the following to me:</p> 
     3997              <p> 
     3998                <input type="text" name="who" width="40"/> 
     3999                <input type="radio" name="whoType" value="user" checked="checked"/>user 
     4000                <input type="radio" name="whoType" value="group"/>group 
     4001              </p> 
     4002              <p> 
     4003                <strong>or</strong> 
     4004                <input type="radio" name="whoType" value="owner"/>owner 
     4005                <input type="radio" name="whoType" value="auth"/>authenticated users 
     4006                <input type="radio" name="whoType" value="other"/>anyone 
     4007              </p> 
     4008 
     4009              <p><strong>may send the following to me:</strong></p> 
    39964010 
    39974011              <input type="hidden" name="how" value="S"/> 
    …… 
    40164030            </xsl:for-each> 
    40174031          </td> 
    4018           <td class="leftBorder"> 
     4032          <td class="leftBorder padMe"> 
    40194033            <form name="eventForm" method="post" action="{$prefs-setAccess}"> 
    40204034              <input type="hidden" name="what" value="out"/> 
    4021               <input type="text" name="who" width="40"/> 
    4022               <input type="radio" name="whoType" value="user" checked="checked"/>user 
    4023               <input type="radio" name="whoType" value="group"/>group 
    4024               <input type="radio" name="whoType" value="owner"/>owner 
    4025  
    4026               <p>may send the following on my behalf:</p> 
     4035              <p> 
     4036                <input type="text" name="who" width="40"/> 
     4037                <input type="radio" name="whoType" value="user" checked="checked"/>user 
     4038                <input type="radio" name="whoType" value="group"/>group 
     4039              </p> 
     4040              <p> 
     4041                <strong>or</strong> 
     4042                <input type="radio" name="whoType" value="owner"/>owner 
     4043                <input type="radio" name="whoType" value="auth"/>authenticated users 
     4044                <input type="radio" name="whoType" value="other"/>anyone 
     4045              </p> 
     4046 
     4047              <p><strong>may send the following on my behalf:</strong></p> 
    40274048 
    40284049              <input type="hidden" name="how" value="S"/>