Changeset 2950
- Timestamp:
- 07/13/10 00:40:50
- Files:
-
- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bedeworkTheme.css (modified) (3 diffs)
- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bwScheduling.css (modified) (2 diffs)
- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/head.xsl (modified) (1 diff)
- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkAttendees.js (modified) (2 diffs)
- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bedeworkTheme.css
r2900 r2950 229 229 font-size: 0.8em; 230 230 color: black; 231 background: white url("../images/sideBarGrayGrad.gif") repeat-y right; 231 background-color: white; 232 /*background: white url("../images/sideBarGrayGrad.gif") repeat-y right;*/ 232 233 border-left: 2px solid #333; 233 border-right: 1px solid # 333;234 border-right: 1px solid #666; 234 235 border-bottom: 2px solid #aaa; 235 236 /*border-top: 24px solid #333;*/ … … 266 267 #bedework #bodyBlock td#sideBar h3 { 267 268 color: #eee; 268 background: #4164AE url("../images/sideBarBlueGrad.gif") repeat-y right; 269 background-color: #4164AE; 270 /*background: #4164AE url("../images/sideBarBlueGrad.gif") repeat-y right;*/ 269 271 font-weight: normal; 270 272 margin: 0; … … 273 275 #bedework #bodyBlock td#msgTaskBar h3 { 274 276 color: #eee; 275 background: #4164AE url("../images/sideBarBlueGradRight.gif") repeat-y left; 277 background-color: #4164AE; 278 /*background: #4164AE url("../images/sideBarBlueGradRight.gif") repeat-y left;*/ 276 279 font-weight: normal; 277 280 margin: 0; trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bwScheduling.css
r2937 r2950 5 5 #bwFreeBusyDisplay { 6 6 margin: 2em 2em 0 2em; 7 overflow: scroll; 7 height: auto; 8 overflow: auto; 8 9 } 9 10 #bwScheduleTable { … … 102 103 font-size: 0.8em; 103 104 padding: 2px; 104 } 105 #bwScheduleTable #bwAddAttendeeFields, 105 cursor: pointer; 106 } 106 107 #bwScheduleTable #attType { 107 108 display: none; trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/head.xsl
r2944 r2950 70 70 71 71 <xsl:if test="/bedework/page='attendees'"> 72 <!-- script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js"> </script --> 72 <!-- Note: this page is deprecated, but is still maintained for testing. 73 The following files are included in the add/edit event pages now as well. --> 73 74 <script type="text/javascript" src="/bedework-common/javascript/jquery/autocomplete/bw-jquery.autocomplete.js"> </script> 74 75 <script type="text/javascript" src="/bedework-common/javascript/jquery/autocomplete/jquery.bgiframe.min.js"> </script> trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkAttendees.js
r2903 r2950 25 25 26 26 extraParams: { 27 format: 'json' 27 format: 'json', 28 addrbook: '/public/locations' 28 29 }, 29 30 … … 59 60 }, 60 61 formatResult: function(item) { 61 alert("here!");62 62 return item.email; 63 63 } 64 64 }; 65 65 66 // carddavUrl supplied in bedework Properties.js66 // carddavUrl supplied in bedework.js 67 67 jQuery(document).ready(function($) { 68 $('#bw RaUri').autocomplete(carddavUrl, bwAutoCompleteOptions)68 $('#bwAddAttendee').autocomplete(carddavUrl, bwAutoCompleteOptions) 69 69 }); trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js
r2944 r2950 61 61 var bwFreeBusyDispTypeTentative = "TENTATIVE"; 62 62 var bwAddAttendeeDisp = "add attendee..."; 63 var bwAddDisp = "add"; 63 64 var bwAttendeeExistsDisp = "attendee exists"; 65 66 var bwReqParticipantDisp = "required"; 67 var bwOptParticipantDisp = "optional"; 68 var bwChairDisp = "chair"; 69 var bwNonParticipant = "non-participant"; 70 var bwNeedsAction = "needs action"; 71 var bwAccepted = "accepted"; 72 var bwDeclined = "declined"; 73 var bwTentative = "tentative"; 74 var bwDelegated = "delegated"; 64 75 65 76 /* An attendee … … 290 301 type: "POST", 291 302 url: bwGrid.attUrlPrefix, 292 data: "uri=" + uid + "& attendee=true&submit=add",303 data: "uri=" + uid + "&role=" + role + "&partstat=" + status + "&attendee=true&submit=add", 293 304 success: function(){ 294 305 // add the attendee to the local array … … 761 772 var addAttendeeHtml = '<td class="addAttendee" colspan="4">'; 762 773 addAttendeeHtml += '<input type="text" value="' + bwAddAttendeeDisp +'" name="attendee" id="bwAddAttendee" class="pending" size="30"/>'; 763 addAttendeeHtml += '<span id="bwAddAttendeeAdd" class="invisible"> add</span>';774 addAttendeeHtml += '<span id="bwAddAttendeeAdd" class="invisible">' + bwAddDisp +'</span>'; 764 775 addAttendeeHtml += '<span id="bwAddAttendeeAdvanced">advanced</span>'; 765 addAttendeeHtml += '<div id="bwAddAttendeeFields">'; 766 addAttendeeHtml += ''; 776 addAttendeeHtml += '<div id="bwAddAttendeeFields" class="invisible">'; 777 addAttendeeHtml += '<select name="role" id="bwAddAttendeeRole">'; 778 addAttendeeHtml += ' <option value="REQ-PARTICIPANT">' + bwReqParticipantDisp + '</option>'; 779 addAttendeeHtml += ' <option value="OPT-PARTICIPANT">' + bwOptParticipantDisp + '</option>'; 780 addAttendeeHtml += ' <option value="CHAIR">' + bwChairDisp + '</option>'; 781 addAttendeeHtml += ' <option value="NON-PARTICIPANT">' + bwNonParticipant + '</option>'; 782 addAttendeeHtml += '</select>'; 783 addAttendeeHtml += '<select name="partstat" id="bwAddAttendeePartstat">'; 784 addAttendeeHtml += ' <option value="NEEDS-ACTION">' + bwNeedsAction + '</option>'; 785 addAttendeeHtml += ' <option value="ACCEPTED">' + bwAccepted + '</option>'; 786 addAttendeeHtml += ' <option value="DECLINED">' + bwDeclined + '</option>'; 787 addAttendeeHtml += ' <option value="TENTATIVE">' + bwTentative + '</option>'; 788 addAttendeeHtml += ' <option value="DELEGATED">' + bwDelegated + '</option>'; 789 addAttendeeHtml += '</select>'; 767 790 //addAttendeeHtml += '<select><option>person</option><option>group</option><option>resource</option></select>'; 768 791 //addAttendeeHtml += '<input type="checkbox"/>personal <input type="checkbox"/>public'; … … 983 1006 $("#bwAddAttendeeAdvanced").hide(); 984 1007 changeClass("bwAddAttendeeAdd","visible"); 1008 changeClass("bwAddAttendeeFields", "visible"); 985 1009 } 986 1010 ); … … 989 1013 function () { 990 1014 var uid = $("#bwAddAttendee").val(); 991 var role = bwAttendeeRoleRequired; 1015 var role = $("#bwAddAttendeeRole").val(); 1016 var partstat = $("#bwAddAttendeePartstat").val(); 992 1017 // these are preliminary values - will get more from backend after ajax call 993 bwGrid.addAttendee("",uid,role, "","person");1018 bwGrid.addAttendee("",uid,role,partstat,"person"); 994 1019 } 995 1020 );
