Changeset 437

Show
Ignore:
Timestamp:
05/02/06 13:00:49
Author:
johnsa
Message:

personal client: updates to event management icons and stylesheet clean up

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r433 r437  
    411411} 
    412412table.common th.commonHeader { 
     413  vertical-align: middle; 
    413414  background-color: #666; 
    414415  color: #eee; 

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

    r435 r437  
    668668          <tr> 
    669669            <td class="noEventsCell"> 
    670               There are no events posted 
    671               <xsl:choose> 
    672                 <xsl:when test="/bedework/periodname='Day'"> 
    673                   today<xsl:if test="/bedework/title!=''"> for <strong><xsl:value-of select="/bedework/title"/></strong></xsl:if><xsl:if test="/bedework/search!=''"> for search term <strong>"<xsl:value-of select="/bedework/search"/>"</strong></xsl:if>. 
    674                 </xsl:when> 
    675                 <xsl:when test="/bedework/periodname='Month'"> 
    676                   this month<xsl:if test="/bedework/title!=''"> for <strong><xsl:value-of select="/bedework/title"/></strong></xsl:if><xsl:if test="/bedework/search!=''"> for search term <strong>"<xsl:value-of select="/bedework/search"/>"</strong></xsl:if>. 
    677                 </xsl:when> 
    678                 <xsl:otherwise> 
    679                   this week<xsl:if test="/bedework/title!=''"> for <strong><xsl:value-of select="/bedework/title"/></strong></xsl:if><xsl:if test="/bedework/search!=''"> for search term <strong>"<xsl:value-of select="/bedework/search"/>"</strong></xsl:if>. 
    680                 </xsl:otherwise> 
    681               </xsl:choose> 
     670              No events to display. 
    682671            </td> 
    683672          </tr> 
    …… 
    10781067    <table class="common" cellspacing="0"> 
    10791068      <tr> 
    1080         <th colspan="3" class="commonHeader"> 
     1069        <th colspan="2" class="commonHeader"> 
    10811070          <div id="eventActions"> 
    10821071            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 
    10831072            <a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
     1073              <img src="{$resourcesRoot}/resources/std-ical_iconDkGray.gif" width="12" height="13" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/> 
    10841074              Download 
    10851075            </a> | 
    …… 
    10891079                  <xsl:when test="recurring=true"> 
    10901080                    <a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}"> 
     1081                      <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    10911082                      Remove All (recurring) 
    10921083                    </a> 
    …… 
    10941085                  <xsl:otherwise> 
    10951086                    <a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}"> 
     1087                      <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    10961088                      Remove 
    10971089                    </a> 
    …… 
    11011093              <xsl:when test="calendar/owner = /bedework/userid"> 
    11021094                <a href="{$editEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}"> 
     1095                  <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="13" border="0" alt="edit"/> 
    11031096                  Edit 
    11041097                </a> | 
    …… 
    11061099                  <xsl:when test="recurring=true"> 
    11071100                    <a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}"> 
     1101                      <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    11081102                      Delete All (recurring) 
    11091103                    </a> 
    …… 
    11111105                  <xsl:otherwise> 
    11121106                    <a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}"> 
     1107                      <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    11131108                      Delete 
    11141109                    </a> 
    …… 
    11181113              <xsl:otherwise> 
    11191114                <a href="{$subscriptions-fetch}"> 
     1115                  <img src="{$resourcesRoot}/resources/std-ical_iconSubsDkGray.gif" width="12" height="13" border="0" alt="edit"/> 
    11201116                  Manage Subscriptions 
    11211117                </a> 
    …… 
    11361132        </th> 
    11371133      </tr> 
    1138       <!--<tr> 
    1139         <td class="fieldname">Title:</td> 
    1140         <td class="fieldval"> 
    1141           <strong> 
    1142             <xsl:choose> 
    1143               <xsl:when test="link != ''"> 
    1144                 <xsl:variable name="link" select="link"/> 
    1145                 <a href="{$link}"> 
    1146                   <xsl:value-of select="summary"/> 
    1147                 </a> 
    1148               </xsl:when> 
    1149               <xsl:otherwise> 
    1150                 <xsl:value-of select="summary"/> 
    1151               </xsl:otherwise> 
    1152             </xsl:choose> 
    1153           </strong> 
    1154         </td> 
    1155       </tr>--> 
    11561134      <tr> 
    11571135        <td class="fieldname">When:</td> 
    …… 
    11641142          <xsl:if test="end/time != ''"><span class="time"><xsl:value-of select="end/time"/></span></xsl:if> 
    11651143        </td> 
    1166         <th class="icon" rowspan="2"> 
     1144        <!--<th class="icon" rowspan="2"> 
    11671145          <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 
    11681146          <a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
    11691147            <img src="{$resourcesRoot}/resources/std-ical-icon.gif" width="20" height="26" border="0" align="left" alt="Download this event"/> 
    1170           </a><!-- <br /> 
    1171           [<a href="">help</a>] --> 
    1172         </th> 
     1148          </a> 
     1149        </th>--> 
    11731150      </tr> 
    11741151      <tr> 
    11751152        <td class="fieldname">Where:</td> 
    1176         <td colspan="3" class="fieldval"> 
     1153        <td class="fieldval"> 
    11771154          <xsl:choose> 
    11781155            <xsl:when test="location/link=''"> 
    …… 
    11931170      <tr> 
    11941171        <td class="fieldname">Description:</td> 
    1195         <td colspan="3" class="fieldval"> 
     1172        <td class="fieldval"> 
    11961173          <xsl:call-template name="replace"> 
    11971174            <xsl:with-param name="string" select="description"/> 
    …… 
    12051182          <td class="fieldname">Organizer:</td> 
    12061183          <xsl:variable name="organizerUri" select="organizer/organizerUri"/> 
    1207           <td colspan="2" class="fieldval"> 
     1184          <td class="fieldval"> 
    12081185            <strong> 
    12091186              <a href="{$organizerUri}"> 
    …… 
    12171194        <tr> 
    12181195          <td class="fieldname">Attendees:</td> 
    1219           <td colspan="3" class="fieldval"> 
     1196          <td class="fieldval"> 
    12201197            <table id="attendees" cellspacing="0"> 
    12211198              <tr> 
    …… 
    12461223        <tr> 
    12471224          <td class="fieldname">Cost:</td> 
    1248           <td colspan="2" class="fieldval"><xsl:value-of select="cost"/></td> 
     1225          <td class="fieldval"><xsl:value-of select="cost"/></td> 
    12491226        </tr> 
    12501227      </xsl:if> 
    …… 
    12521229        <tr> 
    12531230          <td class="fieldname">See:</td> 
    1254           <td colspan="3" class="fieldval"> 
     1231          <td class="fieldval"> 
    12551232            <xsl:variable name="link" select="link"/> 
    12561233            <a href="{$link}"><xsl:value-of select="link"/></a> 
    …… 
    12611238        <tr> 
    12621239          <td class="fieldname">Contact:</td> 
    1263           <td colspan="3" class="fieldval"> 
     1240          <td class="fieldval"> 
    12641241            <xsl:choose> 
    12651242              <xsl:when test="sponsor/link=''"> 
    …… 
    31473124          </td> 
    31483125        </tr> 
    3149         <tr> 
    3150           <td>&#160;</td> 
    3151           <td> 
    3152             <input name="submit" type="submit" value="Continue"/>&#160; 
     3126      </table> 
     3127      <table border="0" id="submitTable"> 
     3128        <tr> 
     3129          <td> 
     3130            <input name="submit" type="submit" value="Continue"/> 
    31533131            <input name="cancelled" type="submit" value="Cancel"/> 
    31543132          </td> 
    …… 
    32613239        <tr> 
    32623240          <th colspan="2" class="commonHeader"> 
    3263             <xsl:variable name="locId" select="form/id"/> 
     3241            <!--<xsl:variable name="locId" select="form/id"/> 
    32643242            <div id="eventActions"> 
    32653243              <a href="{$delLocation}?locationId={$locId}">Delete Location</a> 
    3266             </div> 
     3244            </div>--> 
    32673245            Edit Location 
    32683246          </th> 
    …… 
    32923270          </td> 
    32933271        </tr> 
    3294         <tr> 
    3295           <td>&#160;</td> 
    3296           <td class="padMe"> 
    3297             <input name="submit" type="submit" value="Submit Location"/>&#160; 
     3272      </table> 
     3273      <table border="0" id="submitTable"> 
     3274        <tr> 
     3275          <td> 
     3276            <input name="submit" type="submit" value="Submit Location"/> 
    32983277            <input name="cancelled" type="submit" value="Cancel"/> 
     3278            <input type="reset" value="Reset"/> 
     3279          </td> 
     3280          <td align="right"> 
     3281            <xsl:variable name="locId" select="form/id"/> 
     3282            <a href="{$delLocation}?locationId={$locId}"> 
     3283              <input type="button" name="delete" value="Delete Location"/> 
     3284            </a> 
    32993285          </td> 
    33003286        </tr>