Changeset 1096

Show
Ignore:
Timestamp:
11/17/06 13:29:13
Author:
johnsa
Message:

- correct display of search result in web admin client
- fix up error messages and output in admin UI
- change search entry on search results pages to avoid some confusing UI behavior
- general clean up

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webadmin/webapp/resources/default/default/default.css

    r1085 r1096  
    2929  color: #ff0; 
    3030  font-weight: bold; 
     31  margin: 0.5em 0; 
     32} 
     33#messages p { 
     34  margin: 0; 
    3135} 
    3236#errors { 
    …… 
    3438  color: #f99; 
    3539  font-weight: bold; 
     40  margin: 0.5em 0; 
    3641} 
    3742#errors em { 
    3843  background-color: inherit; 
    3944  color: #ff9; 
     45} 
     46#errors p { 
     47  margin: 0; 
    4048} 
    4149#adminLeftColumn { 

  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r1094 r1096  
    14141414        </th> 
    14151415        <td> 
    1416           <xsl:value-of select="creator"/> 
     1416          <strong><xsl:value-of select="creator"/></strong> 
    14171417        </td> 
    14181418      </tr> 
    …… 
    14201420    </table> 
    14211421 
    1422  
    1423     <!--<xsl:if test="/bedeworkadmin/canEdit = 'true' or /bedeworkadmin/userInfo/superUser = 'true'"> 
    1424       <xsl:variable name="subscriptionId" select="subscription/id"/> 
    1425       <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    1426       <xsl:variable name="guid" select="guid"/> 
    1427       <xsl:variable name="recurrenceId" select="recurrenceId"/> 
    1428       <h3> 
    1429         <a href="{$event-fetchForUpdate}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    1430           Edit Event 
    1431         </a> 
    1432       </h3> 
    1433     </xsl:if>--> 
     1422    <p> 
     1423      <xsl:if test="/bedeworkadmin/canEdit = 'true' or /bedeworkadmin/userInfo/superUser = 'true'"> 
     1424        <xsl:variable name="calPath" select="calendar/encodedPath"/> 
     1425        <xsl:variable name="guid" select="guid"/> 
     1426        <xsl:variable name="recurrenceId" select="recurrenceId"/> 
     1427        <input type="button" name="return" value="Edit event" onclick="javascript:location.replace('{$event-fetchForUpdate}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')"/> 
     1428      </xsl:if> 
     1429 
     1430      <input type="button" name="return" value="Back to search results" onclick="javascript:history.back()"/> 
     1431    </p> 
    14341432  </xsl:template> 
    14351433 
    …… 
    39743972          </td> 
    39753973          <td> 
    3976             <a href="{$event-showEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     3974            <a href="{$event-fetchForDisplay}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    39773975              <xsl:value-of select="event/summary"/> 
    39783976            </a> 

  • trunk/deployment/webadmin/webapp/resources/default/default/errors.xsl

    r1085 r1096  
    44    <xsl:choose> 
    55      <xsl:when test="id='org.bedework.client.error.exc'"><!-- trap exceptions first --> 
    6         <xsl:choose> 
    7           <xsl:when test="param='org.bedework.exception.alreadyonadmingrouppath'"> 
    8             Error: a group may not be added to itself.<br/> 
    9           </xsl:when> 
    10           <xsl:otherwise> 
    11             <xsl:value-of select="param"/> 
    12           </xsl:otherwise> 
    13         </xsl:choose> 
     6        <p> 
     7          <xsl:choose> 
     8            <xsl:when test="param='org.bedework.exception.alreadyonadmingrouppath'"> 
     9              Error: a group may not be added to itself.<br/> 
     10            </xsl:when> 
     11            <xsl:otherwise> 
     12              <xsl:value-of select="param"/> 
     13            </xsl:otherwise> 
     14          </xsl:choose> 
     15        </p> 
    1416      </xsl:when> 
    1517      <xsl:when test="id='org.bedework.client.error.noaccess'"> 
    16         Error: no access 
     18        <p>Error: no access.</p> 
    1719      </xsl:when> 
    1820      <xsl:when test="id='org.bedework.client.error.missingsubscriptionid'"> 
    19         You must supply a subscription <em>name</em> 
     21        <p>You must supply a subscription <em>name</em>.</p> 
    2022      </xsl:when> 
    2123      <xsl:when test="id='org.bedework.client.error.nosuchsubscription'"> 
    22         Not found: there is no user identified by the name <em><xsl:value-of select="param"/></em> 
     24        <p>Not found: there is no user identified by the name <em><xsl:value-of select="param"/></em>.</p> 
    2325      </xsl:when> 
    2426      <xsl:when test="id='org.bedework.client.error.viewnotfound'"> 
    25         Not found: there is no view identified by the name <em><xsl:value-of select="param"/></em> 
     27        <p>Not found: there is no view identified by the name <em><xsl:value-of select="param"/></em>.</p> 
    2628      </xsl:when> 
    2729      <xsl:when test="id='org.bedework.client.error.viewnotadded'"> 
    28         Error: the view was not added 
     30        <p>Error: the view was not added.</p> 
    2931      </xsl:when> 
    3032      <xsl:when test="id='org.bedework.client.error.nosuchevent'"> 
    31         Not found: there is no event with guid <em><xsl:value-of select="param"/></em> 
     33        <p>Not found: there is no event with guid <em><xsl:value-of select="param"/></em>.</p> 
     34      </xsl:when> 
     35      <xsl:when test="id='org.bedework.client.error.missingcalendarpath'"> 
     36        <p>Error: missing calendar path.</p> 
    3237      </xsl:when> 
    3338      <xsl:when test="id='org.bedework.client.error.eventnotfound'"> 
    34         Not found: the event was not found 
     39        <p>Not found: the event was not found.</p> 
    3540      </xsl:when> 
    3641      <xsl:when test="id='org.bedework.client.error.badentityid'"> 
    37         Error: bad entity id 
     42        <p>Error: bad entity id.</p> 
    3843      </xsl:when> 
    3944      <xsl:when test="id='org.bedework.client.error.noentityid'"> 
    40         Error: no entity id 
     45        <p>Error: no entity id.</p> 
    4146      </xsl:when> 
    4247      <xsl:when test="id='org.bedework.client.error.nosuchcalendar'"> 
    43         Not found: there is no calendar identified by the path <em><xsl:value-of select="param"/></em> 
     48        <p>Not found: there is no calendar identified by the path <em><xsl:value-of select="param"/></em>.</p> 
    4449      </xsl:when> 
    4550      <xsl:when test="id='org.bedework.client.error.calendar.referenced'"> 
    46         Cannot delete: the calendar is not empty 
    47       </xsl:when> 
    48       <xsl:when test="id='org.bedework.client.message.folder.updated'"> 
    49         Folder updated. 
     51        <p>Cannot delete: the calendar is not empty.</p> 
    5052      </xsl:when> 
    5153      <xsl:when test="id='org.bedework.client.error.unimplemented'"> 
    52         Unimplemented: the feature you are trying to use has not been implemented yet 
     54        <p>Unimplemented: the feature you are trying to use has not been implemented yet.</p> 
    5355      </xsl:when> 
    5456      <xsl:when test="id='org.bedework.client.error.badhow'"> 
    55         Error: bad ACL request (bad how setting) 
     57        <p>Error: bad ACL request (bad how setting).</p> 
    5658      </xsl:when> 
    5759      <xsl:when test="id='org.bedework.client.error.badwhotype'"> 
    58         Error: bad who type (user or group) 
     60        <p>Error: bad who type (user or group).</p> 
    5961      </xsl:when> 
    6062      <xsl:when test="id='org.bedework.client.error.badinterval'"> 
    61         Error: bad interval 
     63        <p>Error: bad interval.</p> 
    6264      </xsl:when> 
    6365      <xsl:when test="id='org.bedework.client.error.badintervalunit'"> 
    64         Error: bad interval unit 
     66        <p>Error: bad interval unit.</p> 
    6567      </xsl:when> 
    6668      <xsl:when test="id='org.bedework.client.error.mail.norecipient'"> 
    67         Error: the email has no recipient 
     69        <p>Error: the email has no recipient.</p> 
    6870      </xsl:when> 
    6971      <xsl:when test="id='org.bedework.client.error.choosegroupsuppressed'"> 
    70         Error: choose group is suppressed.  You cannot perform that action at this time. 
     72        <p>Error: choose group is suppressed.  You cannot perform that action at this time.</p> 
    7173      </xsl:when> 
    7274      <xsl:when test="id='org.bedework.validation.error.toolong.description'"> 
    73         Your description is too long.  Please limit your entry to 
     75        <p>Your description is too long.  Please limit your entry to 
    7476        <em><xsl:value-of select="param"/></em> characters.  You may also wish to 
    75         point the event entry at a supplimental web page by entering a <em>URL</em>. 
     77        point the event entry at a supplimental web page by entering a <em>URL</em>.</p> 
    7678      </xsl:when> 
    7779      <xsl:when test="id='org.bedework.validation.error.notitle'"> 
    78         You must supply a <em>title</em><br/> 
     80        <p>You must supply a <em>title</em>.</p> 
    7981      </xsl:when> 
    8082      <xsl:when test="id='org.bedework.validation.error.nocalendar'"> 
    81         You must supply the <em>calendar</em><br/> 
     83        <p>You must supply the <em>calendar</em>.</p> 
    8284      </xsl:when> 
    8385      <xsl:when test="id='org.bedework.validation.error.nodescription'"> 
    84         You must supply a <em>description</em><br/> 
     86        <p>You must supply a <em>description</em>.</p> 
    8587      </xsl:when> 
    8688      <xsl:when test="id='org.bedework.validation.error.event.startafterend'"> 
    87         The <em>end date</em> for this event occurs before the <em>start date</em> 
     89        <p>The <em>end date</em> for this event occurs before the <em>start date</em>.</p> 
    8890      </xsl:when> 
    8991      <xsl:when test="id='org.bedework.validation.error.invalid.endtype'"> 
    90         The <em>end date type</em> is invalid for the type of event you are creating 
     92        <p>The <em>end date type</em> is invalid for the type of event you are creating.</p> 
    9193      </xsl:when> 
    9294      <xsl:when test="id='org.bedework.validation.error.invalid.duration'"> 
    93         <em>Invalid duration</em> - you may not have a zero-length duration 
    94         for an all day event. 
     95        <p><em>Invalid duration</em> - you may not have a zero-length duration 
     96        for an all day event.</p> 
    9597      </xsl:when> 
    9698      <xsl:when test="id='org.bedework.validation.error.nocontactname'"> 
    97         You must enter a contact <em>name</em>. 
     99        <p>You must enter a contact <em>name</em>.</p> 
    98100      </xsl:when> 
    99101      <xsl:when test="id='org.bedework.validation.error.nolocationaddress'"> 
    100         You must enter a location <em>address</em>. 
     102        <p>You must enter a location <em>address</em>.</p> 
    101103      </xsl:when> 
    102104      <xsl:when test="id='org.bedework.client.error.missingfield'"> 
    103         Your information is incomplete: please supply a <em><xsl:value-of select="param"/></em><br/> 
     105        <p>Your information is incomplete: please supply a <em><xsl:value-of select="param"/></em>.</p> 
    104106      </xsl:when> 
    105107      <xsl:when test="id='org.bedework.validation.error.missingfield'"> 
    106         Your information is incomplete: please supply a <em><xsl:value-of select="param"/></em><br/> 
     108        <p>Your information is incomplete: please supply a <em><xsl:value-of select="param"/></em>.</p> 
    107109      </xsl:when> 
    108110      <xsl:when test="id='org.bedework.validation.error.forbidden.calmode'"> 
    109         Access forbidden: you are not allowed to perform that action on calendar <em><xsl:value-of select="param"/></em> 
     111        <p>Access forbidden: you are not allowed to perform that action on calendar <em><xsl:value-of select="param"/></em>.</p> 
    110112      </xsl:when> 
    111113      <xsl:when test="id='org.bedework.client.error.missingcategory'"> 
    112         Error: the category identified by <em><xsl:value-of select="param"/></em> is missing 
     114        <p>Error: the category identified by <em><xsl:value-of select="param"/></em> is missing.</p> 
    113115      </xsl:when> 
    114116      <xsl:when test="id='org.bedework.client.error.nosuchcategorynosuchcategory'"> 
    115         Not found: there is no category identified by the key <em><xsl:value-of select="param"/></em> 
     117        <p>Not found: there is no category identified by the key <em><xsl:value-of select="param"/></em>.</p> 
    116118      </xsl:when> 
    117119      <xsl:when test="id='org.bedework.client.error.category.referenced'"> 
    118         Cannot delete: the category is referenced by events 
     120        <p>Cannot delete: the category is referenced by events.</p> 
    119121      </xsl:when> 
    120122      <xsl:when test="id='org.bedework.pubevents.error.badfield'"> 
    121         Please correct your data input for <em><xsl:value-of select="param"/></em> 
     123        <p>Please correct your data input for <em><xsl:value-of select="param"/></em>.</p> 
    122124      </xsl:when> 
    123125      <xsl:when test="id='org.bedework.client.error.nosuchcontact'"> 
    124         Not found: there is no contact <em><xsl:value-of select="param"/></em> 
     126        <p>Not found: there is no contact <em><xsl:value-of select="param"/></em>.</p> 
    125127      </xsl:when> 
    126128      <xsl:when test="id='org.bedework.client.error.contact.referenced'"> 
    127         Cannot delete: the contact is referenced by events 
     129        <p>Cannot delete: the contact is referenced by events.</p> 
    128130      </xsl:when> 
    129131      <xsl:when test="id='org.bedework.client.error.contact.alreadyexists'"> 
    130         Cannot add: the contact already exists 
     132        <p>Cannot add: the contact already exists.</p> 
    131133      </xsl:when> 
    132134      <xsl:when test="id='org.bedework.client.error.nosuchlocation'"> 
    133         Not found: there is no location identified by the id <em><xsl:value-of select="param"/></em> 
     135        <p>Not found: there is no location identified by the id <em><xsl:value-of select="param"/></em>.</p> 
    134136      </xsl:when> 
    135137      <xsl:when test="id='org.bedework.client.error.location.alreadyexists'"> 
    136         Cannot add: the location already exists 
     138        <p>Cannot add: the location already exists.</p> 
    137139      </xsl:when> 
    138140      <xsl:when test="id='org.bedework.client.error.location.referenced'"> 
    139         Cannot delete: the location is referenced by events 
     141        <p>Cannot delete: the location is referenced by events.</p> 
    140142      </xsl:when> 
    141143      <xsl:when test="id='org.bedework.client.error.subscription.reffed'"> 
    …… 
    147149      </xsl:when> 
    148150      <xsl:when test="id='org.bedework.error.timezones.readerror'"> 
    149         <p>Timzone error: could not read file</p> 
     151        <p>Timzone error: could not read file.</p> 
    150152      </xsl:when> 
    151153      <xsl:when test="id='org.bedework.client.error.nosuchuserid'"> 
    152         <p>Not found: there is no user identified by the id <em><xsl:value-of select="param"/></em></p> 
     154        <p>Not found: there is no user identified by the id <em><xsl:value-of select="param"/></em>.</p> 
    153155      </xsl:when> 
    154156      <xsl:when test="id='org.bedework.client.error.usernotfound'"> 
    155         Not found: the user <em><xsl:value-of select="param"/></em> was not found 
     157        <p>Not found: the user <em><xsl:value-of select="param"/></em> was not found.</p> 
    156158      </xsl:when> 
    157159      <xsl:when test="id='org.bedework.error.duplicate.admingroup'"> 
    158         Error: duplicate admin group.  <em><xsl:value-of select="param"/></em> already exists. 
     160        <p>Error: duplicate admin group.  <em><xsl:value-of select="param"/></em> already exists.</p> 
    159161      </xsl:when> 
    160162      <xsl:when test="id='org.bedework.client.error.nosuchadmingroup'"> 
    161         Error: no such admin group "<em><xsl:value-of select="param"/></em>" 
     163        <p>Error: no such admin group "<em><xsl:value-of select="param"/></em>".</p> 
    162164      </xsl:when> 
    163165      <xsl:when test="id='org.bedework.error.unknowgroup'"> 
    164         Error: unknown admin group:  <em><xsl:value-of select="param"/></em> 
     166        <p>Error: unknown admin group:  <em><xsl:value-of select="param"/></em>.</p> 
    165167      </xsl:when> 
    166168      <xsl:when test="id='org.bedework.exception.alreadyonadmingrouppath'"> 
    167         Error: group may not be added to itself 
     169        <p>Error: group may not be added to itself.</p> 
    168170      </xsl:when> 
    169171      <xsl:when test="id='edu.rpi.sss.util.error.exc'"> 
    170         Utility package error: <em><xsl:value-of select="param"/></em> 
     172        <p>Utility package error: <em><xsl:value-of select="param"/></em></p> 
    171173      </xsl:when> 
    172174      <xsl:otherwise> 
    173         <xsl:value-of select="id"/> = <xsl:value-of select="param"/> 
     175        <p><xsl:value-of select="id"/> = <xsl:value-of select="param"/></p> 
    174176      </xsl:otherwise> 
    175177    </xsl:choose> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl

    r1094 r1096  
    467467         </td> 
    468468         <td class="rightCell"> 
    469             <form name="searchForm" method="post" action="{$search}"> 
    470               Search: 
    471               <input type="text" name="query" size="15"> 
    472                 <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute> 
    473               </input> 
    474               <input type="submit" name="submit" value="go"/> 
    475             </form> 
     469            <xsl:if test="/bedework/page!='searchResult'"> 
     470              <form name="searchForm" method="post" action="{$search}"> 
     471                Search: 
     472                <input type="text" name="query" size="15"> 
     473                  <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute> 
     474                </input> 
     475                <input type="submit" name="submit" value="go"/> 
     476              </form> 
     477            </xsl:if> 
    476478            <xsl:choose> 
    477479              <xsl:when test="/bedework/periodname='Day'"> 
    …… 
    11431145    <h2 class="bwStatusConfirmed"> 
    11441146      <div id="searchFilter"> 
    1145         Limit search to: 
    1146         <xsl:variable name="query" select="/bedework/searchResults/query"/> 
    1147         <xsl:choose> 
    1148           <xsl:when test="/bedework/searchResults/searchLimits = 'beforeToday'"> 
    1149             <input type="radio" name="searchLimits" value="fromToday" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=fromToday')"/>today forward 
    1150             <input type="radio" name="searchLimits" value="beforeToday" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=beforeToday')" checked="checked"/>past dates 
    1151             <input type="radio" name="searchLimits" value="none" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=none')"/>all dates 
    1152           </xsl:when> 
    1153           <xsl:when test="/bedework/searchResults/searchLimits = 'none'"> 
    1154             <input type="radio" name="searchLimits" value="fromToday" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=fromToday')"/>today forward 
    1155             <input type="radio" name="searchLimits" value="beforeToday" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=beforeToday')"/>past dates 
    1156             <input type="radio" name="searchLimits" value="none" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=none')" checked="checked"/>all dates 
    1157           </xsl:when> 
    1158           <xsl:otherwise> 
    1159             <input type="radio" name="searchLimits" value="fromToday" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=fromToday')" checked="checked"/>today forward 
    1160             <input type="radio" name="searchLimits" value="beforeToday" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=beforeToday')"/>past dates 
    1161             <input type="radio" name="searchLimits" value="none" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=none')"/>all dates 
    1162           </xsl:otherwise> 
    1163         </xsl:choose> 
     1147        <form name="searchForm" method="post" action="{$search}"> 
     1148          Search: 
     1149          <input type="text" name="query" size="15"> 
     1150            <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute> 
     1151          </input> 
     1152          <input type="submit" name="submit" value="go"/> 
     1153          Limit: 
     1154          <xsl:choose> 
     1155            <xsl:when test="/bedework/searchResults/searchLimits = 'beforeToday'"> 
     1156              <input type="radio" name="searchLimits" value="fromToday"/>today forward 
     1157              <input type="radio" name="searchLimits" value="beforeToday" checked="checked"/>past dates 
     1158              <input type="radio" name="searchLimits" value="none"/>all dates 
     1159            </xsl:when> 
     1160            <xsl:when test="/bedework/searchResults/searchLimits = 'none'"> 
     1161              <input type="radio" name="searchLimits" value="fromToday"/>today forward 
     1162              <input type="radio" name="searchLimits" value="beforeToday"/>past dates 
     1163              <input type="radio" name="searchLimits" value="none" checked="checked"/>all dates 
     1164            </xsl:when> 
     1165            <xsl:otherwise> 
     1166              <input type="radio" name="searchLimits" value="fromToday" checked="checked"/>today forward 
     1167              <input type="radio" name="searchLimits" value="beforeToday"/>past dates 
     1168              <input type="radio" name="searchLimits" value="none"/>all dates 
     1169            </xsl:otherwise> 
     1170          </xsl:choose> 
     1171        </form> 
    11641172      </div> 
    11651173      Search Result 

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1094 r1096  
    694694 
    695695           <!-- search --> 
    696            <form name="searchForm" method="post" action="{$search}"> 
    697              Search: 
    698              <input type="text" name="query" size="15"> 
    699                <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute> 
    700              </input> 
    701              <input type="submit" name="submit" value="go"/> 
    702            </form> 
     696           <xsl:if test="/bedework/page!='searchResult'"> 
     697             <form name="searchForm" method="post" action="{$search}"> 
     698               Search: 
     699               <input type="text" name="query" size="15"> 
     700                 <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute> 
     701               </input> 
     702               <input type="submit" name="submit" value="go"/> 
     703             </form> 
     704           </xsl:if> 
    703705 
    704706           <!-- show free / busy --> 
    …… 
    54575459    <h2 class="bwStatusConfirmed"> 
    54585460      <div id="searchFilter"> 
    5459         Limit search to: 
    5460         <xsl:variable name="query" select="/bedework/searchResults/query"/> 
    5461         <xsl:choose> 
    5462           <xsl:when test="/bedework/searchResults/searchLimits = 'beforeToday'"> 
    5463             <input type="radio" name="searchLimits" value="fromToday" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=fromToday')"/>today forward 
    5464             <input type="radio" name="searchLimits" value="beforeToday" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=beforeToday')" checked="checked"/>past dates 
    5465             <input type="radio" name="searchLimits" value="none" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=none')"/>all dates 
    5466           </xsl:when> 
    5467           <xsl:when test="/bedework/searchResults/searchLimits = 'none'"> 
    5468             <input type="radio" name="searchLimits" value="fromToday" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=fromToday')"/>today forward 
    5469             <input type="radio" name="searchLimits" value="beforeToday" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=beforeToday')"/>past dates 
    5470             <input type="radio" name="searchLimits" value="none" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=none')" checked="checked"/>all dates 
    5471           </xsl:when> 
    5472           <xsl:otherwise> 
    5473             <input type="radio" name="searchLimits" value="fromToday" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=fromToday')" checked="checked"/>today forward 
    5474             <input type="radio" name="searchLimits" value="beforeToday" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=beforeToday')"/>past dates 
    5475             <input type="radio" name="searchLimits" value="none" onchange="window.location.replace('{$search}&amp;query={$query}&amp;searchLimits=none')"/>all dates 
    5476           </xsl:otherwise> 
    5477         </xsl:choose> 
     5461        <form name="searchForm" method="post" action="{$search}"> 
     5462          Search: 
     5463          <input type="text" name="query" size="15"> 
     5464            <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute> 
     5465          </input> 
     5466          <input type="submit" name="submit" value="go"/> 
     5467          Limit: 
     5468          <xsl:choose> 
     5469            <xsl:when test="/bedework/searchResults/searchLimits = 'beforeToday'"> 
     5470              <input type="radio" name="searchLimits" value="fromToday"/>today forward 
     5471              <input type="radio" name="searchLimits" value="beforeToday" checked="checked"/>past dates 
     5472              <input type="radio" name="searchLimits" value="none"/>all dates 
     5473            </xsl:when> 
     5474            <xsl:when test="/bedework/searchResults/searchLimits = 'none'"> 
     5475              <input type="radio" name="searchLimits" value="fromToday"/>today forward 
     5476              <input type="radio" name="searchLimits" value="beforeToday"/>past dates 
     5477              <input type="radio" name="searchLimits" value="none" checked="checked"/>all dates 
     5478            </xsl:when> 
     5479            <xsl:otherwise> 
     5480              <input type="radio" name="searchLimits" value="fromToday" checked="checked"/>today forward 
     5481              <input type="radio" name="searchLimits" value="beforeToday"/>past dates 
     5482              <input type="radio" name="searchLimits" value="none"/>all dates 
     5483            </xsl:otherwise> 
     5484          </xsl:choose> 
     5485        </form> 
    54785486      </div> 
    54795487      Search Result