Changeset 1048

Show
Ignore:
Timestamp:
10/24/06 17:33:50
Author:
johnsa
Message:

fixup search results in public client - restore persistent search bar. Still need to handle multi-page searches.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/common.css

    r1046 r1048  
    1919  background-color: #eee; 
    2020  color: black; 
     21  border-top: 1px solid #bbb; 
    2122} 
    2223h2.bwStatusCancelled { 
    2324  background-color: #eee; 
    2425  color: black; 
     26  border-top: 1px solid #bbb; 
    2527} 
    2628h2.bwStatusTentative { 
    2729  background: #eee url('../../images/tentativeLines.gif') top; 
    2830  color: black; 
     31  border-top: 1px solid #bbb; 
    2932} 
    3033/* Header IDs and classes */ 

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

    r1047 r1048  
    124124        <xsl:call-template name="tabs"/> 
    125125        <xsl:call-template name="navigation"/> 
     126        <xsl:call-template name="searchBar"/> 
    126127        <xsl:choose> 
    127128          <xsl:when test="/bedework/page='event'"> 
    …… 
    142143          </xsl:when> 
    143144          <xsl:otherwise> 
    144             <!-- otherwise, show the eventsCalendar --> 
     145            <!-- otherwise, show the eventsCalendar 
    145146            <xsl:if test="/bedework/periodname!='Year'"> 
    146147              <xsl:call-template name="searchBar"/> 
    147             </xsl:if> 
     148            </xsl:if>--> 
    148149            <!-- main eventCalendar content --> 
    149150            <xsl:choose> 
    …… 
    466467            <form name="searchForm" method="post" action="{$search}"> 
    467468              Search: 
    468               <input type="text" name="query" size="10"/> 
     469              <input type="text" name="query" size="15"> 
     470                <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute> 
     471              </input> 
    469472              <input type="submit" name="submit" value="go"/> 
    470473            </form> 
    …… 
    10931096  <!--==== SEARCH RESULT ====--> 
    10941097  <xsl:template name="searchResult"> 
    1095     <xsl:variable name="subscriptionId" select="subscription/id"/> 
    1096     <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    1097     <xsl:variable name="guid" select="guid"/> 
    1098     <xsl:variable name="recurrenceId" select="recurrenceId"/> 
    10991098    <h2 class="bwStatusConfirmed">Search Result</h2> 
    11001099    <table id="searchTable" cellpadding="0" cellspacing="0"> 
    …… 
    11141113      </tr> 
    11151114      <xsl:for-each select="/bedework/searchResults/searchResult"> 
     1115        <xsl:variable name="subscriptionId" select="event/subscription/id"/> 
     1116        <xsl:variable name="calPath" select="event/calendar/encodedPath"/> 
     1117        <xsl:variable name="guid" select="event/guid"/> 
     1118        <xsl:variable name="recurrenceId" select="event/recurrenceId"/> 
    11161119        <tr> 
    11171120          <td>