Changeset 545

Show
Ignore:
Timestamp:
06/07/06 13:40:00
Author:
johnsa
Message:

stylings for tentative events in public client

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/blue.css

    r535 r545  
    4646  color: #333; 
    4747  text-decoration: none; 
    48 } 
    49 #titleBar { 
    50   display: none; 
    5148} 
    5249#curDateRangeTable { 
    …… 
    472469  color: black; 
    473470} 
     471#monthCalendarTable a.eventTentative:link, 
     472#monthCalendarTable a.eventTentative:visited, 
     473#monthCalendarTable a.eventTentative:active  { 
     474  display: block; 
     475  padding: 0.1em 0.2em 0.1em 0.2em; 
     476  text-decoration: none; 
     477  border-bottom: 1px solid #ccc; 
     478  border-top: 1px solid #ccc; 
     479  background: #f0eee5 url('../../images/tentativeLines.gif') top; 
     480  color: black; 
     481} 
    474482#monthCalendarTable a.holiday:link, 
    475483#monthCalendarTable a.holiday:visited, 
    …… 
    486494#monthCalendarTable a.eventLinkB:hover, 
    487495#monthCalendarTable a.eventCancelled:hover, 
     496#monthCalendarTable a.eventTentative:hover, 
    488497#monthCalendarTable a.holiday:hover  { 
    489498  display: block; 
    …… 
    523532  padding: 4px; 
    524533  border: 1px solid #333; 
    525   /*opacity: .80; 
    526   filter: alpha(opacity=80);*/ 
    527534} 
    528535#monthCalendarTable a:hover span.eventTipReverse { 
    …… 
    536543  padding: 4px; 
    537544  border: 1px solid #333; 
    538   /*opacity: .80; 
    539   filter: alpha(opacity=80);*/ 
    540545} 
    541546#monthCalendarTable a:hover span.eventTipStatus { 
    …… 
    688693  color: black; 
    689694  width: 100%; 
     695} 
     696#listTable td.description { 
     697  text-align: left; 
     698  background-color: white; 
     699  color: black; 
     700  width: 100%; 
     701} 
     702#listTable td.bwStatusCancelled { 
     703  background-color: #ddd; 
     704  color: black; 
     705} 
     706#listTable td.bwStatusTentative { 
     707  background: white url('../../images/tentativeLines.gif') top; 
     708  color: black; 
    690709} 
    691710#listTable td.description a { 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/common.css

    r353 r545  
    77  border-left: 2px solid #aaa; 
    88  border-right: 2px solid #aaa; 
    9   background-color: #eee; 
    10   color: black; 
    119} 
    1210h2 a:link, 
    …… 
    1715  background-color: inherit; 
    1816  text-decoration: none; 
     17} 
     18h2.bwStatusConfirmed { 
     19  background-color: #eee; 
     20  color: black; 
     21} 
     22h2.bwStatusCancelled { 
     23  background-color: #eee; 
     24  color: black; 
     25} 
     26h2.bwStatusTentative { 
     27  background: #eee url('../../images/tentativeLines.gif') top; 
    1928} 
    2029/* Header IDs and classes */ 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl

    r535 r545  
    6464  <xsl:variable name="nextdate" select="/bedework/nextdate"/> 
    6565  <xsl:variable name="curdate" select="/bedework/currentdate/date"/> 
    66   <xsl:variable name="skin">default</xsl:variable> 
    6766 
    6867 
    …… 
    506505  <!--==== SINGLE EVENT ====--> 
    507506  <xsl:template match="event"> 
    508     <h2> 
     507    <xsl:variable name="statusClass"> 
     508      <xsl:choose> 
     509        <xsl:when test="status='CANCELLED'">bwStatusCancelled</xsl:when> 
     510        <xsl:when test="status='TENTATIVE'">bwStatusTentative</xsl:when> 
     511        <xsl:otherwise>bwStatusConfirmed</xsl:otherwise> 
     512      </xsl:choose> 
     513    </xsl:variable> 
     514    <h2 class="{$statusClass}"> 
    509515      <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
    510516      <xsl:choose> 
    …… 
    758764                <xsl:variable name="descriptionClass"> 
    759765                  <xsl:choose> 
    760                     <xsl:when test="status='CANCELLED'">description cancelled</xsl:when> 
     766                    <xsl:when test="status='CANCELLED'">description bwStatusCancelled</xsl:when> 
     767                    <xsl:when test="status='TENTATIVE'">description bwStatusTentative</xsl:when> 
    761768                    <xsl:otherwise>description</xsl:otherwise> 
    762769                  </xsl:choose> 
    …… 
    890897        <!-- Special styles for the month grid --> 
    891898        <xsl:when test="status='CANCELLED'">eventCancelled</xsl:when> 
     899        <xsl:when test="status='TENTATIVE'">eventTentative</xsl:when> 
    892900        <xsl:when test="calendar/name='Holidays'">holiday</xsl:when> 
    893901        <!-- Alternating colors for all standard events --> 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/green.css

    r496 r545  
    467467  color: black; 
    468468} 
     469#monthCalendarTable a.eventTentative:link, 
     470#monthCalendarTable a.eventTentative:visited, 
     471#monthCalendarTable a.eventTentative:active  { 
     472  display: block; 
     473  padding: 0.1em 0.2em 0.1em 0.2em; 
     474  text-decoration: none; 
     475  border-bottom: 1px solid #ccc; 
     476  border-top: 1px solid #ccc; 
     477  background: #f0eee5 url('../../images/tentativeLines.gif') top; 
     478  color: black; 
     479} 
    469480#monthCalendarTable a.holiday:link, 
    470481#monthCalendarTable a.holiday:visited, 
    …… 
    481492#monthCalendarTable a.eventLinkB:hover, 
    482493#monthCalendarTable a.eventCancelled:hover, 
     494#monthCalendarTable a.eventTentative:hover, 
    483495#monthCalendarTable a.holiday:hover   { 
    484496  display: block; 
    …… 
    680692#listTable td.description { 
    681693  text-align: left; 
    682   background-color: #fff; 
    683   color: black; 
    684   width: 100%; 
    685 } 
    686 #listTable td.cancelled { 
     694  background-color: white; 
     695  color: black; 
     696  width: 100%; 
     697} 
     698#listTable td.bwStatusCancelled { 
    687699  background-color: #ddd; 
     700  color: black; 
     701} 
     702#listTable td.bwStatusTentative { 
     703  background: white url('../../images/tentativeLines.gif') top; 
    688704  color: black; 
    689705} 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/red.css

    r496 r545  
    467467  color: black; 
    468468} 
     469#monthCalendarTable a.eventTentative:link, 
     470#monthCalendarTable a.eventTentative:visited, 
     471#monthCalendarTable a.eventTentative:active  { 
     472  display: block; 
     473  padding: 0.1em 0.2em 0.1em 0.2em; 
     474  text-decoration: none; 
     475  border-bottom: 1px solid #ccc; 
     476  border-top: 1px solid #ccc; 
     477  background: #f0eee5 url('../../images/tentativeLines.gif') top; 
     478  color: black; 
     479} 
    469480#monthCalendarTable a.holiday:link, 
    470481#monthCalendarTable a.holiday:visited, 
    …… 
    481492#monthCalendarTable a.eventLinkB:hover, 
    482493#monthCalendarTable a.eventCancelled:hover, 
     494#monthCalendarTable a.eventTentative:hover, 
    483495#monthCalendarTable a.holiday:hover   { 
    484496  display: block; 
    …… 
    680692#listTable td.description { 
    681693  text-align: left; 
    682   background-color: #fff; 
    683   color: black; 
    684   width: 100%; 
    685 } 
    686 #listTable td.cancelled { 
     694  background-color: white; 
     695  color: black; 
     696  width: 100%; 
     697} 
     698#listTable td.bwStatusCancelled { 
    687699  background-color: #ddd; 
     700  color: black; 
     701} 
     702#listTable td.bwStatusTentative { 
     703  background: white url('../../images/tentativeLines.gif') top; 
    688704  color: black; 
    689705} 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/soe.css

    r538 r545  
    469469  color: black; 
    470470} 
     471#monthCalendarTable a.eventTentative:link, 
     472#monthCalendarTable a.eventTentative:visited, 
     473#monthCalendarTable a.eventTentative:active  { 
     474  display: block; 
     475  padding: 0.1em 0.2em 0.1em 0.2em; 
     476  text-decoration: none; 
     477  border-bottom: 1px solid #ccc; 
     478  border-top: 1px solid #ccc; 
     479  background: #f0eee5 url('../../images/tentativeLines.gif') top; 
     480  color: black; 
     481} 
    471482#monthCalendarTable a.holiday:link, 
    472483#monthCalendarTable a.holiday:visited, 
    …… 
    483494#monthCalendarTable a.eventLinkB:hover, 
    484495#monthCalendarTable a.eventCancelled:hover, 
     496#monthCalendarTable a.eventTentative:hover, 
    485497#monthCalendarTable a.holiday:hover  { 
    486498  display: block; 
    …… 
    686698  width: 100%; 
    687699} 
    688 #listTable td.cancelled { 
     700#listTable td.bwStatusCancelled { 
    689701  background-color: #ddd; 
     702  color: black; 
     703} 
     704#listTable td.bwStatusTentative { 
     705  background: white url('../../images/tentativeLines.gif') top; 
    690706  color: black; 
    691707} 
    …… 
    819835  border-left: 2px solid #aaa; 
    820836  border-right: 2px solid #aaa; 
    821   background-color: #eee; 
    822   color: black; 
    823837} 
    824838h2 a:link, 
    …… 
    829843  background-color: inherit; 
    830844  text-decoration: none; 
     845} 
     846h2.bwStatusConfirmed { 
     847  background-color: #eee; 
     848  color: black; 
     849} 
     850h2.bwStatusCancelled { 
     851  background-color: #eee; 
     852  color: black; 
     853} 
     854h2.bwStatusTentative { 
     855  background: #eee url('../../images/tentativeLines.gif') top; 
    831856} 
    832857/* Header IDs and classes */ 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/soe.xsl

    r535 r545  
    510510  <!--==== SINGLE EVENT ====--> 
    511511  <xsl:template match="event"> 
    512     <h2> 
     512    <xsl:variable name="statusClass"> 
     513      <xsl:choose> 
     514        <xsl:when test="status='CANCELLED'">bwStatusCancelled</xsl:when> 
     515        <xsl:when test="status='TENTATIVE'">bwStatusTentative</xsl:when> 
     516        <xsl:otherwise>bwStatusConfirmed</xsl:otherwise> 
     517      </xsl:choose> 
     518    </xsl:variable> 
     519    <h2 class="{$statusClass}"> 
    513520      <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
    514521      <xsl:choose> 
    …… 
    762769                <xsl:variable name="descriptionClass"> 
    763770                  <xsl:choose> 
    764                     <xsl:when test="status='CANCELLED'">description cancelled</xsl:when> 
     771                    <xsl:when test="status='CANCELLED'">description bwStatusCancelled</xsl:when> 
     772                    <xsl:when test="status='TENTATIVE'">description bwStatusTentative</xsl:when> 
    765773                    <xsl:otherwise>description</xsl:otherwise> 
    766774                  </xsl:choose> 
    …… 
    894902        <!-- Special styles for the month grid --> 
    895903        <xsl:when test="status='CANCELLED'">eventCancelled</xsl:when> 
     904        <xsl:when test="status='TENTATIVE'">eventTentative</xsl:when> 
    896905        <xsl:when test="calendar/name='Holidays'">holiday</xsl:when> 
    897906        <!-- Alternating colors for all standard events --> 

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

    r476 r545  
    360360  margin: 0em; 
    361361  padding: 0.3em 0 0.3em 1em; 
    362   border-left : 1px solid #333; 
    363   border-right : 1px solid #333; 
     362  border-left : 2px solid #333; 
     363  border-right : 2px solid #333; 
    364364  border-bottom: 1px solid Gray; 
    365365  color: black; 

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

    r513 r545  
    2222       this should be changed to point to a 
    2323       web server over https to avoid mixed content errors, e.g., 
    24   <xsl:variable name="resourcesRoot" select="'https://mywebserver.edu/myresourcesdir'"/> 
     24  <xsl:variable name="resourcesRoot">https://mywebserver.edu/myresourcesdir</xsl:variable> 
    2525    --> 
    2626  <xsl:variable name="resourcesRoot" select="/bedework/approot"/>