Changeset 3487
- Timestamp:
- 03/03/12 20:57:42
- Files:
-
- trunk/deployment/resources/javascript/bedework/bedeworkXProperties.js (modified) (1 diff)
- trunk/deployment/webadmin/webapp/resources/default/default/default.css (modified) (1 diff)
- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (1 diff)
- trunk/deployment/webadmin/webapp/resources/es_ES/default/default.css (modified) (1 diff)
- trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl (modified) (6 diffs)
- trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/deployment/resources/javascript/bedework/bedeworkXProperties.js
r2995 r3487 26 26 var bwXPropertyAlias = "X-BEDEWORK-ALIAS"; 27 27 var bwXPropertyImage = "X-BEDEWORK-IMAGE"; 28 var bwXPropertyThumbImage = "X-BEDEWORK-THUMB-IMAGE"; 28 29 var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY"; 29 30 var bwXPropertyLocation = "X-BEDEWORK-LOCATION"; trunk/deployment/webadmin/webapp/resources/default/default/default.css
r3486 r3487 474 474 } 475 475 label.interiorLabel { 476 display: block; 477 float: left; 478 width: 150px; 479 } 480 .eventFormImage { 481 display: block; 482 clear: right; 476 display: block; 477 float: left; 478 width: 150px; 479 } 480 #eventFormImage { 483 481 margin-bottom: 0.5em; 482 } 483 #eventFormImage img { 484 margin-right: 4px; 484 485 } 485 486 table.eventFormTable div.fieldInfo { trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
r3486 r3487 2528 2528 </td> 2529 2529 <td> 2530 <xsl:choose> 2531 <xsl:when test="form/xproperties/node()[name()='X-BEDEWORK-THUMB-IMAGE']"> 2532 <img class="eventFormImage"> 2533 <xsl:attribute name="src"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-THUMB-IMAGE']"/></xsl:attribute> 2534 <xsl:attribute name="alt"><xsl:value-of select="form/title/input/@value"/></xsl:attribute> 2535 </img> 2536 </xsl:when> 2537 <xsl:when test="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']"> 2538 <img class="eventFormImage"> 2539 <xsl:attribute name="src"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']"/></xsl:attribute> 2540 <xsl:attribute name="alt"><xsl:value-of select="form/title/input/@value"/></xsl:attribute> 2541 </img> 2542 </xsl:when> 2543 </xsl:choose> 2530 <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-IMAGE'] or form/xproperties/node()[name()='X-BEDEWORK-THUMB-IMAGE']"> 2531 <div id="eventFormImage"> 2532 <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']"> 2533 <img> 2534 <xsl:attribute name="src"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']"/></xsl:attribute> 2535 <xsl:attribute name="alt"><xsl:value-of select="form/title/input/@value"/></xsl:attribute> 2536 </img> 2537 </xsl:if> 2538 <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-THUMB-IMAGE']"> 2539 <img> 2540 <xsl:attribute name="src"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-THUMB-IMAGE']"/></xsl:attribute> 2541 <xsl:attribute name="alt"><xsl:value-of select="form/title/input/@value"/></xsl:attribute> 2542 </img> 2543 </xsl:if> 2544 </div> 2545 </xsl:if> 2544 2546 <label class="interiorLabel" for="xBwImageHolder"> 2545 2547 <xsl:copy-of select="$bwStr-AEEF-ImageURL"/> trunk/deployment/webadmin/webapp/resources/es_ES/default/default.css
r3486 r3487 478 478 width: 150px; 479 479 } 480 .eventFormImage { 481 display: block; 482 clear: right; 480 #eventFormImage { 483 481 margin-bottom: 0.5em; 482 } 483 #eventFormImage img { 484 margin-right: 4px; 484 485 } 485 486 table.eventFormTable div.fieldInfo { trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl
r3478 r3487 1299 1299 </xsl:choose> 1300 1300 </xsl:variable> 1301 <form name="eventForm" method="post" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}')">1301 <form name="eventForm" method="post" enctype="multipart/form-data" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}')"> 1302 1302 <xsl:choose> 1303 1303 <xsl:when test="/bedework/page = 'modEventPending'"> … … 2516 2516 <input type="text" name="eventLink" size="80" class="edit"> 2517 2517 <xsl:attribute name="value"><xsl:value-of select="form/link/input/@value"/></xsl:attribute> 2518 < xsl:if test="$canEdit = 'false'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>2518 <!-- xsl:if test="$canEdit = 'false'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if--> 2519 2519 </input> 2520 2520 <xsl:text> </xsl:text> … … 2523 2523 </tr> 2524 2524 <!-- Image Url --> 2525 <tr class="optional" >2525 <tr class="optional" id="bwImageUrl"> 2526 2526 <xsl:if test="$canEdit = 'false'"><xsl:attribute name="class">invisible</xsl:attribute></xsl:if> 2527 2527 <td class="fieldName"> 2528 <xsl:copy-of select="$bwStr-AEEF-ImageURL"/> 2529 </td> 2530 <td> 2531 <input type="text" name="xBwImageHolder" value="" size="80" class="edit"> 2528 <xsl:copy-of select="$bwStr-AEEF-Image"/> 2529 </td> 2530 <td> 2531 <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-IMAGE'] or form/xproperties/node()[name()='X-BEDEWORK-THUMB-IMAGE']"> 2532 <div id="eventFormImage"> 2533 <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']"> 2534 <img> 2535 <xsl:attribute name="src"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']"/></xsl:attribute> 2536 <xsl:attribute name="alt"><xsl:value-of select="form/title/input/@value"/></xsl:attribute> 2537 </img> 2538 </xsl:if> 2539 <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-THUMB-IMAGE']"> 2540 <img> 2541 <xsl:attribute name="src"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-THUMB-IMAGE']"/></xsl:attribute> 2542 <xsl:attribute name="alt"><xsl:value-of select="form/title/input/@value"/></xsl:attribute> 2543 </img> 2544 </xsl:if> 2545 </div> 2546 </xsl:if> 2547 <label class="interiorLabel" for="xBwImageHolder"> 2548 <xsl:copy-of select="$bwStr-AEEF-ImageURL"/> 2549 </label> 2550 <xsl:text> </xsl:text> 2551 <input type="text" name="xBwImageHolder" id="xBwImageHolder" value="" size="45" class="edit"> 2532 2552 <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text" disable-output-escaping="yes"/></xsl:attribute> 2533 2553 </input> 2534 2554 <xsl:text> </xsl:text> 2535 2555 <span class="fieldInfo"><xsl:copy-of select="$bwStr-AEEF-OptionalEventImage"/></span> 2556 <br/> 2557 <label class="interiorLabel" for="xBwImageThumbHolder"> 2558 <xsl:copy-of select="$bwStr-AEEF-ImageThumbURL"/> 2559 </label> 2560 <xsl:text> </xsl:text> 2561 <input type="text" name="xBwImageThumbHolder" id="xBwImageThumbHolder" value="" size="45" class="edit"> 2562 <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-THUMB-IMAGE']/values/text" disable-output-escaping="yes"/></xsl:attribute> 2563 </input> 2564 <xsl:text> </xsl:text> 2565 <span class="fieldInfo"><xsl:copy-of select="$bwStr-AEEF-OptionalEventThumbImage"/></span> 2566 <br/> 2567 <label class="interiorLabel" for="eventImageUpload"> 2568 <xsl:copy-of select="$bwStr-AEEF-ImageUpload"/> 2569 </label> 2570 <xsl:text> </xsl:text> 2571 <input type="file" name="eventImageUpload" id="eventImageUpload" size="45" class="edit"/> 2572 <xsl:text> </xsl:text> 2573 <span class="fieldInfo"><xsl:copy-of select="$bwStr-AEEF-OptionalImageUpload"/></span> 2536 2574 </td> 2537 2575 </tr> … … 5478 5516 5479 5517 <form name="delCalForm" action="{$subscriptions-delete}" method="post"> 5518 <input type="hidden" name="deleteContent" value="true"/> 5480 5519 <table class="eventFormTable"> 5481 5520 <tr> 5482 <th> Path:</th>5521 <th><xsl:copy-of select="$bwStr-CuCa-Path"/></th> 5483 5522 <td> 5484 5523 <xsl:value-of select="path"/> … … 6285 6324 <xsl:variable name="preferredView" select="/bedework/prefs/preferredView"/> 6286 6325 <input type="text" name="preferredView" value="{$preferredView}" size="40"/> 6326 </td> 6327 </tr> 6328 <tr> 6329 <th> 6330 <xsl:copy-of select="$bwStr-CSPf-DefaultViewMode"/> 6331 </th> 6332 <td> 6333 <select name="defaultViewMode"> 6334 <option value="daily"> 6335 <xsl:if test="/bedework/prefs/defaultViewMode = 'daily'"> 6336 <xsl:attribute name="selected">selected</xsl:attribute> 6337 </xsl:if> 6338 <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeDaily"/> 6339 </option> 6340 <option value="list"> 6341 <xsl:if test="/bedework/prefs/defaultViewMode = 'list'"> 6342 <xsl:attribute name="selected">selected</xsl:attribute> 6343 </xsl:if> 6344 <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeList"/> 6345 </option> 6346 <option value="grid"> 6347 <xsl:if test="/bedework/prefs/defaultViewMode = 'grid'"> 6348 <xsl:attribute name="selected">selected</xsl:attribute> 6349 </xsl:if> 6350 <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeGrid"/> 6351 </option> 6352 </select> 6287 6353 </td> 6288 6354 </tr> … … 7248 7314 <xsl:choose> 7249 7315 <xsl:when test="event/start/longdate != event/end/longdate"> 7250 - <xsl:value-of select="event/ start/longdate"/>7316 - <xsl:value-of select="event/end/longdate"/> 7251 7317 <xsl:text> </xsl:text> 7252 7318 <xsl:value-of select="event/end/time"/> trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js
r3204 r3487 357 357 formObj["xBwImageHolder"].value,true); 358 358 } 359 359 360 //X-BEDEWORK-THUMB-IMAGE: 361 if (formObj["xBwImageThumbHolder"] && formObj["xBwImageThumbHolder"].value != '') { 362 bwXProps.update(bwXPropertyThumbImage,[],formObj["xBwImageThumbHolder"].value,true); 363 } 364 360 365 // X-BEDEWORK-SUBMITTEDBY 361 366 bwXProps.update(bwXPropertySubmittedBy,[],submitter,true);
