Changeset 250
- Timestamp:
- 03/02/06 17:21:43
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.xsl
r234 r250 536 536 <xsl:copy-of select="/bedeworkadmin/formElements/form/start/month/*"/> 537 537 <xsl:copy-of select="/bedeworkadmin/formElements/form/start/day/*"/> 538 <xsl:copy-of select="/bedeworkadmin/formElements/form/start/year/*"/> 538 <xsl:choose> 539 <xsl:when test="/bedeworkadmin/creating = 'true'"> 540 <xsl:copy-of select="/bedeworkadmin/formElements/form/start/year/*"/> 541 </xsl:when> 542 <xsl:otherwise> 543 <xsl:copy-of select="/bedeworkadmin/formElements/form/start/yearText/*"/> 544 </xsl:otherwise> 545 </xsl:choose> 539 546 </div> 540 547 <script language="JavaScript" type="text/javascript"> … … 577 584 <xsl:copy-of select="/bedeworkadmin/formElements/form/end/dateTime/month/*"/> 578 585 <xsl:copy-of select="/bedeworkadmin/formElements/form/end/dateTime/day/*"/> 579 <xsl:copy-of select="/bedeworkadmin/formElements/form/end/dateTime/year/*"/> 586 <xsl:choose> 587 <xsl:when test="/bedeworkadmin/creating = 'true'"> 588 <xsl:copy-of select="/bedeworkadmin/formElements/form/end/dateTime/year/*"/> 589 </xsl:when> 590 <xsl:otherwise> 591 <xsl:copy-of select="/bedeworkadmin/formElements/form/end/dateTime/yearText/*"/> 592 </xsl:otherwise> 593 </xsl:choose> 580 594 </div> 581 595 <script language="JavaScript" type="text/javascript"> … … 2471 2485 <td> 2472 2486 <xsl:variable name="preferredViewPeriod" select="/bedeworkadmin/prefs/preferredViewPeriod"/> 2473 <input type="text" name="viewPeriod" value="{$preferredViewPeriod}" size="40"/> 2487 <select name="viewPeriod"> 2488 <!-- picking the selected item could be done with javascript. for 2489 now, this will do. --> 2490 <xsl:choose> 2491 <xsl:when test="$preferredViewPeriod = 'dayView'"> 2492 <option value="dayView" selected="selected">day</option> 2493 </xsl:when> 2494 <xsl:otherwise> 2495 <option value="dayView">day</option> 2496 </xsl:otherwise> 2497 </xsl:choose> 2498 <xsl:choose> 2499 <xsl:when test="$preferredViewPeriod = 'todayView'"> 2500 <option value="todayView" selected="selected">today</option> 2501 </xsl:when> 2502 <xsl:otherwise> 2503 <option value="todayView">today</option> 2504 </xsl:otherwise> 2505 </xsl:choose> 2506 <xsl:choose> 2507 <xsl:when test="$preferredViewPeriod = 'weekView'"> 2508 <option value="weekView" selected="selected">week</option> 2509 </xsl:when> 2510 <xsl:otherwise> 2511 <option value="weekView">week</option> 2512 </xsl:otherwise> 2513 </xsl:choose> 2514 <xsl:choose> 2515 <xsl:when test="$preferredViewPeriod = 'monthView'"> 2516 <option value="monthView" selected="selected">month</option> 2517 </xsl:when> 2518 <xsl:otherwise> 2519 <option value="monthView">month</option> 2520 </xsl:otherwise> 2521 </xsl:choose> 2522 <xsl:choose> 2523 <xsl:when test="$preferredViewPeriod = 'yearView'"> 2524 <option value="yearView" selected="selected">year</option> 2525 </xsl:when> 2526 <xsl:otherwise> 2527 <option value="yearView">year</option> 2528 </xsl:otherwise> 2529 </xsl:choose> 2530 </select> 2474 2531 </td> 2475 2532 </tr> trunk/calendar3/webadmin/war/docs/event/modEvent.jsp
r179 r250 52 52 </html:select> 53 53 </year> 54 <yearText> 55 <html:text property="eventStartDate.year" size="4"/> 56 </yearText> 54 57 <hour> 55 58 <html:select property="eventStartDate.hour"> … … 91 94 <html:options property="yearVals"/> 92 95 </html:select> 93 </year> 96 </year> 97 <yearText> 98 <html:text property="eventEndDate.year" size="4"/> 99 </yearText> 94 100 <hour> 95 101 <html:select property="eventEndDate.hour">
