Changeset 2878

Show
Ignore:
Timestamp:
04/23/10 10:22:23
Author:
johnsa
Message:

ongoing update to free/busy mockup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webuser/webapp/resources/demoskins/fbMockup/bedeworkFb.js

    r2875 r2878  
    189189        switch (curAttendee.status) { 
    190190          case bwAttendeeStatusAccepted :  
    191             $(fbDisplayTimesRow).html('<td class="status accepted">&#10004;</td>'); 
     191            $(fbDisplayTimesRow).html('<td class="status accepted"><span class="icon">&#10004;</span><span class="text">' + bwAttendeeDispStatusAccepted + '</span></td>'); 
    192192            break; 
    193193          case bwAttendeeStatusDeclined :  
    194             $(fbDisplayTimesRow).html('<td class="status declined">x</td>'); 
     194            $(fbDisplayTimesRow).html('<td class="status declined"><span class="icon">x</span><span class="text">' + bwAttendeeDispStatusDeclined + '</span></td>'); 
    195195            break; 
    196196          case bwAttendeeStatusTentative :  
    197             $(fbDisplayTimesRow).html('<td class="status tentative">-</td>'); 
     197            $(fbDisplayTimesRow).html('<td class="status tentative"><span class="icon">-</span><span class="text">' + bwAttendeeDispStatusTentative + '</span></td>'); 
    198198            break; 
    199199          case bwAttendeeStatusDelegated :  
    200             $(fbDisplayTimesRow).html('<td class="status delegated"></td>'); 
     200            $(fbDisplayTimesRow).html('<td class="status delegated"><span class="icon"></span><span class="text">' + bwAttendeeDispStatusDelegated + '</span></td>'); 
    201201            break; 
    202202          case bwAttendeeStatusCompleted :  
    203             $(fbDisplayTimesRow).html('<td class="status completed"></td>'); 
     203            $(fbDisplayTimesRow).html('<td class="status completed"><span class="icon"></span><span class="text">' + bwAttendeeDispStatusCompleted + '</span></td>'); 
    204204            break; 
    205205          case bwAttendeeStatusInProcess :  
    206             $(fbDisplayTimesRow).html('<td class="status inprocess"></td>'); 
     206            $(fbDisplayTimesRow).html('<td class="status inprocess"><span class="icon"></span><span class="text">' + bwAttendeeDispStatusInProcess + '</span></td>'); 
    207207            break; 
    208208          default : // default to bwAttendeeStatusNeedsAction - display question mark 
    209             $(fbDisplayTimesRow).html('<td class="status needsaction">?</td>'); 
     209            $(fbDisplayTimesRow).html('<td class="status needsaction"><span class="icon">?</span><span class="text">' + bwAttendeeDispStatusNeedsAction + '</span></td>'); 
    210210        } 
    211211 

  • trunk/deployment/webuser/webapp/resources/demoskins/fbMockup/schedule.css

    r2875 r2878  
    11body { 
    2   font-family: Arial, sans-serif; 
     2  font-family: Arial, Helvetica, sans-serif; 
    33  font-size: 14px; 
    44} 
    …… 
    4343  color: black; 
    4444  border: 1px solid #eee; 
     45  font-family: Arial, Helvetica, sans-serif; 
    4546  display: none;  
    4647}