Changeset 159
- Timestamp:
- 02/14/06 17:07:33
- Files:
-
- trunk/calendar3/deployment/resources/login/login.html (modified) (1 diff)
- trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.css (modified) (1 diff)
- trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (15 diffs)
- trunk/calendar3/deployment/webadmin/webapp/resources/resources/bwClock.js (modified) (2 diffs)
- trunk/calendar3/deployment/webadmin/webapp/resources/resources/includes.js (modified) (3 diffs)
- trunk/calendar3/webadmin/war/docs/admingroup/modAdminGroup.jsp (modified) (1 diff)
- trunk/calendar3/webadmin/war/docs/category/modCategoryCommon.jsp (modified) (1 diff)
- trunk/calendar3/webadmin/war/docs/event/modEvent.jsp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/calendar3/deployment/resources/login/login.html
r2 r159 53 53 margin: 0em; 54 54 padding: 0em; 55 } 56 form { 57 margin: 0; 58 padding: 0; 55 59 } 56 60 .styleButtons { trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.css
r158 r159 243 243 display: inline; 244 244 } 245 table.eventFormTable .hidden, 245 table.eventFormTable .invisible, 246 .invisible { 247 display: none; 248 } 246 249 .hidden { 247 display: none;248 } 249 table.eventFormTable .durationBox {250 visibility: hidden; 251 } 252 table.eventFormTable div.durationBox { 250 253 border: 1px solid #ccb; 251 254 display: inline; 252 255 margin: 4px; 253 256 padding: 4px; 254 }255 table.eventFormTable .durationBox input {256 margin-left: 0.5em;257 257 } 258 258 table.eventFormTable .durationSpacerText { trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.xsl
r158 r159 132 132 <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"></script> 133 133 <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/> 134 < script type='text/javascript' src="{$resourcesRoot}/resources/autoComplete.js"></script>135 <script type='text/javascript' src="{$resourcesRoot}/resources/ui.js"></script> 134 <!--<script type='text/javascript' src="{$resourcesRoot}/resources/autoComplete.js"></script> 135 <script type='text/javascript' src="{$resourcesRoot}/resources/ui.js"></script>--> 136 136 </xsl:if> 137 137 <link rel="icon" type="image/ico" href="{$resourcesRoot}/resources/bedework.ico" /> … … 471 471 </select> 472 472 <!-- description of calendar: will be implemented soon --> 473 <!-- 474 <div id="calendarDescriptionBox"> 473 <!--<div id="calendarDescriptionBox"> 475 474 Description: <span id="calendarDescription">please select a calendar.</span> 476 475 <a href="" target="calDescriptions">all calendar descriptions</a> … … 489 488 <xsl:variable name="timeFieldsClass"> 490 489 <xsl:choose> 491 <xsl:when test="/bedeworkadmin/formElements/form/allDay/input/@checked='checked'"> hidden</xsl:when>490 <xsl:when test="/bedeworkadmin/formElements/form/allDay/input/@checked='checked'">invisible</xsl:when> 492 491 <xsl:otherwise>timeFields</xsl:otherwise> 493 492 </xsl:choose> … … 495 494 <xsl:choose> 496 495 <xsl:when test="/bedeworkadmin/formElements/form/allDay/input/@checked='checked'"> 497 <input type="checkbox" name="allDayFlag" onc hange="swapAllDayEvent(this)" value="on" checked="checked"/>496 <input type="checkbox" name="allDayFlag" onclick="swapAllDayEvent(this)" value="on" checked="checked"/> 498 497 <input type="hidden" name="eventStartDate.dateOnly" value="on" id="allDayField"/> 499 498 </xsl:when> 500 499 <xsl:otherwise> 501 <input type="checkbox" name="allDayFlag" onc hange="swapAllDayEvent(this)" value="off"/>500 <input type="checkbox" name="allDayFlag" onclick="swapAllDayEvent(this)" value="off"/> 502 501 <input type="hidden" name="eventStartDate.dateOnly" value="off" id="allDayField"/> 503 502 </xsl:otherwise> … … 527 526 <xsl:choose> 528 527 <xsl:when test="/bedeworkadmin/formElements/form/end/type='E'"> 529 <input type="radio" name="eventEndType" value="E" checked="checked" onClick="changeClass('endDateTime','shown');changeClass('endDuration',' hidden');"/>528 <input type="radio" name="eventEndType" value="E" checked="checked" onClick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/> 530 529 </xsl:when> 531 530 <xsl:otherwise> 532 <input type="radio" name="eventEndType" value="E" onClick="changeClass('endDateTime','shown');changeClass('endDuration',' hidden');"/>531 <input type="radio" name="eventEndType" value="E" onClick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/> 533 532 </xsl:otherwise> 534 533 </xsl:choose> … … 537 536 <xsl:choose> 538 537 <xsl:when test="/bedeworkadmin/formElements/form/end/type='E'">shown</xsl:when> 539 <xsl:otherwise> hidden</xsl:otherwise>538 <xsl:otherwise>invisible</xsl:otherwise> 540 539 </xsl:choose> 541 540 </xsl:variable> … … 557 556 </div> 558 557 </div><br/> 559 <div id="clock" class=" hidden">558 <div id="clock" class="invisible"> 560 559 <xsl:call-template name="clock"/> 561 560 </div> … … 563 562 <xsl:choose> 564 563 <xsl:when test="/bedeworkadmin/formElements/form/end/type='D'"> 565 <input type="radio" name="eventEndType" value="D" checked="checked" onClick="changeClass('endDateTime',' hidden');changeClass('endDuration','shown');"/>564 <input type="radio" name="eventEndType" value="D" checked="checked" onClick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/> 566 565 </xsl:when> 567 566 <xsl:otherwise> 568 <input type="radio" name="eventEndType" value="D" onClick="changeClass('endDateTime',' hidden');changeClass('endDuration','shown');"/>567 <input type="radio" name="eventEndType" value="D" onClick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/> 569 568 </xsl:otherwise> 570 569 </xsl:choose> … … 573 572 <xsl:choose> 574 573 <xsl:when test="/bedeworkadmin/formElements/form/end/type='D'">shown</xsl:when> 575 <xsl:otherwise> hidden</xsl:otherwise>574 <xsl:otherwise>invisible</xsl:otherwise> 576 575 </xsl:choose> 577 576 </xsl:variable> 578 577 <xsl:variable name="durationHrMinClass"> 579 578 <xsl:choose> 580 <xsl:when test="/bedeworkadmin/formElements/form/allDay/input/@checked='checked'"> hidden</xsl:when>579 <xsl:when test="/bedeworkadmin/formElements/form/allDay/input/@checked='checked'">invisible</xsl:when> 581 580 <xsl:otherwise>shown</xsl:otherwise> 582 581 </xsl:choose> … … 631 630 <xsl:choose> 632 631 <xsl:when test="/bedeworkadmin/formElements/form/end/type='N'"> 633 <input type="radio" name="eventEndType" value="N" checked="checked" onClick="changeClass('endDateTime',' hidden');changeClass('endDuration','hidden');"/>632 <input type="radio" name="eventEndType" value="N" checked="checked" onClick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/> 634 633 </xsl:when> 635 634 <xsl:otherwise> 636 <input type="radio" name="eventEndType" value="N" onClick="changeClass('endDateTime',' hidden');changeClass('endDuration','hidden');"/>635 <input type="radio" name="eventEndType" value="N" onClick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/> 637 636 </xsl:otherwise> 638 637 </xsl:choose> … … 712 711 <td> 713 712 <xsl:if test="/bedeworkadmin/formElements/form/location/preferred/select/option"> 714 <select name="prefLocationId" >713 <select name="prefLocationId" id="eventFormPrefLocationList"> 715 714 <option value="-1"> 716 715 Select preferred: … … 720 719 or Location (all): 721 720 </xsl:if> 722 <select name="locationId" >721 <select name="locationId" id="eventFormLocationList"> 723 722 <option value="-1"> 724 723 Select: … … 769 768 <td> 770 769 <xsl:if test="/bedeworkadmin/formElements/form/sponsor/preferred/select/option"> 771 <select name="prefSponsorId" >770 <select name="prefSponsorId" id="eventFormSponsorList"> 772 771 <option value="-1"> 773 772 Select preferred: … … 777 776 or Contact (all): 778 777 </xsl:if> 779 <select name="sponsorId" >778 <select name="sponsorId" id="eventFormPrefSponsorList"> 780 779 <option value="-1"> 781 780 Select: … … 1012 1011 <xsl:when test="end/endtype = 'duration'"> 1013 1012 <div class="dateFields"> 1014 <div class=" hidden" id="endDuration">1013 <div class="invisible" id="endDuration"> 1015 1014 <div class="durationBox"> 1016 1015 <input type="text" name="eventDuration.daysStr" size="2" value="0" onChange="window.document.peForm.durationType[0].checked = true;"/>days trunk/calendar3/deployment/webadmin/webapp/resources/resources/bwClock.js
r156 r159 6 6 function bwClockLaunch(type) { 7 7 if ((document.getElementById("clock").className == "shown") && (bwClockCurrentType == type)) { 8 changeClass("clock"," hidden"); // if the clock with the same type is showing, toggle it off8 changeClass("clock","invisible"); // if the clock with the same type is showing, toggle it off 9 9 } else { // otherwise, turn it on and display the correct type 10 10 bwClockRequestedType = type; 11 11 bwClockCurrentType = type; 12 12 changeClass("clock","shown"); 13 // the following is for Internet Explorer. IE draws "windowed" objects 14 // and unwindowed objects on seperate "planes"; windowed objects are always 15 // drawn obove unwindowed objects and select boxes are "windowed"; 16 // this is required to make IE not overwrite the clock div with 17 // the select boxes that fall below it on the page. Note: we set them 18 // to display:hidden (not none) so their space is still occupied (and the 19 // browser window doesn't shift around) 20 changeClass("eventFormPrefLocationList","hidden"); 21 changeClass("eventFormLocationList","hidden"); 22 changeClass("eventFormSponsorList","hidden"); 23 changeClass("eventFormPrefSponsorList","hidden"); 13 24 bwClockIndicator = document.getElementById("bwClockDateTypeIndicator"); 14 25 if (type == 'eventStartDate') { … … 21 32 22 33 function bwClockClose() { 23 changeClass("clock","hidden"); 34 changeClass("clock","invisible"); 35 changeClass("eventFormPrefLocationList","shown"); 36 changeClass("eventFormLocationList","shown"); 37 changeClass("eventFormSponsorList","shown"); 38 changeClass("eventFormPrefSponsorList","shown"); 24 39 } 25 40 trunk/calendar3/deployment/webadmin/webapp/resources/resources/includes.js
r156 r159 7 7 if (obj.checked) { 8 8 //lets keep it simple for now: just show or hide time fields 9 changeClass('startTimeFields',' hidden');10 changeClass('endTimeFields',' hidden');11 changeClass('durationHrMin',' hidden');9 changeClass('startTimeFields','invisible'); 10 changeClass('endTimeFields','invisible'); 11 changeClass('durationHrMin','invisible'); 12 12 allDayField.value = "on"; 13 13 } else { … … 38 38 } 39 39 } 40 //function launchClockMap(url) { 41 // clockWindow = window.open(url, "clockWindow", "width=410,height=430,scrollbars=no,resizable=yes,alwaysRaised=yes,menubar=no,toolbar=no"); 42 // window.clockWindow.focus(); 43 //} 40 44 41 function closePopUps() { 45 42 if (window.clockWindow) { … … 47 44 } 48 45 } 49 function getCalendarDescription(calId,defaultMessage) { 50 div = document.getElementById("calendarDescription"); 51 if (calId == -1) { 52 div.innerHTML = defaultMessage; 53 } else { 54 div.innerHTML = calId; 55 } 56 } 46 47 //function getCalendarDescription(calId,defaultMessage) { 48 // div = document.getElementById("calendarDescription"); 49 // if (calId == -1) { 50 // div.innerHTML = defaultMessage; 51 // } else { 52 // div.innerHTML = calId; 53 // } 54 //} trunk/calendar3/webadmin/war/docs/admingroup/modAdminGroup.jsp
r2 r159 21 21 </name> 22 22 <desc> 23 <html:textarea property="updAdminGroup.description" cols="50" rows="3" />23 <html:textarea property="updAdminGroup.description" cols="50" rows="3"></html:textarea> 24 24 </desc> 25 25 <groupOwner> trunk/calendar3/webadmin/war/docs/category/modCategoryCommon.jsp
r2 r159 19 19 </td> 20 20 <td> 21 <html:textarea property="category.description" rows="3" cols="55" />21 <html:textarea property="category.description" rows="3" cols="55" ></html:textarea> 22 22 <span class="fieldInfo">(optional)</span> 23 23 </td> trunk/calendar3/webadmin/war/docs/event/modEvent.jsp
r2 r159 143 143 </category> 144 144 145 <desc><html:textarea property="event.description" rows="8" cols="55" styleId="iDesc" styleClass="edit" /></desc>145 <desc><html:textarea property="event.description" rows="8" cols="55" styleId="iDesc" styleClass="edit"></html:textarea></desc> 146 146 <descLength><bean:write name="peForm" property="maxDescriptionLength" /></descLength> 147 147 <cost><html:text property="event.cost" size="30" styleId="iCost" styleClass="edit"/></cost>
