Changeset 1315

Show
Ignore:
Timestamp:
03/28/07 11:03:34
Author:
johnsa
Message:

user client: added inbox and outbox icons

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1314 r1315  
    39563956          </td> 
    39573957        </tr> 
    3958         <tr> 
     3958        <!--<tr> 
    39593959          <th>12 or 24 hour clock/time:</th> 
    39603960          <td> 
    3961             <select name="defaultUserHour24"> 
     3961            <select name=""> 
    39623962              <option value="-1">select preference...</option> 
    39633963              <option value="true"> 
    3964                 <xsl:if test="/bedeworkadmin/system/defaultUserHour24 = 'true'"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     3964                <xsl:if test="/bedeworkadmin/system/NEEDPARAM = 'true'"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
    39653965                Use 24 hour clock/time 
    39663966              </option> 
    39673967              <option value="false"> 
    3968                 <xsl:if test="/bedeworkadmin/system/defaultUserHour24 = 'false'"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     3968                <xsl:if test="/bedeworkadmin/system/NEEDPARAM = 'false'"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
    39693969                Use 12 Hour clock/time + am/pm 
    39703970              </option> 
    …… 
    39743974            </div> 
    39753975          </td> 
    3976         </tr> 
     3976        </tr>--> 
    39773977        <tr> 
    39783978          <th>System id:</th> 

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

    r1313 r1315  
    13751375  list-style-image: url(../../resources/trashIcon.gif); 
    13761376} 
     1377.calendarTree li.inbox { 
     1378  list-style-image: url(../../resources/inboxIcon.gif); 
     1379} 
     1380.calendarTree li.outbox { 
     1381  list-style-image: url(../../resources/outboxIcon.gif); 
     1382} 
    13771383.calendarTree li.deleted { 
    13781384  list-style-image: url(../../resources/calIconDeleted-sm.gif); 
    …… 
    13911397  color: black; 
    13921398  background-color: #ff3; 
     1399} 
     1400.inoutboxActive { 
     1401  font-weight: bold; 
     1402  font-size: 0.9em; 
    13931403} 
    13941404img.subStyle { 

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

    r1313 r1315  
    37973797 
    37983798  <xsl:template match="calendar" mode="mySpecialCalendars"> 
    3799     <!-- Trash = 2, Deleted = 3, Busy = 4, Inbox = 5, Outbox = 6  --> 
     3799    <!-- calTypes: Trash = 2, Deleted = 3, Busy = 4, Inbox = 5, Outbox = 6  --> 
    38003800    <xsl:variable name="id" select="id"/> 
    38013801    <li> 
    …… 
    38053805                          and path = /bedework/selectionState/subscriptions/subscription/calendar/path">selected</xsl:when> 
    38063806          <xsl:when test="calType='2' or calType='3'">trash</xsl:when> 
     3807          <xsl:when test="calType='5'">inbox</xsl:when> 
     3808          <xsl:when test="calType='6'">outbox</xsl:when> 
    38073809          <xsl:when test="calendarCollection='false'">folder</xsl:when> 
    38083810          <xsl:otherwise>calendar</xsl:otherwise> 
    …… 
    38123814        <xsl:choose> 
    38133815          <xsl:when test="calType='5'"> 
    3814             <strong> 
    3815               <a href="{$showInbox}"> 
    3816                 <xsl:value-of select="name"/> 
    3817               </a> 
    3818               <xsl:text> </xsl:text> 
    3819               (<xsl:value-of select="/bedework/inboxState/numActive"/>) 
    3820             </strong> 
     3816            <a href="{$showInbox}" title="incoming scheduling requests"> 
     3817              <xsl:value-of select="name"/> 
     3818            </a> 
     3819            <xsl:text> </xsl:text> 
     3820            <xsl:if test="/bedework/inboxState/numActive != '0'"> 
     3821              <span class="inoutboxActive">(<xsl:value-of select="/bedework/inboxState/numActive"/>)</span> 
     3822            </xsl:if> 
    38213823          </xsl:when> 
    38223824          <xsl:when test="calType='6'"> 
    3823             <strong> 
    3824               <a href="{$showOutbox}"> 
    3825                 <xsl:value-of select="name"/> 
    3826               </a> 
    3827               <xsl:text> </xsl:text> 
    3828               (<xsl:value-of select="/bedework/outboxState/numActive"/>) 
    3829             </strong> 
     3825            <a href="{$showOutbox}" title="outgoing scheduling requests"> 
     3826              <xsl:value-of select="name"/> 
     3827            </a> 
     3828            <xsl:text> </xsl:text> 
     3829            <xsl:if test="/bedework/outboxState/numActive != '0'"> 
     3830              <span class="inoutboxActive">(<xsl:value-of select="/bedework/outboxState/numActive"/>)</span> 
     3831            </xsl:if> 
    38303832          </xsl:when> 
    38313833          <xsl:otherwise>